From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 8D8B02CC5F for ; Mon, 19 Nov 2018 08:47:43 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CDGnlSB-TpZD for ; Mon, 19 Nov 2018 08:47:43 -0500 (EST) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 0B22E2CC6A for ; Mon, 19 Nov 2018 08:47:43 -0500 (EST) From: Vladislav Shpilevoy Subject: [tarantool-patches] [PATCH 3/3] sql: too many autogenerated ids leads to SEGFAULT Date: Mon, 19 Nov 2018 16:47:30 +0300 Message-Id: <6128bdce00cc4c6d47c122897c195e30e0416613.1542635129.git.v.shpilevoy@tarantool.org> In-Reply-To: References: In-Reply-To: References: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: korablev@tarantool.org, Mergen Imeev From: Mergen Imeev 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. 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 b6afe9184..cc340e942 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 615a0f064..f2faad862 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 b1313e10e..b2a1e42cc 100644 --- a/test/sql/iproto.result +++ b/test/sql/iproto.result @@ -794,6 +794,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 5c90cba52..da52d631e 100644 --- a/test/sql/iproto.test.lua +++ b/test/sql/iproto.test.lua @@ -261,6 +261,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.17.2 (Apple Git-113)