From 0cccd5bde93e7ade362a41de5cde3b53e261d3b2 Mon Sep 17 00:00:00 2001
From: Nikita Pettik <korablev@tarantool.org>
Date: Mon, 15 Oct 2018 20:17:24 +0300
Subject: [PATCH] sql: make DROP TABLE delete entry from _sequence_data
Before this patch, _sequence_data system space wasn't taken into
consideration when space was dropped. However, entries in this space
may appear after recovery. For example:
CREATE TABLE t (id INT PRIMARY KEY AUTOINCREMENT);
INSERT INTO t VALUES (NULL);
box.snapshot()
os.exit()
...
box.cfg{}
DROP TABLE t;
Last DROP statement didn't generate VDBE code to delete entry from
_sequence_data, but it had to do so. This patch simply modifies code
generation to remove entry from _sequence_data space before space is
dropped.
Closes #3712
---
src/box/sql/build.c | 19 +++++++++++++------
test/sql/drop-table.result | 17 +++++++++++++++++
test/sql/drop-table.test.lua | 9 +++++++++
3 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/box/sql/build.c b/src/box/sql/build.c
index a802c45050..63432801db 100644
--- a/src/box/sql/build.c
+++ b/src/box/sql/build.c
@@ -1858,9 +1858,10 @@ sql_code_drop_table(struct Parse *parse_context, struct space *space,
trigger = trigger->next;
}
/*
- * Remove any entries of the _sequence and _space_sequence
- * space associated with the table being dropped. This is
- * done before the table is dropped from internal schema.
+ * Remove any entries from the _sequence_data, _sequence
+ * and _space_sequence spaces associated with the table
+ * being dropped. This is done before the table is dropped
+ * from internal schema.
*/
int idx_rec_reg = ++parse_context->nMem;
int space_id_reg = ++parse_context->nMem;
@@ -1868,6 +1869,15 @@ sql_code_drop_table(struct Parse *parse_context, struct space *space,
sqlite3VdbeAddOp2(v, OP_Integer, space_id, space_id_reg);
sqlite3VdbeAddOp1(v, OP_CheckViewReferences, space_id_reg);
if (space->sequence != NULL) {
+ /* Delete entry from _sequence_data. */
+ int sequence_id_reg = ++parse_context->nMem;
+ sqlite3VdbeAddOp2(v, OP_Integer, space->sequence->def->id,
+ sequence_id_reg);
+ sqlite3VdbeAddOp3(v, OP_MakeRecord, sequence_id_reg, 1,
+ idx_rec_reg);
+ sqlite3VdbeAddOp2(v, OP_SDelete, BOX_SEQUENCE_DATA_ID,
+ idx_rec_reg);
+ VdbeComment((v, "Delete entry from _sequence_data"));
/* Delete entry from _space_sequence. */
sqlite3VdbeAddOp3(v, OP_MakeRecord, space_id_reg, 1,
idx_rec_reg);
@@ -1875,9 +1885,6 @@ sql_code_drop_table(struct Parse *parse_context, struct space *space,
idx_rec_reg);
VdbeComment((v, "Delete entry from _space_sequence"));
/* Delete entry by id from _sequence. */
- int sequence_id_reg = ++parse_context->nMem;
- sqlite3VdbeAddOp2(v, OP_Integer, space->sequence->def->id,
- sequence_id_reg);
sqlite3VdbeAddOp3(v, OP_MakeRecord, sequence_id_reg, 1,
idx_rec_reg);
sqlite3VdbeAddOp2(v, OP_SDelete, BOX_SEQUENCE_ID, idx_rec_reg);
diff --git a/test/sql/drop-table.result b/test/sql/drop-table.result
index 297799e48f..1b941712cc 100644
--- a/test/sql/drop-table.result
+++ b/test/sql/drop-table.result
@@ -29,6 +29,23 @@ box.sql.execute("INSERT INTO zzzoobar VALUES (111, 222, 'c3', 444)")
---
- error: 'no such table: ZZZOOBAR'
...
+-- gh-3712: if space features sequence, data from _sequence_data
+-- must be deleted before space is dropped.
+--
+box.sql.execute("CREATE TABLE t1 (id INT PRIMARY KEY AUTOINCREMENT);")
+---
+...
+box.sql.execute("INSERT INTO t1 VALUES (NULL);")
+---
+...
+box.snapshot()
+---
+- ok
+...
+test_run:cmd('restart server default')
+box.sql.execute("DROP TABLE t1;")
+---
+...
-- Cleanup
-- DROP TABLE should do the job
-- Debug
diff --git a/test/sql/drop-table.test.lua b/test/sql/drop-table.test.lua
index b1c5253457..fadb6d42bb 100644
--- a/test/sql/drop-table.test.lua
+++ b/test/sql/drop-table.test.lua
@@ -20,6 +20,15 @@ box.sql.execute("DROP TABLE zzzoobar")
-- Table does not exist anymore. Should error here.
box.sql.execute("INSERT INTO zzzoobar VALUES (111, 222, 'c3', 444)")
+-- gh-3712: if space features sequence, data from _sequence_data
+-- must be deleted before space is dropped.
+--
+box.sql.execute("CREATE TABLE t1 (id INT PRIMARY KEY AUTOINCREMENT);")
+box.sql.execute("INSERT INTO t1 VALUES (NULL);")
+box.snapshot()
+test_run:cmd('restart server default')
+box.sql.execute("DROP TABLE t1;")
+
-- Cleanup
-- DROP TABLE should do the job
--
GitLab