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 3C62E276B2 for ; Mon, 6 Aug 2018 11:59:00 -0400 (EDT) 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 fSw3whFfzucL for ; Mon, 6 Aug 2018 11:59:00 -0400 (EDT) Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 EA40A2746C for ; Mon, 6 Aug 2018 11:58:59 -0400 (EDT) From: Kirill Shcherbatov Subject: [tarantool-patches] [PATCH v1 1/1] sql: fix segfault with check referencing new table Date: Mon, 6 Aug 2018 18:58:55 +0300 Message-Id: <9caa1c4097e37c7d2eed85d6d52ac3af724ccf34.1533571088.git.kshcherbatov@tarantool.org> 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, Kirill Shcherbatov Starting with 9a54320 on tuple insertion in _space we make sql_checks_resolve_space_def_reference for checks if any. During executing on_replace_dd_space trigger box_space_id_by_name that takes a look to _space space returnes not-nullable value, but the same time space object doesn't present in space chache and could not be found with space_by_id. Before 1.10 path 0ecabde merged to 2.0 as a part of 13df2b1 box_space_id_by_name returned BOX_ID_NIL because of "multi-engine transaction error" that is not rased in same situation now. Closes #3611. --- Branch: http://github.com/tarantool/tarantool/tree/kshch/gh-3611-subquery-with-self-reference-check Issue: https://github.com/tarantool/tarantool/issues/3611 src/box/sql/select.c | 5 ++--- test/sql/checks.result | 8 ++++++++ test/sql/checks.test.lua | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/box/sql/select.c b/src/box/sql/select.c index d824b8b..6738ba5 100644 --- a/src/box/sql/select.c +++ b/src/box/sql/select.c @@ -4817,14 +4817,13 @@ selectExpander(Walker * pWalker, Select * p) int space_id = box_space_id_by_name(t_name, strlen(t_name)); - if (space_id == BOX_ID_NIL) { + struct space *space = space_by_id(space_id); + if (space == NULL) { sqlite3ErrorMsg(pParse, "no such table: %s", t_name); return WRC_Abort; } - struct space *space = space_by_id(space_id); - if (space->def->field_count <= 0) { sqlite3ErrorMsg(pParse, "no format for"\ " space: %s", t_name); diff --git a/test/sql/checks.result b/test/sql/checks.result index 2a31b01..094367a 100644 --- a/test/sql/checks.result +++ b/test/sql/checks.result @@ -105,6 +105,14 @@ s = box.space._space:insert(t) --- - error: 'Wrong space options (field 5): invalid MsgPack map field ''name'' type' ... +box.sql.execute("CREATE TABLE w2 (s1 INT PRIMARY KEY, CHECK ((SELECT COUNT(*) FROM w2) = 0));") +--- +- error: 'Failed to create space ''W2'': SQL error: no such table: W2' +... +box.sql.execute("DROP TABLE w2;") +--- +- error: 'no such table: W2' +... test_run:cmd("clear filter") --- - true diff --git a/test/sql/checks.test.lua b/test/sql/checks.test.lua index 7ff78fe..bbd6747 100644 --- a/test/sql/checks.test.lua +++ b/test/sql/checks.test.lua @@ -43,4 +43,8 @@ format = {{name = 'X', type = 'unsigned'}} t = {513, 1, 'test', 'memtx', 0, opts, format} s = box.space._space:insert(t) + +box.sql.execute("CREATE TABLE w2 (s1 INT PRIMARY KEY, CHECK ((SELECT COUNT(*) FROM w2) = 0));") +box.sql.execute("DROP TABLE w2;") + test_run:cmd("clear filter") -- 2.7.4