From a2fbe3bec66936b2f542fa6f9c9238aa2ea452b2 Mon Sep 17 00:00:00 2001 From: drh Date: Tue, 28 Jun 2016 22:27:56 +0000 Subject: [PATCH 1/4] Proposed fix for a problem in the query planner. FossilOrigin-Name: a33d23560959a127e37d8213dc00210cd4b05352 --- manifest | 15 +++++++++------ manifest.uuid | 2 +- src/whereexpr.c | 8 +++----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 2dd253cf30..2e46c5cb6a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Prevent\sthe\sWhereLoop.rSetup\scost\sestimate\sfrom\sgoing\snegative\son\scomplex\nqueries. -D 2016-06-26T04:06:28.081 +C Proposed\sfix\sfor\sa\sproblem\sin\sthe\squery\splanner. +D 2016-06-28T22:27:56.883 F Makefile.in bc2b4864a23a4a21c3e26d7b4350f51bab324d45 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 50149765ef72f4e652b9a0f1f6462c4784bb9423 @@ -465,7 +465,7 @@ F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354 F src/where.c 48eed8ebe319c6cbc7bf7682018f32af0f5189f5 F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0 F src/wherecode.c e20cb381ff621e56a4684c71e31999aca2547ca6 -F src/whereexpr.c c32d47085dbaca0b8fd013210f56693c7d220d48 +F src/whereexpr.c d7dcbf14ce1b5876c1f76496162c30fcba669563 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 @@ -1502,7 +1502,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 507014e4c7a70cd09410c89c8ed466c8edab39d2 -R ae55d782914cbf2db58c75f82f862316 +P f81050859170c8708a1b296da8dd3ef0dd314a11 +R dcdb165f171e6961986899e464931036 +T *branch * planner-fix +T *sym-planner-fix * +T -sym-trunk * U drh -Z e21bca843071316b56d3c29d5bf9cc08 +Z 35245dfa6950894f0d3652717f7690e0 diff --git a/manifest.uuid b/manifest.uuid index ee49eb40ac..f6e2e672d1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f81050859170c8708a1b296da8dd3ef0dd314a11 \ No newline at end of file +a33d23560959a127e37d8213dc00210cd4b05352 \ No newline at end of file diff --git a/src/whereexpr.c b/src/whereexpr.c index 90c4c45965..1cb6be8458 100644 --- a/src/whereexpr.c +++ b/src/whereexpr.c @@ -785,12 +785,10 @@ static int termIsEquivalence(Parse *pParse, Expr *pExpr){ pColl = sqlite3BinaryCompareCollSeq(pParse, pExpr->pLeft, pExpr->pRight); if( pColl==0 || sqlite3StrICmp(pColl->zName, "BINARY")==0 ) return 1; pColl = sqlite3ExprCollSeq(pParse, pExpr->pLeft); - /* Since pLeft and pRight are both a column references, their collating - ** sequence should always be defined. */ - zColl1 = ALWAYS(pColl) ? pColl->zName : 0; + zColl1 = pColl ? pColl->zName : 0; pColl = sqlite3ExprCollSeq(pParse, pExpr->pRight); - zColl2 = ALWAYS(pColl) ? pColl->zName : 0; - return sqlite3StrICmp(zColl1, zColl2)==0; + zColl2 = pColl ? pColl->zName : 0; + return sqlite3_stricmp(zColl1, zColl2)==0; } /* From 883486bada02183e5269e231020d653401886d25 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 1 Jul 2016 19:48:43 +0000 Subject: [PATCH 2/4] Add test cases to the transitive constraint fix. FossilOrigin-Name: c952af89c22ddc31491f142b9511608a4c8f9737 --- manifest | 14 +++++------ manifest.uuid | 2 +- test/collateB.test | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 9 deletions(-) create mode 100644 test/collateB.test diff --git a/manifest b/manifest index 2e46c5cb6a..a7d0cab6bb 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Proposed\sfix\sfor\sa\sproblem\sin\sthe\squery\splanner. -D 2016-06-28T22:27:56.883 +C Add\stest\scases\sto\sthe\stransitive\sconstraint\sfix. +D 2016-07-01T19:48:43.147 F Makefile.in bc2b4864a23a4a21c3e26d7b4350f51bab324d45 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 50149765ef72f4e652b9a0f1f6462c4784bb9423 @@ -574,6 +574,7 @@ F test/collate7.test 8ec29d98f3ee4ccebce6e16ce3863fb6b8c7b868 F test/collate8.test cd9b3d3f999b8520ffaa7cc1647061fc5bab1334 F test/collate9.test 3adcc799229545940df2f25308dd1ad65869145a F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6 +F test/collateB.test 8ec2accd2d7166c1eff0d2a39bc90262c6f89632 F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1 F test/colname.test 08948a4809d22817e0e5de89c7c0a8bd90cb551b F test/conflict.test 029faa2d81a0d1cafb5f88614beb663d972c01db @@ -1502,10 +1503,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P f81050859170c8708a1b296da8dd3ef0dd314a11 -R dcdb165f171e6961986899e464931036 -T *branch * planner-fix -T *sym-planner-fix * -T -sym-trunk * +P a33d23560959a127e37d8213dc00210cd4b05352 +R 9c182c2a1bd41d85d1ee54cc469d61e7 U drh -Z 35245dfa6950894f0d3652717f7690e0 +Z ef208312357a37b91bc1f6c737863420 diff --git a/manifest.uuid b/manifest.uuid index f6e2e672d1..7ba7a01a61 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a33d23560959a127e37d8213dc00210cd4b05352 \ No newline at end of file +c952af89c22ddc31491f142b9511608a4c8f9737 \ No newline at end of file diff --git a/test/collateB.test b/test/collateB.test new file mode 100644 index 0000000000..4815de83ee --- /dev/null +++ b/test/collateB.test @@ -0,0 +1,63 @@ +# 2016-07-01 +# +# The author disclaims copyright to this source code. In place of +# a legal notice, here is a blessing: +# +# May you do good and not evil. +# May you find forgiveness for yourself and forgive others. +# May you share freely, never taking more than you give. +# +#*********************************************************************** +# Test cases for a crash bug. +# + +set testdir [file dirname $argv0] +source $testdir/tester.tcl + +do_execsql_test collateB-1.1 { + CREATE TABLE t1(a INTEGER PRIMARY KEY); + CREATE TABLE t2(b INTEGER PRIMARY KEY, x1 INT COLLATE NOCASE); + CREATE TABLE t3(x2 INT); + SELECT * FROM t3, t2, t1 WHERE x2=b AND x1=a AND a=1; +} {} +do_execsql_test collateB-1.2 { + INSERT INTO t1(a) VALUES(1),(2),(3); + INSERT INTO t2(b,x1) VALUES(11,1),(22,2),(33,3); + INSERT INTO t3(x2) VALUES(11),(22),(33); + SELECT *,'|' FROM t3, t2, t1 WHERE x2=b AND x1=a AND a=1; +} {11 11 1 1 |} +do_execsql_test collateB-1.3 { + SELECT *,'|' FROM t3, t1, t2 WHERE x2=b AND x1=a AND a=1; +} {11 1 11 1 |} +do_execsql_test collateB-1.4 { + SELECT *,'|' FROM t2, t3, t1 WHERE x2=b AND x1=a AND a=1; +} {11 1 11 1 |} +do_execsql_test collateB-1.5 { + SELECT *,'|' FROM t2, t1, t3 WHERE x2=b AND x1=a AND a=1; +} {11 1 1 11 |} +do_execsql_test collateB-1.6 { + SELECT *,'|' FROM t1, t2, t3 WHERE x2=b AND x1=a AND a=1; +} {1 11 1 11 |} +do_execsql_test collateB-1.7 { + SELECT *,'|' FROM t1, t2, t3 WHERE x2=b AND x1=a AND a=1; +} {1 11 1 11 |} +do_execsql_test collateB-1.12 { + SELECT *,'|' FROM t3, t2, t1 WHERE b=x2 AND a=x1 AND 1=a; +} {11 11 1 1 |} +do_execsql_test collateB-1.13 { + SELECT *,'|' FROM t3, t1, t2 WHERE b=x2 AND a=x1 AND 1=a; +} {11 1 11 1 |} +do_execsql_test collateB-1.14 { + SELECT *,'|' FROM t2, t3, t1 WHERE b=x2 AND a=x1 AND 1=a; +} {11 1 11 1 |} +do_execsql_test collateB-1.15 { + SELECT *,'|' FROM t2, t1, t3 WHERE b=x2 AND a=x1 AND 1=a; +} {11 1 1 11 |} +do_execsql_test collateB-1.16 { + SELECT *,'|' FROM t1, t2, t3 WHERE b=x2 AND a=x1 AND 1=a; +} {1 11 1 11 |} +do_execsql_test collateB-1.17 { + SELECT *,'|' FROM t1, t2, t3 WHERE b=x2 AND a=x1 AND 1=a; +} {1 11 1 11 |} + +finish_test From 5fbab882c040a68ba3c665445e0f4672705f0991 Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 2 Jul 2016 12:08:14 +0000 Subject: [PATCH 3/4] Add support for table-valued functions on the RHS of an IN operator. FossilOrigin-Name: ac6000f050ff4efcf8a87f0825077dbf4144f073 --- manifest | 15 +++++++-------- manifest.uuid | 2 +- src/parse.y | 11 ++++++++++- test/tabfunc01.test | 9 +++++++++ 4 files changed, 27 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 6abed8d72a..1906e09ab0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\stransitive\sconstraint\slogic\serror\sthat\scan\sresult\sin\sa\snull\spointer\ndereference.\s\sFix\sfor\sticket\s[e8d439c77685eca6]. -D 2016-07-01T20:12:39.149 +C Add\ssupport\sfor\stable-valued\sfunctions\son\sthe\sRHS\sof\san\sIN\soperator. +D 2016-07-02T12:08:14.436 F Makefile.in bc2b4864a23a4a21c3e26d7b4350f51bab324d45 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 50149765ef72f4e652b9a0f1f6462c4784bb9423 @@ -371,7 +371,7 @@ F src/os_win.c d4b8faf8896b65818e67070711fdd00d8e620bd6 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/pager.c c368634b888b1c8740aea83b36bfd266f2443e60 F src/pager.h 8ab6b6feeee4bc0439bfde7ee59ba99df98b9bc3 -F src/parse.y 01b9f37c4c7009ab56fda98bc7db4c42643cecfe +F src/parse.y 3660ab75e7c9212fbe9ca75264d26e6587cd0ae4 F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490 F src/pcache1.c 7f51d2b541aab57596adf62db2c4bb025d34f04d @@ -1115,7 +1115,7 @@ F test/symlink.test c9ebe7330d228249e447038276bfc8a7b22f4849 F test/sync.test 2f84bdbc2b2df1fcb0220575b4b9f8cea94b7529 F test/syscall.test f59ba4e25f7ba4a4c031026cc2ef8b6e4b4c639c F test/sysfault.test c9f2b0d8d677558f74de750c75e12a5454719d04 -F test/tabfunc01.test f977868fa8bb7beb4b2072883190411653473906 +F test/tabfunc01.test bb774639915aaaf30417f8d0faf832c3309a3338 F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126 F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930 @@ -1503,8 +1503,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P f81050859170c8708a1b296da8dd3ef0dd314a11 c952af89c22ddc31491f142b9511608a4c8f9737 -R 9c182c2a1bd41d85d1ee54cc469d61e7 -T +closed c952af89c22ddc31491f142b9511608a4c8f9737 +P 228a7879870f8689e2f9b74fbef2ff93fab7b3c2 +R 1f493f554aeef5ddfd3c1d7c325d64e1 U drh -Z 6ff2c1fb4a902fab6eeb4b75477a29a3 +Z 647695f7bc7b8a80ecfde87fc6913c51 diff --git a/manifest.uuid b/manifest.uuid index 35505c7dd1..7fc1b862dc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -228a7879870f8689e2f9b74fbef2ff93fab7b3c2 \ No newline at end of file +ac6000f050ff4efcf8a87f0825077dbf4144f073 \ No newline at end of file diff --git a/src/parse.y b/src/parse.y index 9294a30428..04dc49d6aa 100644 --- a/src/parse.y +++ b/src/parse.y @@ -1134,9 +1134,10 @@ expr(A) ::= expr(A) between_op(N) expr(X) AND expr(Y). [BETWEEN] { exprNot(pParse, N, &A); A.zEnd = &E.z[E.n]; } - expr(A) ::= expr(A) in_op(N) nm(Y) dbnm(Z). [IN] { + expr(A) ::= expr(A) in_op(N) nm(Y) dbnm(Z) paren_exprlist(E). [IN] { SrcList *pSrc = sqlite3SrcListAppend(pParse->db, 0,&Y,&Z); Select *pSelect = sqlite3SelectNew(pParse, 0,pSrc,0,0,0,0,0,0,0); + if( E ) sqlite3SrcListFuncArgs(pParse, pSrc, E); A.pExpr = sqlite3PExpr(pParse, TK_IN, A.pExpr, 0, 0); sqlite3PExprAddSelect(pParse, A.pExpr, pSelect); exprNot(pParse, N, &A); @@ -1193,6 +1194,14 @@ nexprlist(A) ::= nexprlist(A) COMMA expr(Y). nexprlist(A) ::= expr(Y). {A = sqlite3ExprListAppend(pParse,0,Y.pExpr); /*A-overwrites-Y*/} +/* A paren_exprlist is an optional expression list contained inside +** of parenthesis */ +%type paren_exprlist {ExprList*} +%destructor paren_exprlist {sqlite3ExprListDelete(pParse->db, $$);} +paren_exprlist(A) ::= . {A = 0;} +paren_exprlist(A) ::= LP exprlist(X) RP. {A = X;} + + ///////////////////////////// The CREATE INDEX command /////////////////////// // diff --git a/test/tabfunc01.test b/test/tabfunc01.test index 879a045b8e..7d32f48387 100644 --- a/test/tabfunc01.test +++ b/test/tabfunc01.test @@ -135,4 +135,13 @@ do_execsql_test tabfunc01-500 { ORDER BY +1; } {1 7 11 17} +# Table-valued functions on the RHS of an IN operator +# +do_execsql_test tabfunc01-600 { + CREATE TABLE t600(a INTEGER PRIMARY KEY, b TEXT); + WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<100) + INSERT INTO t600(a,b) SELECT x, printf('(%03d)',x) FROM c; + SELECT b FROM t600 WHERE a IN generate_series(2,52,10); +} {(002) (012) (022) (032) (042) (052)} + finish_test From 9de4757c9c10c9c36c61501314cf17cdebe81c1a Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 2 Jul 2016 12:33:21 +0000 Subject: [PATCH 4/4] Fix a problem in table-valued functions on the RHS of an IN operator that occurs following an OOM error. FossilOrigin-Name: bead151e72215e6ca2a90eb049cfca414dccea04 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/parse.y | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 1906e09ab0..67ebe5290b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\ssupport\sfor\stable-valued\sfunctions\son\sthe\sRHS\sof\san\sIN\soperator. -D 2016-07-02T12:08:14.436 +C Fix\sa\sproblem\sin\stable-valued\sfunctions\son\sthe\sRHS\sof\san\sIN\soperator\sthat\noccurs\sfollowing\san\sOOM\serror. +D 2016-07-02T12:33:21.171 F Makefile.in bc2b4864a23a4a21c3e26d7b4350f51bab324d45 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 50149765ef72f4e652b9a0f1f6462c4784bb9423 @@ -371,7 +371,7 @@ F src/os_win.c d4b8faf8896b65818e67070711fdd00d8e620bd6 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca F src/pager.c c368634b888b1c8740aea83b36bfd266f2443e60 F src/pager.h 8ab6b6feeee4bc0439bfde7ee59ba99df98b9bc3 -F src/parse.y 3660ab75e7c9212fbe9ca75264d26e6587cd0ae4 +F src/parse.y f374ab20106362eb3f5c01b3e6a002f0bbead7ff F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490 F src/pcache1.c 7f51d2b541aab57596adf62db2c4bb025d34f04d @@ -1503,7 +1503,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 228a7879870f8689e2f9b74fbef2ff93fab7b3c2 -R 1f493f554aeef5ddfd3c1d7c325d64e1 +P ac6000f050ff4efcf8a87f0825077dbf4144f073 +R 59b18bb8c847f9af40e3580110542be4 U drh -Z 647695f7bc7b8a80ecfde87fc6913c51 +Z 7fb23bc853c489879c3871faac168f56 diff --git a/manifest.uuid b/manifest.uuid index 7fc1b862dc..b49dcbac4b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ac6000f050ff4efcf8a87f0825077dbf4144f073 \ No newline at end of file +bead151e72215e6ca2a90eb049cfca414dccea04 \ No newline at end of file diff --git a/src/parse.y b/src/parse.y index 04dc49d6aa..8a65131e28 100644 --- a/src/parse.y +++ b/src/parse.y @@ -1137,7 +1137,7 @@ expr(A) ::= expr(A) between_op(N) expr(X) AND expr(Y). [BETWEEN] { expr(A) ::= expr(A) in_op(N) nm(Y) dbnm(Z) paren_exprlist(E). [IN] { SrcList *pSrc = sqlite3SrcListAppend(pParse->db, 0,&Y,&Z); Select *pSelect = sqlite3SelectNew(pParse, 0,pSrc,0,0,0,0,0,0,0); - if( E ) sqlite3SrcListFuncArgs(pParse, pSrc, E); + if( E ) sqlite3SrcListFuncArgs(pParse, pSelect ? pSrc : 0, E); A.pExpr = sqlite3PExpr(pParse, TK_IN, A.pExpr, 0, 0); sqlite3PExprAddSelect(pParse, A.pExpr, pSelect); exprNot(pParse, N, &A);