Simplified VDBE code for the vector NOT IN null-scanning loop.

FossilOrigin-Name: 7ae504e62e9bbbbd85a676f3c3922b7fd0cc73d2

diff --git a/manifest b/manifest
index f6f42159d31e209c48f5a1920c132bcb6eb467fe..105c9bfbb28e4de998c2d03a42a5e4bb9bdc2024 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sextended\scomments\sof\scomparison\soperators\swhen\sthe\sSQLITE_STOREP2\nflags\sis\sset\son\sP5.\s\sNo\schanges\sto\snon-debug\scode.
-D 2016-08-24T21:24:04.787
+C Simplified\sVDBE\scode\sfor\sthe\svector\sNOT\sIN\snull-scanning\sloop.
+D 2016-08-24T21:54:47.055
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -338,7 +338,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
 F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05
-F src/expr.c 3dc226ccd9eebee600253eba07b8d97534e49337
+F src/expr.c 866bcb6e85806beb0f96e651e9d17811e1ecbda5
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8
 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@@ -1520,7 +1520,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 55945fc12f8157e32e6850e41575c0c6422d29e7
-R d8287dc165c2512db536a01f0275f112
+P bbc1b016164ed0793e07302614384d52119463e0
+R 5a565b60b3cfcc2e549e66fdc0e5eedc
 U drh
-Z f51d93eb7238381398d31778d751851b
+Z 08a1319918b046fa6beb913b7de3f092

diff --git a/manifest.uuid b/manifest.uuid
index dc4716aac144e9fc1fae3628f8f28aedbd0a24f4..0459a673e1dee4c1f2b123e8b00acb2402e7de47 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bbc1b016164ed0793e07302614384d52119463e0
\ No newline at end of file
+7ae504e62e9bbbbd85a676f3c3922b7fd0cc73d2
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 63958b0d256df41433f2c24133abfc5b96cbf865..16f74d785e22ba0868e24d1d27edbaf9e37d3b14 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -2782,18 +2782,20 @@ static void sqlite3ExprCodeIN(
       
       if( nVector>1 && destIfNull!=destIfFalse ){
         int iIdx = pExpr->iTable;
-        int addr;
+        int addrTop;
         int addrNext;
+        int addrFound;
 
         /* Search the index for the key. */
-        addr = sqlite3VdbeAddOp4Int(v, OP_Found, iIdx, 0, r1, nVector);
+        addrFound = sqlite3VdbeAddOp4Int(v, OP_Found, iIdx, 0, r1, nVector);
         VdbeCoverage(v);
 
         /* At this point the specified key is not present in the index, 
         ** so the result of the IN(..) operator must be either NULL or
         ** 0. The vdbe code generated below figures out which.  */
-        addrNext = 1+sqlite3VdbeAddOp2(v, OP_Rewind, iIdx, destIfFalse);
+        addrTop = 1+sqlite3VdbeAddOp2(v, OP_Rewind, iIdx, destIfFalse);
         VdbeCoverage(v);
+        addrNext = sqlite3VdbeMakeLabel(v);
 
         for(i=0; i<nVector; i++){
           Expr *p;
@@ -2803,21 +2805,21 @@ static void sqlite3ExprCodeIN(
           pColl = sqlite3ExprCollSeq(pParse, p);
 
           sqlite3VdbeAddOp3(v, OP_Column, iIdx, i, r2);
-          sqlite3VdbeAddOp4(v, OP_Eq, r1+i, 0, r2, (void*)pColl,P4_COLLSEQ);
-          sqlite3VdbeChangeP5(v, SQLITE_JUMPIFNULL);
+          sqlite3VdbeAddOp4(v, OP_Ne, r1+i, addrNext, r2,
+                            (void*)pColl, P4_COLLSEQ);
           VdbeCoverage(v);
-          sqlite3VdbeAddOp2(v, OP_Next, iIdx, addrNext);
-          VdbeCoverage(v);
-          sqlite3VdbeAddOp2(v, OP_Goto, 0, destIfFalse);
-          sqlite3VdbeJumpHere(v, sqlite3VdbeCurrentAddr(v)-3);
           sqlite3ReleaseTempReg(pParse, r2);
         }
         sqlite3VdbeAddOp2(v, OP_Goto, 0, destIfNull);
+        sqlite3VdbeResolveLabel(v, addrNext);
+        sqlite3VdbeAddOp2(v, OP_Next, iIdx, addrTop);
+        VdbeCoverage(v);
+        sqlite3VdbeAddOp2(v, OP_Goto, 0, destIfFalse);
 
         /* The key was found in the index. If it contains any NULL values,
         ** then the result of the IN(...) operator is NULL. Otherwise, the
         ** result is 1.  */
-        sqlite3VdbeJumpHere(v, addr);
+        sqlite3VdbeJumpHere(v, addrFound);
         for(i=0; i<nVector; i++){
           Expr *p = sqlite3VectorFieldSubexpr(pExpr->pLeft, i);
           if( sqlite3ExprCanBeNull(p) ){