The optimization of check-in [b67a6e33f2] does not work (it generates

incorrect VDBE code) if an OR term is AND-ed with a constant expression.
So back that optimization out and add a test case to make sure it does not
get added back in.

FossilOrigin-Name: eed754fe93644f4df082eac0c0a7ffc5c78ccd10

diff --git a/manifest b/manifest
index cdf41d31ba1c6a4103fa32d7fee12f02cfb3b6dd..39a7dab1e822629a483b9ce75d357bca6361948c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sindex\sname\sfor\sthe\sshadow\stables\sin\sthe\sspellfix1\sextension\sso\sthat\nmultiple\sinstances\sof\sthe\sspellfix1\svirtual\stable\scan\seach\shave\stheir\sown\nindex.
-D 2014-07-22T16:00:49.088
+C The\soptimization\sof\scheck-in\s[b67a6e33f2]\sdoes\snot\swork\s(it\sgenerates\nincorrect\sVDBE\scode)\sif\san\sOR\sterm\sis\sAND-ed\swith\sa\sconstant\sexpression.\nSo\sback\sthat\soptimization\sout\sand\sadd\sa\stest\scase\sto\smake\ssure\sit\sdoes\snot\nget\sadded\sback\sin.
+D 2014-07-22T19:14:42.618
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -227,7 +227,7 @@ F src/shell.c 566aee8213372a2e81ba0eb34e9759f7b2574009
 F src/sqlite.h.in fd8e3a36b0aded082dc93a4b89c1e85324b4cf75
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
-F src/sqliteInt.h 0991b31a98c6ce072d255954af617baf50735eb1
+F src/sqliteInt.h 5dbcdcf81cb15e77df16f88699a15f7af491c580
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@ -296,7 +296,7 @@ F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
 F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c 52edd7f5df58d8f73230e5f9883ce867ca2f4a7d
+F src/where.c 4e7e6bc639a938eb35c433bdca2aad80478fece4
 F src/whereInt.h 929c1349b5355fd44f22cee5c14d72b3329c58a6
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1097,7 +1097,7 @@ F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
 F test/where.test 28b64e93428961b07b0d486778d63fd672948f6b
-F test/where2.test 455a2eb2666e66c1e84e2cb5815173a85e6237db
+F test/where2.test 23fdb5d8e756554aad4ca7ae03de9dd8367a2c6e
 F test/where3.test 1ad55ba900bd7747f98b6082e65bd3e442c5004e
 F test/where4.test d8420ceeb8323a41ceff1f1841fc528e824e1ecf
 F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
@@ -1183,7 +1183,8 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 48e378029528dac33d29866016128d236a7995d9
-R ef5e99a62dffbd3ce7a7196840380036
+P 438c348a40383796a710499e4e1b7a6b08f75778
+Q -b67a6e33f23ce5f5d9a545fa9d6700a7ed636901
+R 086bb10698e6defd83e7aae53f79809b
 U drh
-Z f16a3660aabbbb2778203c851a571a70
+Z 6c73d4c61d83e0b2dc5ff58e1c82716d

diff --git a/manifest.uuid b/manifest.uuid
index e6d3a6b9d4aee531d41f75c62c09a94641994a59..730f453e7f20a4427de829ed4d28f84665f6ad33 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-438c348a40383796a710499e4e1b7a6b08f75778
\ No newline at end of file
+eed754fe93644f4df082eac0c0a7ffc5c78ccd10
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 6b0e031b30f9d57a98c76a413e16429a27e7712d..8f256d52fc2ddff1d464835e011a385b590cac0b 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2136,7 +2136,6 @@ struct SrcList {
 #define WHERE_DISTINCTBY       0x0200 /* pOrderby is really a DISTINCT clause */
 #define WHERE_WANT_DISTINCT    0x0400 /* All output needs to be distinct */
 #define WHERE_SORTBYGROUP      0x0800 /* Support sqlite3WhereIsSorted() */
-#define WHERE_OR_INDEX_OPEN    0x1000 /* OP_OpenRead for the OR index exists */
 
 /* Allowed return values from sqlite3WhereIsDistinct()
 */

diff --git a/src/where.c b/src/where.c
index 4ecf02f0c1d581dca3a8158ee8fe652a2ae454b6..284f141ff93b7b756599d4d00300d740e742f2d9 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3422,7 +3422,6 @@ static Bitmask codeOneLoopStart(
     int iRetInit;                             /* Address of regReturn init */
     int untestedTerms = 0;             /* Some terms not completely tested */
     int ii;                            /* Loop counter */
-    int subWctrlFlags;                 /* wctrlFlags for sub-queries */
     Expr *pAndExpr = 0;                /* An ".. AND (...)" expression */
     Table *pTab = pTabItem->pTab;
    
@@ -3518,8 +3517,6 @@ static Bitmask codeOneLoopStart(
     ** eliminating duplicates from other WHERE clauses, the action for each
     ** sub-WHERE clause is to to invoke the main loop body as a subroutine.
     */
-    subWctrlFlags = WHERE_OMIT_OPEN_CLOSE | WHERE_AND_ONLY |
-                    WHERE_FORCE_TABLE | WHERE_ONETABLE_ONLY;
     for(ii=0; ii<pOrWc->nTerm; ii++){
       WhereTerm *pOrTerm = &pOrWc->a[ii];
       if( pOrTerm->leftCursor==iCur || (pOrTerm->eOperator & WO_AND)!=0 ){
@@ -3532,7 +3529,8 @@ static Bitmask codeOneLoopStart(
         }
         /* Loop through table entries that match term pOrTerm. */
         pSubWInfo = sqlite3WhereBegin(pParse, pOrTab, pOrExpr, 0, 0,
-                        subWctrlFlags, iCovCur);
+                        WHERE_OMIT_OPEN_CLOSE | WHERE_AND_ONLY |
+                        WHERE_FORCE_TABLE | WHERE_ONETABLE_ONLY, iCovCur);
         assert( pSubWInfo || pParse->nErr || db->mallocFailed );
         if( pSubWInfo ){
           WhereLoop *pSubLoop;
@@ -3623,7 +3621,6 @@ static Bitmask codeOneLoopStart(
           ){
             assert( pSubWInfo->a[0].iIdxCur==iCovCur );
             pCov = pSubLoop->u.btree.pIndex;
-            subWctrlFlags |= WHERE_OR_INDEX_OPEN;
           }else{
             pCov = 0;
           }
@@ -6222,18 +6219,6 @@ WhereInfo *sqlite3WhereBegin(
         pWInfo->aiCurOnePass[1] = iIndexCur;
       }else if( iIdxCur && (wctrlFlags & WHERE_ONETABLE_ONLY)!=0 ){
         iIndexCur = iIdxCur;
-        if( (wctrlFlags & WHERE_OR_INDEX_OPEN)!=0 ){
-          /* For 2nd and subsequent subqueries for processing OR terms,
-          ** try to reuse the previous OP_OpenRead, if there is one.  The
-          ** WHERE_OR_INDEX_OPEN bit will only be set if there is a prior
-          ** OP_OpenRead opcode on cursor iIndexCur, so the while() loop
-          ** below is guaranteed to terminate.
-          */
-          VdbeOp *pOp = sqlite3VdbeGetOp(v, -1);
-          while( pOp->opcode!=OP_OpenRead || pOp->p1!=iIndexCur ) pOp--;
-          assert( pOp->p3==iDb );
-          if( pOp->p2==pIx->tnum ) op = 0;
-        }
       }else{
         iIndexCur = pParse->nTab++;
       }

diff --git a/test/where2.test b/test/where2.test
index d9b2b23de926173a5855e5b4f1c2b916c9d27cfe..367eb0dfeadd2ef196d244abf9e45aa074abe8dc 100644 (file)
--- a/test/where2.test
+++ b/test/where2.test
@@ -751,5 +751,13 @@ do_execsql_test where2-12.1 {
 } {/.*SEARCH TABLE t12 AS b .*SEARCH TABLE t12 AS b .*/}
 }
 
+# Verify that all necessary OP_OpenRead opcodes occur in the OR optimization.
+#
+do_execsql_test where2-13.1 {
+  CREATE TABLE t13(a,b);
+  CREATE INDEX t13a ON t13(a);
+  INSERT INTO t13 VALUES(4,5);
+  SELECT * FROM t13 WHERE (1=2 AND a=3) OR a=4;
+} {4 5}
 
 finish_test