diff --git a/src/box/engine_sophia.cc b/src/box/engine_sophia.cc
index c721de6affcb1eb31c9cf96b1904642f5850d697..245bc8f812f5d6f6f51b8326ea533dfb73801298 100644
--- a/src/box/engine_sophia.cc
+++ b/src/box/engine_sophia.cc
@@ -57,7 +57,7 @@ sophia_end_build_primary_key(struct space *space)
engine_recovery *r = &space->engine->recovery;
/* enable replace */
r->state = READY_ALL_KEYS;
- r->replace = space_replace_primary_key;
+ r->replace = sophia_replace;
r->recover = space_noop;
}
@@ -66,7 +66,7 @@ sophia_begin_build_primary_key(struct space *space)
{
engine_recovery *r = &space->engine->recovery;
r->recover = sophia_end_build_primary_key;
- r->replace = sophia_index_recover_replace;
+ r->replace = sophia_replace_recover;
}
static inline void
@@ -76,7 +76,7 @@ sophia_recovery_prepare(struct engine_recovery *r)
r->recover = sophia_begin_build_primary_key;
/* no sophia data during snapshot recover is
* expected */
- r->replace = sophia_index_recover_replace;
+ r->replace = sophia_replace_recover;
}
SophiaFactory::SophiaFactory()
@@ -118,12 +118,12 @@ SophiaFactory::recoveryEvent(enum engine_recovery_event event)
{
switch (event) {
case END_RECOVERY_SNAPSHOT:
- recovery.replace = sophia_index_recover_replace;
+ recovery.replace = sophia_replace_recover;
break;
case END_RECOVERY:
recovery.state = READY_NO_KEYS;
- recovery.replace = space_replace_primary_key;
+ recovery.replace = sophia_replace;
recovery.recover = space_noop;
break;
}
@@ -143,7 +143,12 @@ SophiaFactory::createIndex(struct key_def *key_def)
void
SophiaFactory::dropIndex(Index *index)
{
- (void)index;
+ SophiaIndex *i = (SophiaIndex*)index;
+ int rc = sp_drop(i->db);
+ if (rc == -1)
+ tnt_raise(ClientError, ER_SOPHIA, sp_error(i->db));
+ i->db = NULL;
+ i->env = NULL;
}
void
diff --git a/src/box/sophia_index.cc b/src/box/sophia_index.cc
index 7a2f03d270350debcfe6f2de562163da0728224d..c661245b56fc537e666d17fc0afa2530ce7d955b 100644
--- a/src/box/sophia_index.cc
+++ b/src/box/sophia_index.cc
@@ -64,10 +64,20 @@ sophia_set(void *db, struct key_def *key_def, struct tuple *tuple)
tnt_raise(ClientError, ER_SOPHIA, sp_error(db));
}
+struct tuple *
+sophia_replace(struct space *space,
+ struct tuple *old_tuple, struct tuple *new_tuple,
+ enum dup_replace_mode mode)
+{
+ Index *index = index_find(space, 0);
+ return index->replace(old_tuple, new_tuple, mode);
+}
+
+
struct tuple*
-sophia_index_recover_replace(struct space *space,
- struct tuple *old_tuple, struct tuple *new_tuple,
- enum dup_replace_mode)
+sophia_replace_recover(struct space *space,
+ struct tuple *old_tuple, struct tuple *new_tuple,
+ enum dup_replace_mode)
{
SophiaIndex *index = (SophiaIndex*)index_find(space, 0);
assert(index != NULL);
diff --git a/src/box/sophia_index.h b/src/box/sophia_index.h
index a4ad63bccc660492d6299d21aab67e79ca8608d1..063961d790843fd5f5c17a6977327f5b0ffc14c6 100644
--- a/src/box/sophia_index.h
+++ b/src/box/sophia_index.h
@@ -55,8 +55,13 @@ class SophiaIndex: public Index {
};
struct tuple *
-sophia_index_recover_replace(struct space*,
- struct tuple*, struct tuple*,
- enum dup_replace_mode);
+sophia_replace_recover(struct space*,
+ struct tuple*, struct tuple*,
+ enum dup_replace_mode);
+
+struct tuple *
+sophia_replace(struct space*,
+ struct tuple*, struct tuple*,
+ enum dup_replace_mode);
#endif /* TARANTOOL_BOX_SOPHIA_INDEX_H_INCLUDED */
diff --git a/test/box/sophia.result b/test/box/sophia.result
index ae8c4bed268ac15b944d54f30071729bb8265926..2c4557dccb7e77ff3b0a64cf91ce2e41c57b30f7 100644
--- a/test/box/sophia.result
+++ b/test/box/sophia.result
@@ -2,8 +2,6 @@ os.execute("rm -rf sophia")
---
- 0
...
---# stop server default
---# start server default
space = box.schema.create_space('tweedledum', { id = 123, engine = 'sophia' })
---
...
@@ -113,6 +111,75 @@ box.snapshot()
---
- ok
...
+--
+-- gh-283: Sophia: hang after three creates and drops
+--
+s = box.schema.create_space('space0', {id = 33, engine='sophia'})
+---
+...
+i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
+---
+...
+s:insert{'a', 'b', 'c'}
+---
+- ['a', 'b', 'c']
+...
+s:drop()
+---
+...
+s = box.schema.create_space('space0', {id = 33, engine='sophia'})
+---
+...
+i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
+---
+...
+s:insert{'a', 'b', 'c'}
+---
+- ['a', 'b', 'c']
+...
+t = s.index[0]:select({}, {iterator = box.index.ALL})
+---
+...
+t
+---
+- - ['a', 'b', 'c']
+...
+s:drop()
+---
+...
+s = box.schema.create_space('space0', {id = 33, engine='sophia'})
+---
+...
+i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
+---
+...
+s:insert{'a', 'b', 'c'}
+---
+- ['a', 'b', 'c']
+...
+t = s.index[0]:select({}, {iterator = box.index.ALL})
+---
+...
+t
+---
+- - ['a', 'b', 'c']
+...
+s:drop()
+---
+...
+--
+-- gh-280: Sophia: crash if insert without index
+--
+s = box.schema.create_space('test', {engine='sophia'})
+---
+...
+s:insert{'a'}
+---
+- error: 'No index #0 is defined in space ''test'''
+...
+s:drop()
+---
+...
os.execute("rm -rf sophia")
---
- 0
diff --git a/test/box/sophia.test.lua b/test/box/sophia.test.lua
index 47c65f5246ef8ece57946363ccae6b4f6170b1b3..add92a80883c56433a01eb184a424821526b70fe 100644
--- a/test/box/sophia.test.lua
+++ b/test/box/sophia.test.lua
@@ -1,6 +1,4 @@
os.execute("rm -rf sophia")
---# stop server default
---# start server default
space = box.schema.create_space('tweedledum', { id = 123, engine = 'sophia' })
space:create_index('primary', { type = 'tree', parts = {1, 'num'} })
@@ -28,4 +26,36 @@ t
space:drop()
box.snapshot()
+
+--
+-- gh-283: Sophia: hang after three creates and drops
+--
+
+s = box.schema.create_space('space0', {id = 33, engine='sophia'})
+i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
+s:insert{'a', 'b', 'c'}
+s:drop()
+
+s = box.schema.create_space('space0', {id = 33, engine='sophia'})
+i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
+s:insert{'a', 'b', 'c'}
+t = s.index[0]:select({}, {iterator = box.index.ALL})
+t
+s:drop()
+
+s = box.schema.create_space('space0', {id = 33, engine='sophia'})
+i = s:create_index('space0', {type = 'tree', parts = {1, 'STR'}})
+s:insert{'a', 'b', 'c'}
+t = s.index[0]:select({}, {iterator = box.index.ALL})
+t
+s:drop()
+
+--
+-- gh-280: Sophia: crash if insert without index
+--
+
+s = box.schema.create_space('test', {engine='sophia'})
+s:insert{'a'}
+s:drop()
+
os.execute("rm -rf sophia")
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 2f3086c48baabf579def966612806704a94768a6..dc1ae0a7765590755fa51deae03b855f99289f04 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -7,11 +7,6 @@ include_directories(${PROJECT_BINARY_DIR}/src)
include_directories(${PROJECT_SOURCE_DIR}/src/lib)
include_directories(${CMAKE_SOURCE_DIR}/third_party)
add_executable(rlist.test rlist.c test.c ${CMAKE_SOURCE_DIR}/src/lib/salad/rlist.c)
-
-add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/src/uri.cc
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
- COMMAND ragel -G2 src/uri.rl -o src/uri.cc
- DEPENDS ${CMAKE_SOURCE_DIR}/src/uri.rl)
add_executable(uri.test uri.cc test.c ${CMAKE_SOURCE_DIR}/src/uri.cc)
add_executable(fiob.test test.c fiob.c ${CMAKE_SOURCE_DIR}/src/fiob.c)
add_executable(queue.test queue.c)
diff --git a/third_party/sophia b/third_party/sophia
index 76af0633c3d8b628fb1be51fc604d9450f5cdd26..c9279c8c0221aa224135560e23392d29bccbc7c5 160000
--- a/third_party/sophia
+++ b/third_party/sophia
@@ -1 +1 @@
-Subproject commit 76af0633c3d8b628fb1be51fc604d9450f5cdd26
+Subproject commit c9279c8c0221aa224135560e23392d29bccbc7c5