Adjustments to the implementation of LIMIT so that it uses fewer opcodes.

FossilOrigin-Name: 39d5b292d27faf00ab58ff4074f91f7aea97cd99

diff --git a/manifest b/manifest
index 315453217261d8bd1feac5b397359b4d2c7c58c6..fe7c5990dba305891ca87556d7b7cd526316d44e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C If\sthe\ssector\ssize\sis\sunspecified\s(initially\s0)\sthen\sset\sit\sto\s512,\snot\sto\s32.
-D 2009-11-11T23:58:06
+C Adjustments\sto\sthe\simplementation\sof\sLIMIT\sso\sthat\sit\suses\sfewer\sopcodes.
+D 2009-11-12T03:13:26
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 53f3dfa49f28ab5b80cb083fb7c9051e596bcfa1
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -163,7 +163,7 @@ F src/printf.c 03fabdd6112a0e23f78f8ac9a1396947ade0273b
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c aa3cb21e1ecd905c071fce8fb64d1a166cefc239
 F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
-F src/select.c ecd7fb2fcb8d207dd381338377b5bacce0b38a2d
+F src/select.c 696f245c519c83b5d3b8892db22cfa6c55ef3bd0
 F src/shell.c f4948cb6d30665d755a6b5e0ec313d1094aab828
 F src/sqlite.h.in 4464e9772122f0447305d425e04d122b6f1bffec
 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89
@@ -210,7 +210,7 @@ F src/update.c 8efeb09822886e33c265dd96d29a3d865ea6dcf2
 F src/utf.c dad16adcc0c35ef2437dca125a4b07419d361052
 F src/util.c ad4f03079ba0fe83590d1cc9197e8e4844e38592
 F src/vacuum.c 03309a08d549f9389cc3a3589afd4fadbdaf0679
-F src/vdbe.c 7e112c50e50d3b86f752bca563ef9369a3d8a471
+F src/vdbe.c 393a6766807b0b335f9f1bdebb41ba08d138e5ef
 F src/vdbe.h 7b06b21f76e349bc2b7e18599550d79bf943c940
 F src/vdbeInt.h 59c65e7b810836b9e946acee45c7b3c02b967d1b
 F src/vdbeapi.c 17680ab7a75ec938c5ba039a6c87489d01faf2cb
@@ -770,14 +770,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P c15b70b3aefc399dae1df5bb721530f0e2b7887a
-R b90b93f7f854c88da1f9a6b1e74b502b
+P 8861b5c16031ad570ffbe17b3ec8163b136a7f63
+R 2e62411d417a05caf2dd89c1ca0e0fb5
 U drh
-Z 4327ac2d667e56f35ffb44f65d860347
+Z e34f2d0325afcf3aef2ae5d8242ce5af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFK+0+UoxKgR168RlERAjjgAJ9jNmLhWxJ4mrPtF8QZQyv008kPpwCghE2/
-IbgAg0OFaYa8g8Ax0ACWJdI=
-=RCGh
+iD8DBQFK+31aoxKgR168RlERAm5yAJoDGtDUZYQGDXxew/n6ZNZuiH02bwCfWGOF
+tQZHhWLWT4zFQub7T8BA6c4=
+=tCQs
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 4fb4aabfde90124dc75bdfead0c741c427ee4349..60bbcc4e0e0cf8ddf257fdb2104421a616963322 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8861b5c16031ad570ffbe17b3ec8163b136a7f63
\ No newline at end of file
+39d5b292d27faf00ab58ff4074f91f7aea97cd99
\ No newline at end of file

diff --git a/src/select.c b/src/select.c
index 16e30ab91888febb185e23c2ee7668741cd1b9cd..be504603af3e94d4028cea877e94e1058d655eb3 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -681,8 +681,7 @@ static void selectInnerLoop(
   if( p->iLimit ){
     assert( pOrderBy==0 );  /* If there is an ORDER BY, the call to
                             ** pushOntoSorter() would have cleared p->iLimit */
-    sqlite3VdbeAddOp2(v, OP_AddImm, p->iLimit, -1);
-    sqlite3VdbeAddOp2(v, OP_IfZero, p->iLimit, iBreak);
+    sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1);
   }
 }
 
@@ -1308,7 +1307,7 @@ static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){
   Vdbe *v = 0;
   int iLimit = 0;
   int iOffset;
-  int addr1;
+  int addr1, n;
   if( p->iLimit ) return;
 
   /* 
@@ -1323,10 +1322,19 @@ static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){
     p->iLimit = iLimit = ++pParse->nMem;
     v = sqlite3GetVdbe(pParse);
     if( NEVER(v==0) ) return;  /* VDBE should have already been allocated */
-    sqlite3ExprCode(pParse, p->pLimit, iLimit);
-    sqlite3VdbeAddOp1(v, OP_MustBeInt, iLimit);
-    VdbeComment((v, "LIMIT counter"));
-    sqlite3VdbeAddOp2(v, OP_IfZero, iLimit, iBreak);
+    if( sqlite3ExprIsInteger(p->pLimit, &n) ){
+      if( n==0 ){
+        sqlite3VdbeAddOp2(v, OP_Goto, 0, iBreak);
+      }else{
+        sqlite3VdbeAddOp2(v, OP_Integer, n, iLimit);
+        VdbeComment((v, "LIMIT counter"));
+      }
+    }else{
+      sqlite3ExprCode(pParse, p->pLimit, iLimit);
+      sqlite3VdbeAddOp1(v, OP_MustBeInt, iLimit);
+      VdbeComment((v, "LIMIT counter"));
+      sqlite3VdbeAddOp2(v, OP_IfZero, iLimit, iBreak);
+    }
     if( p->pOffset ){
       p->iOffset = iOffset = ++pParse->nMem;
       pParse->nMem++;   /* Allocate an extra register for limit+offset */
@@ -1881,8 +1889,7 @@ static int generateOutputSubroutine(
   /* Jump to the end of the loop if the LIMIT is reached.
   */
   if( p->iLimit ){
-    sqlite3VdbeAddOp2(v, OP_AddImm, p->iLimit, -1);
-    sqlite3VdbeAddOp2(v, OP_IfZero, p->iLimit, iBreak);
+    sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1);
   }
 
   /* Generate the subroutine return

diff --git a/src/vdbe.c b/src/vdbe.c
index 1205abbe6bda096db8ec4688ed7b5392093a2bd2..d0421354dbfdcbaf6abcd2378c9fd3b856cfca96 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -5025,15 +5025,17 @@ case OP_IfNeg: {        /* jump, in1 */
   break;
 }
 
-/* Opcode: IfZero P1 P2 * * *
+/* Opcode: IfZero P1 P2 P3 * *
 **
-** If the value of register P1 is exactly 0, jump to P2. 
+** The register P1 must contain an integer.  Add literal P3 to the
+** value in register P1.  If the result is exactly 0, jump to P2. 
 **
 ** It is illegal to use this instruction on a register that does
 ** not contain an integer.  An assertion fault will result if you try.
 */
 case OP_IfZero: {        /* jump, in1 */
   assert( pIn1->flags&MEM_Int );
+  pIn1->u.i += pOp->p3;
   if( pIn1->u.i==0 ){
      pc = pOp->p2 - 1;
   }