From a20141593a5b49e14bbc82c64b5e11cafbdeba57 Mon Sep 17 00:00:00 2001
From: drh <drh@noemail.net>
Date: Fri, 7 Jun 2013 00:29:23 +0000
Subject: [PATCH] Further prepare-time performance improvements.

FossilOrigin-Name: 02741d177bfc2fca23bc99974cd899eba13cb59a
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/where.c   | 33 +++++++++++----------------------
 3 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/manifest b/manifest
index b0f5052613..6c3bd8a20c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\simprovements.
-D 2013-06-06T23:44:25.383
+C Further\sprepare-time\sperformance\simprovements.
+D 2013-06-07T00:29:23.782
 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 fb4bee9bfeb4c1c2019a2ed36cb49d1f72e8dda7
+F src/where.c bbd8aad0e54692a107d0f68111a289149814b10c
 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 d4141ecbea3abbe83525910684fbd89eb74eeb34
-R cd5ddc1e68b8c783ab773654e8fe4f69
+P 9f8e84ab9874a8af826763b1669adb57abd493ea
+R 8930578735fbc55c72ec3d27796f6bd0
 U drh
-Z c534f818416a6634a12552ce3fcffbb2
+Z c23263f2bef48916be7bbfa11913b59d
diff --git a/manifest.uuid b/manifest.uuid
index b12d1e6402..aaaa9ad535 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9f8e84ab9874a8af826763b1669adb57abd493ea
\ No newline at end of file
+02741d177bfc2fca23bc99974cd899eba13cb59a
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index 994df30244..3b825214f5 100644
--- a/src/where.c
+++ b/src/where.c
@@ -99,9 +99,6 @@ struct WhereLoop {
 #endif
   u8 iTab;              /* Position in FROM clause of table for this loop */
   u8 iSortIdx;          /* Sorting index number.  0==None */
-  u16 nLTerm;           /* Number of entries in aLTerm[] */
-  u16 nLSlot;           /* Number of slots allocated for aLTerm[] */
-  u32 wsFlags;          /* WHERE_* flags describing the plan */
   WhereCost rSetup;     /* One-time setup cost (ex: create transient index) */
   WhereCost rRun;       /* Cost of running each loop */
   WhereCost nOut;       /* Estimated number of output rows */
@@ -118,6 +115,11 @@ struct WhereLoop {
       char *idxStr;          /* Index identifier string */
     } vtab;
   } u;
+  u32 wsFlags;          /* WHERE_* flags describing the plan */
+  u16 nLTerm;           /* Number of entries in aLTerm[] */
+  /**** whereLoopXfer() copies fields above ***********************/
+# define WHERE_LOOP_XFER_SZ offsetof(WhereLoop,nLSlot)
+  u16 nLSlot;           /* Number of slots allocated for aLTerm[] */
   WhereTerm **aLTerm;   /* WhereTerms used */
   WhereLoop *pNextLoop; /* Next WhereLoop object in the WhereClause */
   WhereTerm *aLTermSpace[4];  /* Initial aLTerm[] space */
@@ -3927,19 +3929,8 @@ static int whereLoopResize(sqlite3 *db, WhereLoop *p, int n){
 static int whereLoopXfer(sqlite3 *db, WhereLoop *pTo, WhereLoop *pFrom){
   if( whereLoopResize(db, pTo, pFrom->nLTerm) ) return SQLITE_NOMEM;
   whereLoopClearUnion(db, pTo);
-  pTo->prereq = pFrom->prereq;
-  pTo->maskSelf = pFrom->maskSelf;
-  pTo->iTab = pFrom->iTab;
-  pTo->iSortIdx = pFrom->iSortIdx;
-  pTo->nLTerm = pFrom->nLTerm;
-  pTo->rSetup = pFrom->rSetup;
-  pTo->rRun = pFrom->rRun;
-  pTo->nOut = pFrom->nOut;
-  if( pTo->nLTerm ){
-    memcpy(pTo->aLTerm, pFrom->aLTerm, pTo->nLTerm*sizeof(pTo->aLTerm[0]));
-  }
-  pTo->wsFlags = pFrom->wsFlags;
-  pTo->u = pFrom->u;
+  memcpy(pTo, pFrom, WHERE_LOOP_XFER_SZ);
+  memcpy(pTo->aLTerm, pFrom->aLTerm, pTo->nLTerm*sizeof(pTo->aLTerm[0]));
   if( pFrom->wsFlags & WHERE_VIRTUALTABLE ){
     pFrom->u.vtab.needFree = 0;
   }else if( (pFrom->wsFlags & WHERE_TEMP_INDEX)!=0 ){
@@ -4685,13 +4676,11 @@ static int whereLoopAddAll(WhereLoopBuilder *pBuilder){
   sqlite3 *db = pWInfo->pParse->db;
   int nTabList = pWInfo->nLevel;
   int rc = SQLITE_OK;
-  WhereLoop *pNew;
+  WhereLoop *pNew, sNew;
 
   /* Loop over the tables in the join, from left to right */
-  pBuilder->pNew = pNew = sqlite3DbMallocZero(db, sizeof(WhereLoop));
-  if( pNew==0 ) return SQLITE_NOMEM;
-  pNew->aLTerm = pNew->aLTermSpace;
-  pNew->nLSlot = ArraySize(pNew->aLTermSpace);
+  pBuilder->pNew = pNew = &sNew;
+  whereLoopInit(pNew);
   for(iTab=0, pItem=pTabList->a; iTab<nTabList; iTab++, pItem++){
     pNew->iTab = iTab;
     pNew->maskSelf = getMask(&pWInfo->sMaskSet, pItem->iCursor);
@@ -4709,7 +4698,7 @@ static int whereLoopAddAll(WhereLoopBuilder *pBuilder){
     mPrior |= pNew->maskSelf;
     if( rc || db->mallocFailed ) break;
   }
-  whereLoopDelete(db, pBuilder->pNew);
+  whereLoopClear(db, pNew);
   pBuilder->pNew = 0;
   return rc;
 }