[tarantool-patches] Re: [PATCH v1 1/1] sql: fix segfault with check referencing new table

[Kirill Shcherbatov <kshcherbatov@tarantool.org>]

Hi! Thank you for comments. I've fixed spell mistakes.

======================================

Starting from 9a54320 on tuple insertion in _space we
execute sql_checks_resolve_space_def_reference for checks
if any on executing on_replace_dd_space trigger. Routine
box_space_id_by_name that takes a look to _space space
returns not-null value, at the same time space object
doesn't present in space cache and can't be found by
space_by_id.
Before 1.10 patch 0ecabde was merged to 2.0 as a part of
13df2b1 box_space_id_by_name used to return BOX_ID_NIL
due to "multi-engine transaction error" that is not raised
in same situation now.

Closes #3611.
---
 src/box/sql/select.c     |  5 ++---
 test/sql/checks.result   | 11 +++++++++++
 test/sql/checks.test.lua |  7 +++++++
 3 files changed, 20 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..3084d89 100644
--- a/test/sql/checks.result
+++ b/test/sql/checks.result
@@ -105,6 +105,17 @@ s = box.space._space:insert(t)
 ---
 - error: 'Wrong space options (field 5): invalid MsgPack map field ''name'' type'
 ...
+--
+-- gh-3611: Segfault on table creation with check referencing this table
+--
+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..fb95809 100644
--- a/test/sql/checks.test.lua
+++ b/test/sql/checks.test.lua
@@ -43,4 +43,11 @@ format = {{name = 'X', type = 'unsigned'}}
 t = {513, 1, 'test', 'memtx', 0, opts, format}
 s = box.space._space:insert(t)
 
+
+--
+-- gh-3611: Segfault on table creation with check referencing this table
+--
+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