[tarantool-patches] [PATCH v1 07/10] sql: too many autogenerated ids leads to SEGFAULT
imeevma at tarantool.org
imeevma at tarantool.org
Sat Nov 17 17:04:03 MSK 2018
This probleam appeared because region was cleaned twice: once in
sqlite3VdbeHalt() and once in sqlite3VdbeDelete() which was
executed during sqlite3_finalize(). Autogenerated ids that were
saved there, were fetched after sqlite3VdbeHalt() and before
sqlite3_finalize(). In this patch region cleaning in
sqlite3VdbeHalt() were removed.
Needed for #3505
Follow up #2618
Follow up #3199
---
src/box/sql/vdbe.c | 8 ++------
src/box/sql/vdbeaux.c | 6 ------
test/sql/iproto.result | 16 ++++++++++++++++
test/sql/iproto.test.lua | 7 +++++++
4 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c
index b6afe91..cc340e9 100644
--- a/src/box/sql/vdbe.c
+++ b/src/box/sql/vdbe.c
@@ -2911,12 +2911,8 @@ case OP_MakeRecord: {
* memory shouldn't be reused until it is written into WAL.
*
* However, if memory for ephemeral space is allocated
- * on region, it will be freed only in vdbeHalt() routine.
- * It is the only way to free this region memory,
- * since ephemeral spaces don't have nothing in common
- * with txn routine and region memory won't be released
- * after txn_commit() or txn_rollback() as it happens
- * with ordinary spaces.
+ * on region, it will be freed only in sqlite3_finalize()
+ * routine.
*/
if (bIsEphemeral) {
rc = sqlite3VdbeMemClearAndResize(pOut, nByte);
diff --git a/src/box/sql/vdbeaux.c b/src/box/sql/vdbeaux.c
index 615a0f0..f2faad8 100644
--- a/src/box/sql/vdbeaux.c
+++ b/src/box/sql/vdbeaux.c
@@ -2498,12 +2498,6 @@ sqlite3VdbeHalt(Vdbe * p)
p->rc = SQLITE_NOMEM_BKPT;
}
- /* Release all region memory which was allocated
- * to hold tuples to be inserted into ephemeral spaces.
- */
- if (!box_txn())
- fiber_gc();
-
assert(db->nVdbeActive > 0 || box_txn() ||
p->anonymous_savepoint == NULL);
return (p->rc == SQLITE_BUSY ? SQLITE_BUSY : SQLITE_OK);
diff --git a/test/sql/iproto.result b/test/sql/iproto.result
index d1bd42a..711d0ef 100644
--- a/test/sql/iproto.result
+++ b/test/sql/iproto.result
@@ -790,6 +790,22 @@ res.rows
- - [[{'name': 'space_id', 'type': 'unsigned'}, {'name': 'lsn', 'type': 'unsigned'},
{'name': 'tuple', 'type': 'array'}]]
...
+-- Too many autogenerated ids leads to SEGFAULT.
+cn = remote.connect(box.cfg.listen)
+---
+...
+box.sql.execute('CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT)')
+---
+...
+for i = 0, 1000 do cn:execute("INSERT INTO t1 VALUES (null)") end
+---
+...
+_ = cn:execute("INSERT INTO t1 SELECT NULL from t1")
+---
+...
+box.sql.execute('DROP TABLE t1')
+---
+...
cn:close()
---
...
diff --git a/test/sql/iproto.test.lua b/test/sql/iproto.test.lua
index 54f17bc..67ca5cd 100644
--- a/test/sql/iproto.test.lua
+++ b/test/sql/iproto.test.lua
@@ -257,6 +257,13 @@ _ = cn:execute("EXPLAIN SELECT 1;")
res = cn:execute('select "format" from "_space" limit 1;')
res.rows
+-- Too many autogenerated ids leads to SEGFAULT.
+cn = remote.connect(box.cfg.listen)
+box.sql.execute('CREATE TABLE t1(id INTEGER PRIMARY KEY AUTOINCREMENT)')
+for i = 0, 1000 do cn:execute("INSERT INTO t1 VALUES (null)") end
+_ = cn:execute("INSERT INTO t1 SELECT NULL from t1")
+box.sql.execute('DROP TABLE t1')
+
cn:close()
box.schema.user.revoke('guest', 'read,write,execute', 'universe')
--
2.7.4
More information about the Tarantool-patches
mailing list