Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

tarantool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

97db4336

Commit 97db4336 authored 10 years ago by Dmitry E. Oboukhov

Downloads
- Plain Diff

Merge branch 'master' of github.com:tarantool/tarantool into fiber-file-io

parents b9616280 ab4122b5

No related branches found

No related tags found

Loading

Changes 16

Hide whitespace changes

Inline Side-by-side

Showing

.gitmodules 4 additions, 3 deletions

.gitmodules
CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
cmake/BuildSophia.cmake 12 additions, 9 deletions

cmake/BuildSophia.cmake
src/box/box.cc 17 additions, 3 deletions

src/box/box.cc
src/box/engine.cc 3 additions, 0 deletions

src/box/engine.cc
src/box/engine.h 2 additions, 0 deletions

src/box/engine.h
src/box/engine_sophia.cc 41 additions, 20 deletions

src/box/engine_sophia.cc
src/box/engine_sophia.h 2 additions, 0 deletions

src/box/engine_sophia.h
src/box/sophia_index.cc 82 additions, 52 deletions

src/box/sophia_index.cc
src/box/sophia_index.h 10 additions, 1 deletion

src/box/sophia_index.h
src/box/space.h 4 additions, 0 deletions

src/box/space.h
src/lib/salad/bps_tree.h 4 additions, 2 deletions

src/lib/salad/bps_tree.h
test/box/sophia.result 102 additions, 2 deletions

test/box/sophia.result
test/box/sophia.test.lua 46 additions, 2 deletions

test/box/sophia.test.lua
test/unit/CMakeLists.txt 0 additions, 5 deletions

test/unit/CMakeLists.txt
third_party/sophia 1 addition, 1 deletion

third_party/sophia

with 331 additions and 101 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment