[tarantool-patches] Re: [PATCH v1 1/1] sql: hold in stat tables space/index id instead of name
Vladislav Shpilevoy
v.shpilevoy at tarantool.org
Wed Aug 29 22:27:03 MSK 2018
Hi! Thanks for the fixes!
I have force pushed my review fixes. I removed
some leading white spaces and useless assertions.
The diff is below.
Please, fetch, rebase and send to Nikita on the
second review.
diff --git a/src/box/sql/analyze.c b/src/box/sql/analyze.c
index a7cc173cd..3d825acb9 100644
--- a/src/box/sql/analyze.c
+++ b/src/box/sql/analyze.c
@@ -1016,8 +1016,6 @@ analyzeOneTable(Parse * pParse, /* Parser context */
/* Add the entry to the stat1 table. */
callStatGet(v, regStat4, STAT_GET_STAT1, regStat1);
- assert("DDB"[0] == AFFINITY_INTEGER);
- assert("BBB"[2] == AFFINITY_TEXT);
sqlite3VdbeAddOp4(v, OP_MakeRecord, reg_space_id, 3, regTemp,
"DDB", 0);
sqlite3VdbeAddOp2(v, OP_IdxInsert, iStatCur, regTemp);
diff --git a/test/sql-tap/analyze9.test.lua b/test/sql-tap/analyze9.test.lua
index b0fec3b1c..2c6b4b8a0 100755
--- a/test/sql-tap/analyze9.test.lua
+++ b/test/sql-tap/analyze9.test.lua
@@ -70,8 +70,8 @@ test:do_execsql_test(
SELECT "idx","neq","nlt","ndlt",msgpack_decode_sample("sample") FROM "_sql_stat4" where "idx" = %i;
]], t1.index['I1'].id), {
-- <1.2>
- 1, "1 1", "0 0", "0 0", "(0) (0)", 1, "1 1", "1 1", "1 1", "(1) (1)",
- 1, "1 1", "2 2", "2 2", "(2) (2)", 1, "1 1", "3 3", "3 3", "(3) (3)",
+ 1, "1 1", "0 0", "0 0", "(0) (0)", 1, "1 1", "1 1", "1 1", "(1) (1)",
+ 1, "1 1", "2 2", "2 2", "(2) (2)", 1, "1 1", "3 3", "3 3", "(3) (3)",
1, "1 1", "4 4", "4 4", "(4) (4)"
-- </1.2>
})
@@ -82,8 +82,8 @@ test:do_execsql_test(
SELECT "idx","neq","nlt","ndlt",msgpack_decode_sample("sample") FROM "_sql_stat4" where "idx" = %i;
]], t1.index[0].id), {
-- <1.3>
- 0, '1', '0', '0', '(0)', 0, '1', '1', '1', '(1)',
- 0, '1', '2', '2', '(2)', 0, '1', '3', '3', '(3)',
+ 0, '1', '0', '0', '(0)', 0, '1', '1', '1', '(1)',
+ 0, '1', '2', '2', '(2)', 0, '1', '3', '3', '(3)',
0, '1', '4', '4', '(4)'
-- </1.3>
})
More information about the Tarantool-patches
mailing list