<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
</head>
<body text="#000000" bgcolor="#FFFFFF">
Hello! Thank you for review! Diff between two last versions<br>
and new patch below.<br>
<br>
<div class="moz-cite-prefix">On 10/11/2018 03:48 PM, Никита Петтик
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:665AF75C-4542-4DE1-BFCA-F480367585A6@gmail.com">
<blockquote type="cite">
<pre wrap="">commit 53a229c67b096a09f26df4b5ba73d9a90c46e38f
Author: Mergen Imeev <a class="moz-txt-link-rfc2396E" href="mailto:imeevma@gmail.com"><imeevma@gmail.com></a>
Date: Thu Sep 27 22:42:29 2018 +0300
sql: assertion in autoincrement column
If query is like "INSERT INTO table SELECT ..." then it is
completely fine that the result of SELECT isn't integer. This
value wasn't cheched propertly if it was inserted in column
</pre>
</blockquote>
<pre wrap="">Nit: cheched? propertly?
Correct version I guess should be:
’This values wouldn’t be checked properly if it was inserted ...'</pre>
</blockquote>
Fixed.<br>
<blockquote type="cite"
cite="mid:665AF75C-4542-4DE1-BFCA-F480367585A6@gmail.com">
<blockquote type="cite">
<pre wrap=""> with autoincrement.
Closes #3670
diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c
index 7c1015c..de18262 100644
--- a/src/box/sql/vdbe.c
+++ b/src/box/sql/vdbe.c
@@ -3736,10 +3736,15 @@ case OP_FCopy: { /* out2 */
/* Flag is set and register is NULL -> do nothing */
} else {
assert(memIsValid(pIn1));
- assert(pIn1->flags & MEM_Int);
pOut = &aMem[pOp->p2];
- MemSetTypeFlag(pOut, MEM_Int);
+ /*
+ * If query is like "INSERT INTO table SELECT ..."
+ * then it is possible then the result of SELECT
+ * isn't MEM_Int. It will be checked later in
+ * current VDBE.
+ */
</pre>
</blockquote>
<pre wrap="">How OP_FCopy is related to this ticket?
Comment to this opcodes clearly says:
* Copy integer value of register P1 in root frame in to register P2 of current
* frame
Mb you need to fix code generation for that query, but I doubt even that.
AFAIU initial problem lies in ticket #3735. Due to this behaviour (converting INT
to FLOAT for overflowed integers) we are trying to insert wrong value to
source table. Hence, this patch is likely to be useless.</pre>
</blockquote>
That is not right. For example (it is current test actually):<br>
<br>
CREATE TABLE t1 (s1 INT PRIMARY KEY AUTOINCREMENT, s2 CHAR);<br>
INSERT INTO t1 VALUES (1, 'a');<br>
INSERT INTO t1 SELECT s2, s2 FROM t1;
<blockquote type="cite"
cite="mid:665AF75C-4542-4DE1-BFCA-F480367585A6@gmail.com">
<blockquote type="cite">
<pre wrap="">+ MemSetTypeFlag(pOut, pIn1->flags);
pOut->u.i = pIn1->u.i;
}
diff --git a/test/sql-tap/autoinc.test.lua b/test/sql-tap/autoinc.test.lua
index dda7061..bd40de9 100755
--- a/test/sql-tap/autoinc.test.lua
+++ b/test/sql-tap/autoinc.test.lua
@@ -1,6 +1,6 @@
#!/usr/bin/env tarantool
test = require("sqltester")
-test:plan(46)
+test:plan(48)
--!./tcltestrunner.lua
-- 2004 November 12
@@ -801,4 +801,29 @@ test:do_test(
-- </autoinc-a69637.2>
})
+-- gh-3670: Assertion with large number in autoincrement column
+test:do_catchsql_test(
+ "autoinc-gh-3670-1",
+ [[
+ CREATE TABLE t0 (s1 INT PRIMARY KEY AUTOINCREMENT);
+ INSERT INTO t0 VALUES (2147483647);
+ INSERT INTO t0 SELECT max(s1)*max(s1)*max(s1) FROM t0;
+ ]], {
+ -- <autoinc-10.2>
+ 1, "datatype mismatch”
</pre>
</blockquote>
<pre wrap="">Still: why ‘datatype mismatch’ and not ‘integer overflow’?
I guess from now this test belongs to
<a class="moz-txt-link-freetext" href="https://github.com/tarantool/tarantool/issues/3735">https://github.com/tarantool/tarantool/issues/3735</a></pre>
</blockquote>
Removed this test and added commented issue 3735<br>
<a class="moz-txt-link-freetext"
href="https://github.com/tarantool/tarantool/issues/3735#issuecomment-428990257">https://github.com/tarantool/tarantool/issues/3735#issuecomment-428990257</a><br>
<blockquote type="cite"
cite="mid:665AF75C-4542-4DE1-BFCA-F480367585A6@gmail.com">
<blockquote type="cite">
<pre wrap="">+ -- </autoinc-10.2>
+ })
+
+test:do_catchsql_test(
+ "autoinc-gh-3670-2",
+ [[
+ CREATE TABLE t1 (s1 INT PRIMARY KEY AUTOINCREMENT, s2 CHAR);
+ INSERT INTO t1 VALUES (1, 'a');
+ INSERT INTO t1 SELECT s2, s2 FROM t1;
+ ]], {
+ -- <autoinc-10.2>
+ 1, "datatype mismatch"
+ -- </autoinc-10.2>
+ })
+
</pre>
</blockquote>
</blockquote>
<br>
<b>Diff between two last versions:</b><br>
<br>
diff --git a/src/box/sql/insert.c b/src/box/sql/insert.c<br>
index 5862917..e98f844 100644<br>
--- a/src/box/sql/insert.c<br>
+++ b/src/box/sql/insert.c<br>
@@ -35,6 +35,7 @@<br>
*/<br>
#include "sqliteInt.h"<br>
#include "tarantoolInt.h"<br>
+#include "vdbeInt.h"<br>
#include "box/session.h"<br>
#include "box/schema.h"<br>
#include "bit/bit.h"<br>
@@ -669,6 +670,11 @@ sqlite3Insert(Parse * pParse, /* Parser
context */<br>
*/<br>
sqlite3VdbeAddOp3(v, OP_Column, srcTab,<br>
j, regTmp);<br>
+ sqlite3VdbeAddOp2(v, OP_IsNull,<br>
+ regTmp,<br>
+ v->nOp + 2);<br>
+ sqlite3VdbeAddOp1(v, OP_MustBeInt,<br>
+ regTmp);<br>
sqlite3VdbeAddOp2(v, OP_FCopy, regTmp,<br>
iRegStore);<br>
sqlite3VdbeChangeP3(v, -1,<br>
@@ -685,6 +691,14 @@ sqlite3Insert(Parse * pParse, /* Parser
context */<br>
* autoinc-ed value with select result<br>
* in case that result is NULL<br>
*/<br>
+ sqlite3VdbeAddOp2(v, OP_IsNull,<br>
+ regFromSelect<br>
+ + j,<br>
+ v->nOp + 2);<br>
+ sqlite3VdbeAddOp1(v,<br>
+ OP_MustBeInt,<br>
+ regFromSelect<br>
+ + j);<br>
sqlite3VdbeAddOp2(v, OP_FCopy,<br>
regFromSelect<br>
+ j,<br>
@@ -714,6 +728,14 @@ sqlite3Insert(Parse * pParse, /* Parser
context */<br>
* autoinc-ed value with select result<br>
* in case that result is NULL<br>
*/<br>
+ sqlite3VdbeAddOp2(v, OP_IsNull,<br>
+ pList->a[j].<br>
+ pExpr->iTable,<br>
+ v->nOp + 2);<br>
+ sqlite3VdbeAddOp1(v,<br>
+ OP_MustBeInt,<br>
+ pList->a[j].<br>
+ pExpr->iTable);<br>
sqlite3VdbeAddOp2(v, OP_FCopy,<br>
pList->a[j].<br>
pExpr->iTable,<br>
diff --git a/src/box/sql/vdbe.c b/src/box/sql/vdbe.c<br>
index de18262..7c1015c 100644<br>
--- a/src/box/sql/vdbe.c<br>
+++ b/src/box/sql/vdbe.c<br>
@@ -3736,15 +3736,10 @@ case OP_FCopy: { /* out2 */<br>
/* Flag is set and register is NULL -> do nothing */<br>
} else {<br>
assert(memIsValid(pIn1));<br>
+ assert(pIn1->flags & MEM_Int);<br>
<br>
pOut = &aMem[pOp->p2];<br>
- /*<br>
- * If query is like "INSERT INTO table SELECT ..."<br>
- * then it is possible then the result of SELECT<br>
- * isn't MEM_Int. It will be checked later in<br>
- * current VDBE.<br>
- */<br>
- MemSetTypeFlag(pOut, pIn1->flags);<br>
+ MemSetTypeFlag(pOut, MEM_Int);<br>
<br>
pOut->u.i = pIn1->u.i;<br>
}<br>
diff --git a/test/sql-tap/autoinc.test.lua
b/test/sql-tap/autoinc.test.lua<br>
index bd40de9..fa45c0e 100755<br>
--- a/test/sql-tap/autoinc.test.lua<br>
+++ b/test/sql-tap/autoinc.test.lua<br>
@@ -1,6 +1,6 @@<br>
#!/usr/bin/env tarantool<br>
test = require("sqltester")<br>
-test:plan(48)<br>
+test:plan(47)<br>
<br>
--!./tcltestrunner.lua<br>
-- 2004 November 12<br>
@@ -803,27 +803,15 @@ test:do_test(<br>
<br>
-- gh-3670: Assertion with large number in autoincrement column<br>
test:do_catchsql_test(<br>
- "autoinc-gh-3670-1",<br>
- [[<br>
- CREATE TABLE t0 (s1 INT PRIMARY KEY AUTOINCREMENT);<br>
- INSERT INTO t0 VALUES (2147483647);<br>
- INSERT INTO t0 SELECT max(s1)*max(s1)*max(s1) FROM t0;<br>
- ]], {<br>
- -- <autoinc-10.2><br>
- 1, "datatype mismatch"<br>
- -- </autoinc-10.2><br>
- })<br>
-<br>
-test:do_catchsql_test(<br>
- "autoinc-gh-3670-2",<br>
+ "autoinc-gh-3670",<br>
[[<br>
CREATE TABLE t1 (s1 INT PRIMARY KEY AUTOINCREMENT, s2
CHAR);<br>
INSERT INTO t1 VALUES (1, 'a');<br>
INSERT INTO t1 SELECT s2, s2 FROM t1;<br>
]], {<br>
- -- <autoinc-10.2><br>
+ -- <autoinc-gh-3670><br>
1, "datatype mismatch"<br>
- -- </autoinc-10.2><br>
+ -- </autoinc-gh-3670><br>
})<br>
<br>
test:finish_test()<br>
<br>
<b>New patch:</b><br>
<br>
commit 37bbfe1fe46c3242137de67b0032a769316aed5f<br>
Author: Mergen Imeev <a class="moz-txt-link-rfc2396E"
href="mailto:imeevma@gmail.com"><imeevma@gmail.com></a><br>
Date: Thu Sep 27 22:42:29 2018 +0300<br>
<br>
sql: assertion in autoincrement column<br>
<br>
If query is like "INSERT INTO table SELECT ..." then it is<br>
completely fine that the result of SELECT isn't integer. These<br>
values wouldn’t be checked properly if it was inserted in<br>
column with autoincrement. This patch fixes mentioned check.<br>
<br>
Closes #3670<br>
<br>
diff --git a/src/box/sql/insert.c b/src/box/sql/insert.c<br>
index 5862917..e98f844 100644<br>
--- a/src/box/sql/insert.c<br>
+++ b/src/box/sql/insert.c<br>
@@ -35,6 +35,7 @@<br>
*/<br>
#include "sqliteInt.h"<br>
#include "tarantoolInt.h"<br>
+#include "vdbeInt.h"<br>
#include "box/session.h"<br>
#include "box/schema.h"<br>
#include "bit/bit.h"<br>
@@ -669,6 +670,11 @@ sqlite3Insert(Parse * pParse, /* Parser
context */<br>
*/<br>
sqlite3VdbeAddOp3(v, OP_Column, srcTab,<br>
j, regTmp);<br>
+ sqlite3VdbeAddOp2(v, OP_IsNull,<br>
+ regTmp,<br>
+ v->nOp + 2);<br>
+ sqlite3VdbeAddOp1(v, OP_MustBeInt,<br>
+ regTmp);<br>
sqlite3VdbeAddOp2(v, OP_FCopy, regTmp,<br>
iRegStore);<br>
sqlite3VdbeChangeP3(v, -1,<br>
@@ -685,6 +691,14 @@ sqlite3Insert(Parse * pParse, /* Parser
context */<br>
* autoinc-ed value with select result<br>
* in case that result is NULL<br>
*/<br>
+ sqlite3VdbeAddOp2(v, OP_IsNull,<br>
+ regFromSelect<br>
+ + j,<br>
+ v->nOp + 2);<br>
+ sqlite3VdbeAddOp1(v,<br>
+ OP_MustBeInt,<br>
+ regFromSelect<br>
+ + j);<br>
sqlite3VdbeAddOp2(v, OP_FCopy,<br>
regFromSelect<br>
+ j,<br>
@@ -714,6 +728,14 @@ sqlite3Insert(Parse * pParse, /* Parser
context */<br>
* autoinc-ed value with select result<br>
* in case that result is NULL<br>
*/<br>
+ sqlite3VdbeAddOp2(v, OP_IsNull,<br>
+ pList->a[j].<br>
+ pExpr->iTable,<br>
+ v->nOp + 2);<br>
+ sqlite3VdbeAddOp1(v,<br>
+ OP_MustBeInt,<br>
+ pList->a[j].<br>
+ pExpr->iTable);<br>
sqlite3VdbeAddOp2(v, OP_FCopy,<br>
pList->a[j].<br>
pExpr->iTable,<br>
diff --git a/test/sql-tap/autoinc.test.lua
b/test/sql-tap/autoinc.test.lua<br>
index dda7061..fa45c0e 100755<br>
--- a/test/sql-tap/autoinc.test.lua<br>
+++ b/test/sql-tap/autoinc.test.lua<br>
@@ -1,6 +1,6 @@<br>
#!/usr/bin/env tarantool<br>
test = require("sqltester")<br>
-test:plan(46)<br>
+test:plan(47)<br>
<br>
--!./tcltestrunner.lua<br>
-- 2004 November 12<br>
@@ -801,4 +801,17 @@ test:do_test(<br>
-- </autoinc-a69637.2><br>
})<br>
<br>
+-- gh-3670: Assertion with large number in autoincrement column<br>
+test:do_catchsql_test(<br>
+ "autoinc-gh-3670",<br>
+ [[<br>
+ CREATE TABLE t1 (s1 INT PRIMARY KEY AUTOINCREMENT, s2
CHAR);<br>
+ INSERT INTO t1 VALUES (1, 'a');<br>
+ INSERT INTO t1 SELECT s2, s2 FROM t1;<br>
+ ]], {<br>
+ -- <autoinc-gh-3670><br>
+ 1, "datatype mismatch"<br>
+ -- </autoinc-gh-3670><br>
+ })<br>
+<br>
test:finish_test()<br>
<br>
</body>
</html>