From 2777828ea3c3442f45be69d58d0b305e4b21b29f Mon Sep 17 00:00:00 2001
From: Mergen Imeev <imeevma@gmail.com>
Date: Fri, 17 May 2019 17:56:56 +0300
Subject: [PATCH] sql: replace is_temprorary with is_ephemeral for surrogate
defs
Up to this point, the is_temporary flag has been set for surrogate space
definitions used to transfer meta-information during compilation stage
of DML queries (CREATE TABLE/INDEX etc).
At some point, it became possible to use spaces created in Lua in
SQL statements. Since it is allowed to create temporary spaces in
Lua, not all temporary spaces in SQL are surrogate wrappers. To separate
real temporary spaces (i.e. which came from space cache) from surrogate
ones, is_ephemeral flag is now set in such spaces instead of
is_temporary. Note that there can't be mess between these flags since
ephemeral spaces can exist only during execution of VDBE bytecode.
Also note that flag is required only for debugging facilities.
Close #4139
---
src/box/sql.c | 2 +-
src/box/sql/build.c | 14 +++++++-------
src/box/sql/tokenize.c | 2 +-
test/sql/misc.result | 22 ++++++++++++++++++++++
test/sql/misc.test.lua | 9 +++++++++
5 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/src/box/sql.c b/src/box/sql.c
index 3d88ccbb4e..332e1c02b5 100644
--- a/src/box/sql.c
+++ b/src/box/sql.c
@@ -1237,7 +1237,7 @@ sql_ephemeral_space_def_new(struct Parse *parser, const char *name)
memset(def, 0, size);
memcpy(def->name, name, name_len);
def->name[name_len] = '\0';
- def->opts.is_temporary = true;
+ def->opts.is_ephemeral = true;
return def;
}
diff --git a/src/box/sql/build.c b/src/box/sql/build.c
index c027806d00..d98ccadc5c 100644
--- a/src/box/sql/build.c
+++ b/src/box/sql/build.c
@@ -414,7 +414,7 @@ sqlAddColumn(Parse * pParse, Token * pName, struct type_def *type_def)
* As sql_field_retrieve will allocate memory on region
* ensure that def is also temporal and would be dropped.
*/
- assert(def->opts.is_temporary);
+ assert(def->opts.is_ephemeral);
if (sql_field_retrieve(pParse, def, def->field_count) == NULL)
return;
struct region *region = &pParse->region;
@@ -485,7 +485,7 @@ sqlAddDefaultValue(Parse * pParse, ExprSpan * pSpan)
sql *db = pParse->db;
struct space *p = pParse->create_table_def.new_space;
if (p != NULL) {
- assert(p->def->opts.is_temporary);
+ assert(p->def->opts.is_ephemeral);
struct space_def *def = p->def;
if (!sqlExprIsConstantOrFunction
(pSpan->pExpr, db->init.busy)) {
@@ -789,7 +789,7 @@ sql_column_collation(struct space_def *def, uint32_t column, uint32_t *coll_id)
* In cases mentioned above collation is fetched by id.
*/
if (space == NULL) {
- assert(def->opts.is_temporary);
+ assert(def->opts.is_ephemeral);
assert(column < (uint32_t)def->field_count);
*coll_id = def->fields[column].coll_id;
struct coll_id *collation = coll_by_id(*coll_id);
@@ -1403,7 +1403,7 @@ sql_create_view(struct Parse *parse_context)
sqlSelectAddColumnTypeAndCollation(parse_context, space->def,
view_def->select);
} else {
- assert(select_res_space->def->opts.is_temporary);
+ assert(select_res_space->def->opts.is_ephemeral);
space->def->fields = select_res_space->def->fields;
space->def->field_count = select_res_space->def->field_count;
select_res_space->def->fields = NULL;
@@ -2964,14 +2964,14 @@ sqlSrcListDelete(sql * db, SrcList * pList)
if (pItem->fg.isTabFunc)
sql_expr_list_delete(db, pItem->u1.pFuncArg);
/*
- * Space is either not temporary which means that
- * it came from space cache; or space is temporary
+ * Space is either not ephemeral which means that
+ * it came from space cache; or space is ephemeral
* but has no indexes and check constraints.
* The latter proves that it is not the space
* which might come from CREATE TABLE routines.
*/
assert(pItem->space == NULL ||
- !pItem->space->def->opts.is_temporary ||
+ !pItem->space->def->opts.is_ephemeral ||
pItem->space->index == NULL);
sql_select_delete(db, pItem->pSelect);
sql_expr_delete(db, pItem->pOn, false);
diff --git a/src/box/sql/tokenize.c b/src/box/sql/tokenize.c
index dbaebfefca..902b69f9d2 100644
--- a/src/box/sql/tokenize.c
+++ b/src/box/sql/tokenize.c
@@ -432,7 +432,7 @@ parser_space_delete(struct sql *db, struct space *space)
{
if (space == NULL || db == NULL || db->pnBytesFreed == 0)
return;
- assert(space->def->opts.is_temporary);
+ assert(space->def->opts.is_ephemeral);
for (uint32_t i = 0; i < space->index_count; ++i)
index_def_delete(space->index[i]->def);
}
diff --git a/test/sql/misc.result b/test/sql/misc.result
index b117e15e7a..bc8b10e879 100644
--- a/test/sql/misc.result
+++ b/test/sql/misc.result
@@ -106,3 +106,25 @@ box.execute('SELECT X\'4D6564766564\'')
rows:
- ['Medved']
...
+--
+-- gh-4139: assertion when reading a temporary space.
+--
+format = {{name = 'id', type = 'integer'}}
+---
+...
+s = box.schema.space.create('s',{format=format, temporary=true})
+---
+...
+i = s:create_index('i')
+---
+...
+box.execute('select * from "s"')
+---
+- metadata:
+ - name: id
+ type: integer
+ rows: []
+...
+s:drop()
+---
+...
diff --git a/test/sql/misc.test.lua b/test/sql/misc.test.lua
index 0b1c34d1ba..fdc19f3ac7 100644
--- a/test/sql/misc.test.lua
+++ b/test/sql/misc.test.lua
@@ -26,3 +26,12 @@ box.execute('SELECT 1.5;')
box.execute('SELECT 1.0;')
box.execute('SELECT \'abc\';')
box.execute('SELECT X\'4D6564766564\'')
+
+--
+-- gh-4139: assertion when reading a temporary space.
+--
+format = {{name = 'id', type = 'integer'}}
+s = box.schema.space.create('s',{format=format, temporary=true})
+i = s:create_index('i')
+box.execute('select * from "s"')
+s:drop()
--
GitLab