Enhance the codeEqualityTerm() routine inside the code generator so that it is

able to reuse an IN operator that has an invariant subquery on its right-hand
side while coding the non-matched loop of a RIGHT JOIN.
dbsqlfuzz 19f1102a70cf966ab249de56d944fc20dbebcfcf

FossilOrigin-Name: 56dd3065469e49320b13af039471b3f0b85e6f7368cfd97b1cdc0cf8fa8e1956

diff --git a/manifest b/manifest
index b2507fac8d3042a7b71a1edd70a1d0868b01714a..cdb521d4d018d63ddf0327e717d464fca3e4719d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C With\sTreeView,\sonly\sshow\sthe\stable\scolumns\sfor\sa\sSrcItem\sif\sthe\sdata\ssource\nis\sa\ssubquery\srather\sthan\sa\spersistent\stable.
-D 2022-04-29T17:45:39.378
+C Enhance\sthe\scodeEqualityTerm()\sroutine\sinside\sthe\scode\sgenerator\sso\sthat\sit\sis\nable\sto\sreuse\san\sIN\soperator\sthat\shas\san\sinvariant\ssubquery\son\sits\sright-hand\nside\swhile\scoding\sthe\snon-matched\sloop\sof\sa\sRIGHT\sJOIN.\ndbsqlfuzz\s19f1102a70cf966ab249de56d944fc20dbebcfcf
+D 2022-04-29T19:00:11.746
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -642,7 +642,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c 43085b3a4ce2e56315fabb0b240a56e76667d9e03c79f287695bcae7b76152d5
 F src/whereInt.h 4db5a877a9d1f38b5c928c1c84297c07f30b9a3bc1f5f66214cf1a8ef90a0556
-F src/wherecode.c 55a33d9db1759970c30220904bcc628ba66a1ccb63b5437ef4642f7ea6267b03
+F src/wherecode.c c55aba3ea3106d40af88faa2b22de52821c48bfdcaa045b05f5c3767bfeaa1e0
 F src/whereexpr.c 174d4ad5be165c610c907abb779ef4a97974d22b84e1ce7898d2d9f6947249e5
 F src/window.c 924e04fd6e0e113d4dba18b78d43fcb8e42b8ebffc8fc728da52cf3ab014cf3c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1148,7 +1148,7 @@ F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
 F test/join5.test c4df54e2e204d7f1417bfbdd21ca324b4b07415c647595cc47798eacfddc96d3
 F test/join6.test f809c025fa253f9e150c0e9afd4cef8813257bceeb6f46e04041228c9403cc2c
 F test/join7.test 8e72de4b45e5e930d18c305c7efe86015fb2552731e4e03ea226353036b0dab0
-F test/join8.test 8b1cc9592aa8f623fc2878353b16c81257591908de06d2a4916f7cbe3ca75ecd
+F test/join8.test 88ea7b26437d3141167895da4287c4f92e484a9a38bfc25c062144092ac1758f
 F test/join9.test 9056ddd3b0c0f4f9d658f4521038d9a37dc23ead8ca9a505d0b0db2b6a471e05
 F test/joinA.test 7eab225dc1c1ab258a5e62513a4ed7cabbd3db971d59d5d92f4fb6fa14c12f6a
 F test/joinB.test 1b2ba3fc8568b49411787fccbf540570c148e9b6a53a30f80691cb6268098ded
@@ -1951,8 +1951,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 293afa81112e824eec2557d004a27319d484276f796936e16d64243fe24f6b68
-R 28b9d27cf579722d7bb4ce1924ff221c
+P 7b4a0d0fa1d8facaf5e550650d9b261eda7eb7a2a413627f2751f01c5477e1f3
+R 4eb952430e379b03f0039449da90c7c2
 U drh
-Z 77bba4f7ca9ae44652d512641bde86ff
+Z 2b2aca42b8cf9c11b9fe920e009d7283
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 16481a0f72c6583bddc3f5f0ac57718f00fe1741..536b89e2aefa098415c9c672a332fc04d5110da0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7b4a0d0fa1d8facaf5e550650d9b261eda7eb7a2a413627f2751f01c5477e1f3
\ No newline at end of file
+56dd3065469e49320b13af039471b3f0b85e6f7368cfd97b1cdc0cf8fa8e1956
\ No newline at end of file

diff --git a/src/wherecode.c b/src/wherecode.c
index 3ea6c5d8eb87308b7e9eb27f7c11af50af5a8c93..2cd61a35b70ed4ec8cc6b49912e4ed8806ce4fb6 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -610,7 +610,7 @@ static int codeEqualityTerm(
     iTab = 0;
     if( !ExprUseXSelect(pX) || pX->x.pSelect->pEList->nExpr==1 ){
       eType = sqlite3FindInIndex(pParse, pX, IN_INDEX_LOOP, 0, 0, &iTab);
-    }else{
+    }else if( pTerm->pExpr->iTable==0 ){
       sqlite3 *db = pParse->db;
       pX = removeUnindexableInClauseTerms(pParse, iEq, pLoop, pX);
 

diff --git a/test/join8.test b/test/join8.test
index 48287b6bfaf4cec6de03e1e60a4a53abd1b92a52..7c4b8f601afde226dc9003e69e6189bf35570841 100644 (file)
--- a/test/join8.test
+++ b/test/join8.test
@@ -156,4 +156,14 @@ do_catchsql_test join8-5000 {
   SELECT (SELECT c FROM sqlite_temp_schema FULL JOIN t2 ON d IN (1,2,3) ORDER BY d) AS x FROM t1;
 } {0 {- -}}
 
+# 2022-04-29 dbsqlfuzz 19f1102a70cf966ab249de56d944fc20dbebcfcf
+#
+reset_db
+do_execsql_test join8-6000 {
+  CREATE TABLE t1(a INTEGER PRIMARY KEY, b TEXT, c TEXT, d REAL);
+  INSERT INTO t1 VALUES(1,'A','aa',2.5);
+  SELECT * FROM t1 AS t2 NATURAL RIGHT JOIN t1 AS t3
+   WHERE (a,b) IN (SELECT rowid, b FROM t1);
+} {1 A aa 2.5}
+
 finish_test