mirror of
https://github.com/sqlite/sqlite.git
synced 2025-07-30 19:03:16 +03:00
Revisit [f84b2beca7197589]: disallow co-routine implementations of tables
that are to the left of a RIGHT JOIN, to avoid other complications. FossilOrigin-Name: cf00ebfc4b77f45ec466b0d57d7c22c7f48acab19e4e55b168eb4b53f390d887
This commit is contained in:
drh
14
manifest
14
manifest
@ -1,5 +1,5 @@
|
||||
C Minor\simprovements\sto\sthe\ssqlite3SrcListShiftJoinType()\sroutine.\s\sThis\sstarted\nout\sto\sbe\san\seffort\sto\sconvert\sRIGHT\sJOIN\sto\sLEFT\sJOIN\sif\sthe\sjoin\swas\son\nthe\sfirst\spair\sof\srelations,\sbut\sthat\smesses\sup\sthe\s"*"\sexpansion\sand\sso\swon't\nwork.
|
||||
D 2022-04-10T20:28:41.210
|
||||
C Revisit\s[f84b2beca7197589]:\sdisallow\sco-routine\simplementations\sof\stables\nthat\sare\sto\sthe\sleft\sof\sa\sRIGHT\sJOIN,\sto\savoid\sother\scomplications.
|
||||
D 2022-04-10T23:01:20.947
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||
@ -552,7 +552,7 @@ F src/printf.c 05d8dfd2018bc4fc3ddb8b37eb97ccef7abf985643fa1caebdcf2916ca90fa32
|
||||
F src/random.c 097dc8b31b8fba5a9aca1697aeb9fd82078ec91be734c16bffda620ced7ab83c
|
||||
F src/resolve.c 7110fc3b5a4dec5d11559141c1906c4a125349fb602f541b05db3a3d448d4b95
|
||||
F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
|
||||
F src/select.c 3d723c58ce6f8b15ef2a3f7b816010efe11d3cf046f44ba9711b70a93d4144e7
|
||||
F src/select.c 4b67f6d827a695cc78057f501dc84c95ce17863fc2047936859e7839d3191ba8
|
||||
F src/shell.c.in 1a8fbf932ecd582b1a5f66c1e8294f92c30d954616f5c7cc54c9623fcdbb028d
|
||||
F src/sqlite.h.in 2a35f62185eb5e7ecc64a2f68442b538ce9be74f80f28a00abc24837edcf1c17
|
||||
F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
|
||||
@ -1146,7 +1146,7 @@ F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
|
||||
F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
|
||||
F test/join5.test 0d63c7e43b3160b9d4b93f196ef83b6efc7751b9edd0d18c53a46fbec7a49cfc
|
||||
F test/join6.test f809c025fa253f9e150c0e9afd4cef8813257bceeb6f46e04041228c9403cc2c
|
||||
F test/join7.test 5a41d7b6089c05d3a081b73b9f1404f802104c8f6354eaaafdce07dcc03538f2
|
||||
F test/join7.test b3e62ec45f9d8a17a4d13df7533805554e893d214554b4d998815834f7f674fa
|
||||
F test/journal1.test c7b768041b7f494471531e17abc2f4f5ebf9e5096984f43ed17c4eb80ba34497
|
||||
F test/journal2.test 9dac6b4ba0ca79c3b21446bbae993a462c2397c4
|
||||
F test/journal3.test 7c3cf23ffc77db06601c1fcfc9743de8441cb77db9d1aa931863d94f5ffa140e
|
||||
@ -1946,8 +1946,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P f84b2beca719758979d7a5a63c3d16d5121a7518b3fbe5039af474a83dd569c2
|
||||
R cd052684f405fbc67ae88c7e7611d8e4
|
||||
P a48902c71ed30c83de7dbd26d1c7956136c35dc53b1076bc8b1ebcba568a3fd3
|
||||
R ca36fcb77f7ad090453c7879b10dd2ed
|
||||
U drh
|
||||
Z ff6cefb3fcd28c733eed400a6a07e7f1
|
||||
Z 2c5ea1399770dbe9a9af46dae89e29ee
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
||||
@ -1 +1 @@
|
||||
a48902c71ed30c83de7dbd26d1c7956136c35dc53b1076bc8b1ebcba568a3fd3
|
||||
cf00ebfc4b77f45ec466b0d57d7c22c7f48acab19e4e55b168eb4b53f390d887
|
||||
12
src/select.c
12
src/select.c
@ -6727,18 +6727,19 @@ int sqlite3Select(
|
||||
|
||||
/* Generate code to implement the subquery
|
||||
**
|
||||
** The subquery is implemented as a co-routine if:
|
||||
** The subquery is implemented as a co-routine all of the following are
|
||||
** true:
|
||||
**
|
||||
** (1) the subquery is guaranteed to be the outer loop (so that
|
||||
** it does not need to be computed more than once), and
|
||||
** (2) the subquery is not a CTE that should be materialized
|
||||
**
|
||||
** TODO: Are there other reasons beside (1) and (2) to use a co-routine
|
||||
** implementation?
|
||||
** (3) the subquery is not part of a left operand for a RIGHT JOIN
|
||||
*/
|
||||
if( i==0
|
||||
&& (pTabList->nSrc==1
|
||||
|| (pTabList->a[1].fg.jointype&(JT_OUTER|JT_CROSS))!=0) /* (1) */
|
||||
&& (pItem->fg.isCte==0 || pItem->u2.pCteUse->eM10d!=M10d_Yes) /* (2) */
|
||||
&& (pTabList->a[0].fg.jointype & JT_LTORJ)==0 /* (3) */
|
||||
){
|
||||
/* Implement a co-routine that will return a single row of the result
|
||||
** set on each invocation.
|
||||
@ -6755,9 +6756,6 @@ int sqlite3Select(
|
||||
pItem->pTab->nRowLogEst = pSub->nSelectRow;
|
||||
pItem->fg.viaCoroutine = 1;
|
||||
pItem->regResult = dest.iSdst;
|
||||
if( pItem->fg.jointype & JT_LTORJ ){
|
||||
sqlite3VdbeAddOp3(v, OP_Null, 0, dest.iSdst, dest.iSdst+dest.nSdst-1);
|
||||
}
|
||||
sqlite3VdbeEndCoroutine(v, pItem->regReturn);
|
||||
sqlite3VdbeJumpHere(v, addrTop-1);
|
||||
sqlite3ClearTempRegCache(pParse);
|
||||
|
||||
125
test/join7.test
125
test/join7.test
@ -15,98 +15,147 @@
|
||||
set testdir [file dirname $argv0]
|
||||
source $testdir/tester.tcl
|
||||
|
||||
db nullvalue NULL
|
||||
do_execsql_test join7-1.1 {
|
||||
CREATE TABLE t1(a int,b int);
|
||||
foreach {id schema} {
|
||||
1 {
|
||||
CREATE TABLE t1(a INT, b INT);
|
||||
INSERT INTO t1 VALUES(1,2),(1,3),(1,4);
|
||||
CREATE INDEX t1a ON t1(a);
|
||||
CREATE TABLE t2(c int,d int);
|
||||
CREATE TABLE t2(c INT, d INT);
|
||||
INSERT INTO t2 VALUES(3,33),(4,44),(5,55);
|
||||
CREATE INDEX t2c ON t2(c);
|
||||
CREATE VIEW dual AS SELECT 'x' AS dummy;
|
||||
SELECT b, d FROM t1 FULL OUTER JOIN t2 ON b=c ORDER BY +b;
|
||||
CREATE VIEW dual(dummy) AS VALUES('x');
|
||||
}
|
||||
2 {
|
||||
CREATE TABLE t1(a INT, b INT);
|
||||
INSERT INTO t1 VALUES(1,2),(1,3),(1,4);
|
||||
CREATE INDEX t1ab ON t1(a,b);
|
||||
CREATE TABLE t2(c INT, d INT);
|
||||
INSERT INTO t2 VALUES(3,33),(4,44),(5,55);
|
||||
CREATE INDEX t2cd ON t2(c,d);
|
||||
CREATE VIEW dual(dummy) AS VALUES('x');
|
||||
}
|
||||
3 {
|
||||
CREATE TABLE t1(a INT, b INT);
|
||||
INSERT INTO t1 VALUES(1,2),(1,3),(1,4);
|
||||
CREATE INDEX t1a ON t1(a);
|
||||
CREATE TABLE t2(c INT, d INT PRIMARY KEY) WITHOUT ROWID;
|
||||
INSERT INTO t2 VALUES(3,33),(4,44),(5,55);
|
||||
CREATE INDEX t2c ON t2(c);
|
||||
CREATE VIEW dual(dummy) AS VALUES('x');
|
||||
}
|
||||
4 {
|
||||
CREATE TABLE t1(a INT, b INT);
|
||||
INSERT INTO t1 VALUES(1,2),(1,3),(1,4);
|
||||
CREATE TABLE t2(c INTEGER PRIMARY KEY, d INT);
|
||||
INSERT INTO t2 VALUES(3,33),(4,44),(5,55);
|
||||
CREATE VIEW dual(dummy) AS VALUES('x');
|
||||
}
|
||||
5 {
|
||||
CREATE TABLE t1(a INT, b INT);
|
||||
INSERT INTO t1 VALUES(1,2),(1,3),(1,4);
|
||||
CREATE TABLE t2(c INT PRIMARY KEY, d INT) WITHOUT ROWID;
|
||||
INSERT INTO t2 VALUES(3,33),(4,44),(5,55);
|
||||
CREATE VIEW dual(dummy) AS VALUES('x');
|
||||
}
|
||||
6 {
|
||||
CREATE TABLE t1(a INT, b INT);
|
||||
INSERT INTO t1 VALUES(1,2),(1,3),(1,4);
|
||||
CREATE VIEW t2(c,d) AS VALUES(3,33),(4,44),(5,55);
|
||||
CREATE VIEW dual(dummy) AS VALUES('x');
|
||||
}
|
||||
7 {
|
||||
CREATE VIEW t1(a,b) AS VALUES(1,2),(1,3),(1,4);
|
||||
CREATE TABLE t2(c INTEGER PRIMARY KEY, d INT);
|
||||
INSERT INTO t2 VALUES(3,33),(4,44),(5,55);
|
||||
CREATE VIEW dual(dummy) AS VALUES('x');
|
||||
}
|
||||
} {
|
||||
reset_db
|
||||
db nullvalue NULL
|
||||
db eval $schema
|
||||
do_execsql_test join7-$id.1 {
|
||||
SELECT b, d FROM t1 FULL OUTER JOIN t2 ON b=c ORDER BY +b;
|
||||
} {
|
||||
NULL 55
|
||||
2 NULL
|
||||
3 33
|
||||
4 44
|
||||
}
|
||||
do_execsql_test join7-1.2 {
|
||||
}
|
||||
do_execsql_test join7-$id.2 {
|
||||
SELECT a, c FROM t1 FULL OUTER JOIN t2 ON b=c ORDER BY +b;
|
||||
} {
|
||||
} {
|
||||
NULL 5
|
||||
1 NULL
|
||||
1 3
|
||||
1 4
|
||||
}
|
||||
do_execsql_test join7-1.3 {
|
||||
}
|
||||
do_execsql_test join7-$id.3 {
|
||||
SELECT * FROM t1 FULL OUTER JOIN t2 ON b=c ORDER BY +b;
|
||||
} {
|
||||
} {
|
||||
NULL NULL 5 55
|
||||
1 2 NULL NULL
|
||||
1 3 3 33
|
||||
1 4 4 44
|
||||
}
|
||||
do_execsql_test join7-1.4a {
|
||||
}
|
||||
do_execsql_test join7-$id.4 {
|
||||
SELECT * FROM t1 RIGHT OUTER JOIN t2 ON b=c ORDER BY +b;
|
||||
} {
|
||||
} {
|
||||
NULL NULL 5 55
|
||||
1 3 3 33
|
||||
1 4 4 44
|
||||
}
|
||||
do_execsql_test join7-1.4b {
|
||||
}
|
||||
do_execsql_test join7-$id.5 {
|
||||
SELECT * FROM dual JOIN t1 ON true RIGHT OUTER JOIN t2 ON b=c ORDER BY +b;
|
||||
} {
|
||||
} {
|
||||
NULL NULL NULL 5 55
|
||||
x 1 3 3 33
|
||||
x 1 4 4 44
|
||||
}
|
||||
do_execsql_test join7-1.4c {
|
||||
}
|
||||
do_execsql_test join7-$id.6 {
|
||||
SELECT * FROM dual CROSS JOIN t1 RIGHT OUTER JOIN t2 ON b=c ORDER BY +b;
|
||||
} {
|
||||
} {
|
||||
NULL NULL NULL 5 55
|
||||
x 1 3 3 33
|
||||
x 1 4 4 44
|
||||
}
|
||||
do_execsql_test join7-1.5 {
|
||||
}
|
||||
do_execsql_test join7-$id.7 {
|
||||
SELECT * FROM t1 LEFT OUTER JOIN t2 ON b=c ORDER BY +b;
|
||||
} {
|
||||
} {
|
||||
1 2 NULL NULL
|
||||
1 3 3 33
|
||||
1 4 4 44
|
||||
}
|
||||
|
||||
do_execsql_test join7-2.1 {
|
||||
}
|
||||
do_execsql_test join7-$id.8 {
|
||||
SELECT * FROM t1 FULL OUTER JOIN t2 ON b=c AND a=1 ORDER BY +b;
|
||||
} {
|
||||
} {
|
||||
NULL NULL 5 55
|
||||
1 2 NULL NULL
|
||||
1 3 3 33
|
||||
1 4 4 44
|
||||
}
|
||||
do_execsql_test join7-2.2 {
|
||||
}
|
||||
do_execsql_test join7-$id.9 {
|
||||
SELECT * FROM t1 FULL OUTER JOIN t2 ON b=c WHERE a=1 ORDER BY +b;
|
||||
} {
|
||||
} {
|
||||
1 2 NULL NULL
|
||||
1 3 3 33
|
||||
1 4 4 44
|
||||
}
|
||||
do_execsql_test join7-2.3 {
|
||||
}
|
||||
do_execsql_test join7-$id.10 {
|
||||
SELECT * FROM t1 FULL OUTER JOIN t2 ON b=c WHERE a IS NULL ORDER BY +d;
|
||||
} {
|
||||
} {
|
||||
NULL NULL 3 33
|
||||
NULL NULL 4 44
|
||||
NULL NULL 5 55
|
||||
}
|
||||
do_execsql_test join7-2.4 {
|
||||
}
|
||||
do_execsql_test join7-$id.11 {
|
||||
SELECT * FROM t1 FULL OUTER JOIN t2 ON b=c AND d<=0 ORDER BY +b, +d;
|
||||
} {
|
||||
} {
|
||||
NULL NULL 3 33
|
||||
NULL NULL 4 44
|
||||
NULL NULL 5 55
|
||||
1 2 NULL NULL
|
||||
1 3 NULL NULL
|
||||
1 4 NULL NULL
|
||||
}
|
||||
}
|
||||
|
||||
finish_test
|
||||
|
||||
Reference in New Issue
Block a user