Performance improvements.

FossilOrigin-Name: 9f8e84ab9874a8af826763b1669adb57abd493ea

diff --git a/manifest b/manifest
index b68a0110a62b706632374e09c397fed314758cfc..b0f5052613281357ecff1b7ee62cd887bb20adcd 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\smanagement\sof\sthe\sspace\sto\shold\sWhereLoop.aLTerm[].
-D 2013-06-06T23:02:03.759
+C Performance\simprovements.
+D 2013-06-06T23:44:25.383
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -289,7 +289,7 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c e029cd3fe9f2fcc857cf19d05b352b2359638271
+F src/where.c fb4bee9bfeb4c1c2019a2ed36cb49d1f72e8dda7
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1094,7 +1094,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P b4a5dbad36bceabc5c5350e7676af6ad42de04eb
-R c565385814d78fee98948398a72cac6f
+P d4141ecbea3abbe83525910684fbd89eb74eeb34
+R cd5ddc1e68b8c783ab773654e8fe4f69
 U drh
-Z 2b77e3c42c0b772f55707fe4d25f7e48
+Z c534f818416a6634a12552ce3fcffbb2

diff --git a/manifest.uuid b/manifest.uuid
index bc7a4d415fba36c379a39f1e23ff037a6e12d34a..b12d1e6402ce66824ac20e68aec67cc8bf3e39fb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d4141ecbea3abbe83525910684fbd89eb74eeb34
\ No newline at end of file
+9f8e84ab9874a8af826763b1669adb57abd493ea
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 08569fc60b45de311042c2e902cac5b311be5924..994df30244957e6301658ca769d1d5bd1f8ec43d 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3883,18 +3883,19 @@ static void whereLoopInit(WhereLoop *p){
 ** Clear the WhereLoop.u union.  Leave WhereLoop.pLTerm intact.
 */
 static void whereLoopClearUnion(sqlite3 *db, WhereLoop *p){
-  if( (p->wsFlags & WHERE_VIRTUALTABLE)!=0 ){
-    if( p->u.vtab.needFree ) sqlite3_free(p->u.vtab.idxStr);
-    p->u.vtab.needFree = 0;
-    p->u.vtab.idxStr = 0;
-  }else if( (p->wsFlags & WHERE_TEMP_INDEX)!=0 && p->u.btree.pIndex!=0 ){
-    sqlite3DbFree(db, p->u.btree.pIndex->zColAff);
-    sqlite3DbFree(db, p->u.btree.pIndex);
-    p->u.btree.pIndex = 0;
+  if( p->wsFlags & (WHERE_VIRTUALTABLE|WHERE_TEMP_INDEX) ){
+    if( (p->wsFlags & WHERE_VIRTUALTABLE)!=0 && p->u.vtab.needFree ){
+      sqlite3_free(p->u.vtab.idxStr);
+      p->u.vtab.needFree = 0;
+      p->u.vtab.idxStr = 0;
+    }else if( (p->wsFlags & WHERE_TEMP_INDEX)!=0 && p->u.btree.pIndex!=0 ){
+      sqlite3DbFree(db, p->u.btree.pIndex->zColAff);
+      sqlite3DbFree(db, p->u.btree.pIndex);
+      p->u.btree.pIndex = 0;
+    }
   }
 }
 
-
 /*
 ** Deallocate internal memory used by a WhereLoop object
 */
@@ -3941,9 +3942,7 @@ static int whereLoopXfer(sqlite3 *db, WhereLoop *pTo, WhereLoop *pFrom){
   pTo->u = pFrom->u;
   if( pFrom->wsFlags & WHERE_VIRTUALTABLE ){
     pFrom->u.vtab.needFree = 0;
-  }else if( (pFrom->wsFlags & WHERE_TEMP_INDEX)!=0 && pFrom->u.btree.pIndex!=0 ){
-    sqlite3DbFree(db, pFrom->u.btree.pIndex->zColAff);
-    sqlite3DbFree(db, pFrom->u.btree.pIndex);
+  }else if( (pFrom->wsFlags & WHERE_TEMP_INDEX)!=0 ){
     pFrom->u.btree.pIndex = 0;
   }
   return SQLITE_OK;
@@ -4048,7 +4047,6 @@ static int whereLoopInsert(WhereLoopBuilder *pBuilder, WhereLoop *pTemplate){
         /* Overwrite an existing WhereLoop with an similar one that uses
         ** more terms of the index */
         pNext = p->pNextLoop;
-        whereLoopClear(db, p);
         break;
       }else{
         /* pTemplate is not helpful.
@@ -4062,7 +4060,6 @@ static int whereLoopInsert(WhereLoopBuilder *pBuilder, WhereLoop *pTemplate){
     ){
       /* Overwrite an existing WhereLoop with a better one */
       pNext = p->pNextLoop;
-      whereLoopClear(db, p);
       break;
     }
   }
@@ -4613,7 +4610,6 @@ static int whereLoopAddOr(WhereLoopBuilder *pBuilder, Bitmask mExtra){
   if( pWInfo->wctrlFlags & WHERE_AND_ONLY ) return SQLITE_OK;
   pWCEnd = pWC->a + pWC->nTerm;
   pNew = pBuilder->pNew;
-  whereLoopInit(&sBest);
 
   for(pTerm=pWC->a; pTerm<pWCEnd && rc==SQLITE_OK; pTerm++){
     if( (pTerm->eOperator & WO_OR)!=0
@@ -4626,6 +4622,7 @@ static int whereLoopAddOr(WhereLoopBuilder *pBuilder, Bitmask mExtra){
       WhereCost nRow = 0;
       Bitmask prereq = mExtra;
     
+      whereLoopInit(&sBest);
       pItem = pWInfo->pTabList->a + pNew->iTab;
       iCur = pItem->iCursor;
       sSubBuild = *pBuilder;
@@ -4669,9 +4666,9 @@ static int whereLoopAddOr(WhereLoopBuilder *pBuilder, Bitmask mExtra){
       pNew->prereq = prereq;
       memset(&pNew->u, 0, sizeof(pNew->u));
       rc = whereLoopInsert(pBuilder, pNew);
+      whereLoopClear(pWInfo->pParse->db, &sBest);
     }
   }
-  whereLoopClear(pWInfo->pParse->db, &sBest);
   return rc;
 }