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

4f5efae5

Commit 4f5efae5 authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/sophia-update'

Conflicts:
	src/box/box.cc

parents fd0cb279 0bc1c9d0

No related branches found

No related tags found

Loading

Changes 12

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 32 additions, 17 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 72 additions, 50 deletions

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

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

src/box/space.h
third_party/sophia 1 addition, 1 deletion

third_party/sophia

with 155 additions and 85 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