The IN-early-out optimization does not work for virtual tables. Do

not try to use it there.  Fix for ticket [2d5a3163563d559f].  Test
cases in TH3.

FossilOrigin-Name: dbec6910d9648f4907373c818a5cb347a2e487784208751ccecfacca752ff99d

diff --git a/manifest b/manifest
index c14de66d65c5202b681ff8950d28c78fe5889d61..93c04c3143c7ad6fba59dbcf29a18c0bd22d1026 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\squery\soptimization\sfor\smulti-column\sindexes\swhere\sthe\ssecond\sor\nlater\scolumns\sare\sconstrained\sby\san\sIN\soperator\sand\sthe\searlier\sindex\scolumns\nlimit\sthe\ssearch\sto\sa\ssmall\snumber\sof\srows.\s\sUse\sthe\snew\sOP_SeekScan\sopcode\nwhich\sdoes\sscanning\sof\sthe\srelevant\srange\sof\sthe\sindex\sbut\sgives\sup\sand\nfalls\sback\sto\sdoing\sa\sseek\sif\sthe\snumber\sof\srows\sscanned\sgrows\sto\slarge,\nin\sorder\sto\sguard\sagainst\spathological\scases\swhere\sthe\sestimated\snumber\nof\srows\sto\sbe\sscanned\sis\sfar\stoo\ssmall.
-D 2020-09-30T18:06:51.119
+C The\sIN-early-out\soptimization\sdoes\snot\swork\sfor\svirtual\stables.\s\sDo\nnot\stry\sto\suse\sit\sthere.\s\sFix\sfor\sticket\s[2d5a3163563d559f].\s\sTest\ncases\sin\sTH3.
+D 2020-10-01T14:36:15.462
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -624,7 +624,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c 3df26a33dc4f54e8771600fb7fdebe1ece0896c2ad68c30ab40b017aa4395049
 F src/where.c da9c0d503f81cc8444eb3525b75eec2bb3d198f4d5939b207977f2fc20d85b54
 F src/whereInt.h 59077fbd0b3d01bc8715e746c86a99ebf4c85bde8a57077ec04d2a23e59666ec
-F src/wherecode.c b6293c637ecfbf2f53ae4d454cc3543f671111b3018ecc30c7bc2b3007de3782
+F src/wherecode.c dd05b1c064ca8f8e8dbd2d8ba028f1d6de11f8da8ca9826435125a773a74542f
 F src/whereexpr.c 2a05552e808047a93845278c98c6ca64a265fa8e9ffd087c161bb11bfe339866
 F src/window.c edd6f5e25a1e8f2b6f5305b7f5f7da7bb35f07f0d432b255b1d4c2fcab4205aa
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1880,8 +1880,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 7395e96b8cc370c8ac2657fb805915b0992a15d80f8bf256d277b423fec64675 dc4172e6b8e1f62dc7329a3adb2223f290bc4c8055c265e88182ef432f4bcf10
-R 51c03f3e654933edf1a61c7fc932246b
-T +closed dc4172e6b8e1f62dc7329a3adb2223f290bc4c8055c265e88182ef432f4bcf10
+P 4a43430fd23f88352c33b29c4c105b72f6dc821f94bf362040c41a1648c402e5
+R 741e77c667ec454123453c4b44339c19
 U drh
-Z bbfb93b0824db2f472432135890f2a72
+Z 211e23df85fca771cd54994f499b9652

diff --git a/manifest.uuid b/manifest.uuid
index 245640b3fdf7253dfe0c741d9843539ca2668693..a66f6570e8660fdf6ed23d90a449fa7c9da83a2f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a43430fd23f88352c33b29c4c105b72f6dc821f94bf362040c41a1648c402e5
\ No newline at end of file
+dbec6910d9648f4907373c818a5cb347a2e487784208751ccecfacca752ff99d
\ No newline at end of file

diff --git a/src/wherecode.c b/src/wherecode.c
index ece0332e58cdb7c7ee267b2aeefc756d19dc0863..652df47cc1ba245b46f77f53c2c90267d78ec49c 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -608,7 +608,13 @@ static int codeEqualityTerm(
           pIn++;
         }
       }
-      if( iEq>0 && (pLoop->wsFlags & WHERE_IN_SEEKSCAN)==0 ){
+printf("iEq=%d wsFlags=0x%08x\n", iEq, pLoop->wsFlags); fflush(stdout);
+      testcase( iEq>0
+                && (pLoop->wsFlags & WHERE_IN_SEEKSCAN)==0
+                && (pLoop->wsFlags & WHERE_VIRTUALTABLE)!=0 );
+      if( iEq>0 
+       && (pLoop->wsFlags & (WHERE_IN_SEEKSCAN|WHERE_VIRTUALTABLE))==0
+      ){
         sqlite3VdbeAddOp3(v, OP_SeekHit, pLevel->iIdxCur, 0, iEq);
       }
     }else{