Merge branch 'sophia-index'
Conflicts: src/box/CMakeLists.txt src/errcode.h
Showing
- CMakeLists.txt 1 addition, 0 deletionsCMakeLists.txt
- src/CMakeLists.txt 5 additions, 1 deletionsrc/CMakeLists.txt
- src/box/CMakeLists.txt 4 additions, 1 deletionsrc/box/CMakeLists.txt
- src/box/alter.cc 1 addition, 5 deletionssrc/box/alter.cc
- src/box/box.cc 5 additions, 0 deletionssrc/box/box.cc
- src/box/engine.cc 6 additions, 0 deletionssrc/box/engine.cc
- src/box/engine.h 24 additions, 2 deletionssrc/box/engine.h
- src/box/engine_memtx.cc 62 additions, 1 deletionsrc/box/engine_memtx.cc
- src/box/engine_memtx.h 3 additions, 0 deletionssrc/box/engine_memtx.h
- src/box/engine_sophia.cc 180 additions, 0 deletionssrc/box/engine_sophia.cc
- src/box/engine_sophia.h 43 additions, 0 deletionssrc/box/engine_sophia.h
- src/box/index.cc 5 additions, 0 deletionssrc/box/index.cc
- src/box/index.h 12 additions, 6 deletionssrc/box/index.h
- src/box/key_def.cc 7 additions, 32 deletionssrc/box/key_def.cc
- src/box/key_def.h 0 additions, 2 deletionssrc/box/key_def.h
- src/box/lua/schema.lua 1 addition, 0 deletionssrc/box/lua/schema.lua
- src/box/request.cc 2 additions, 0 deletionssrc/box/request.cc
- src/box/schema.cc 2 additions, 2 deletionssrc/box/schema.cc
- src/box/sophia_index.cc 355 additions, 0 deletionssrc/box/sophia_index.cc
- src/box/sophia_index.h 58 additions, 0 deletionssrc/box/sophia_index.h
Loading
Please register or sign in to comment