Remove additional traces of the column cache.

FossilOrigin-Name: db6052e9725368736abd19f14f97376582d35d07f543046d39991d767ed29851

diff --git a/manifest b/manifest
index a9a837ce39a5b68c257ee409e4d51d9380abbb6b..51e4c3cbdff94672af37abd81abb584fb18aa705 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Completely\sremove\sthe\scolumn\scache\slogic,\swhich\shas\sbeen\sa\spersistent\ssource\nof\sbugs\sfor\smany\syears.\s\sWe\srecent\senhancements\sto\sthe\sperformance\sof\sthe\nOP_Column\sopcode,\sthe\sremoving\sthe\scolumn\scache\sactually\smakes\sspeed-check.sh\nrun\sfaster.\s\sIt\salso\ssaves\sabout\s1,800\sbytes\sof\scode\sspace.
-D 2018-08-03T23:04:16.901
+C Remove\sadditional\straces\sof\sthe\scolumn\scache.
+D 2018-08-04T14:30:21.271
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 0a3a6c81e6fcb969ff9106e882f0a08547014ba463cb6beca4c4efaecc924ee6
@@ -442,7 +442,7 @@ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 F src/btree.c 3f5e1a03db871e627bf5da21092bf7434ecfc5c5980bbd7d45eba13341340173
 F src/btree.h febb2e817be499570b7a2e32a9bbb4b607a9234f6b84bb9ae84916d4806e96f2
 F src/btreeInt.h 620ab4c7235f43572cf3ac2ac8723cbdf68073be4d29da24897c7b77dda5fd96
-F src/build.c 7e82726057d67de1d77961f3a3f371353171099bb6b006adb172b6d3aebb1d4a
+F src/build.c fe407be13d1201bf386d2c629424e5c97a07bcfc6ef21cf6e888e50b792a6191
 F src/callback.c 36caff1e7eb7deb58572d59c41cee8f064a11d00297616995c5050ea0cfc1288
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c b157b01081f92442f8b0218ddb93ddce8ebddad36dbddeecfdd771561dd4f387
@@ -450,7 +450,7 @@ F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
 F src/dbpage.c 4aa7f26198934dbd002e69418220eae3dbc71b010bbac32bd78faf86b52ce6c3
 F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91
 F src/delete.c 3838d8830dd0219f35afcd78a269934d5a43ef95d4c7fd30e819a2d238648d9b
-F src/expr.c 4cb4ca6357b28fee2202d2b2bc5be83a439c65da03195ba5dc4dcece675ffce0
+F src/expr.c 1b4889eff32e9c0409a0d6ae02191116c93316758ee3aab0569a840536b6ec0d
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c f59253c0be4b1e9dfcb073b6d6d6ab83090ae50c08b5c113b76013c4b157cd6a
 F src/func.c 7c288b4ce309b5a8b8473514b88e1f8e69a80134509a8c0db8e39c858e367e7f
@@ -503,7 +503,7 @@ F src/shell.c.in 5e4c139799f059a5231f0259111f51f6dffcb28154c535f6b4c2192619a4084
 F src/sqlite.h.in c6451bb876adced3aba5b1682c6317d215c5eceaba21a6ce979e71a0b8d0bf95
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9887b27e69c01e79c2cbe74ef73bf01af5b5703d6a7f0a4371e386d7249cb1c7
-F src/sqliteInt.h 31b29c0dcc28ea79099abc1854a9a34838a9f1c755ceacbe0e2311303abc4942
+F src/sqliteInt.h 6cfd4892302c9c75229bf63c23d9166cb07e8d0b90db5d7640d575956087b3d2
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1754,10 +1754,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 21235d9a41567897418aa12f7bd6dd8d6ee363147527e1d8fbca14fc83e0f2c9
-R 8d50a200abb983ec87063d77f452edcc
-T *branch * omit-column-cache
-T *sym-omit-column-cache *
-T -sym-trunk *
+P 3f5f60cd7529330209027fdae8129cca420cec1050eae50a7750d0b715b56972
+R 99d55cb1c08aa24c5982922e29e87cee
 U drh
-Z a8a93a4aa98877787838b1809356b192
+Z ecfd34726ec4f1f3d57d395617051b54

diff --git a/manifest.uuid b/manifest.uuid
index f0ddc292d044a0e064a76ae71f85c9348e57cbfd..9d7c2ae27e952a78c8150709cab986700c4602a3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3f5f60cd7529330209027fdae8129cca420cec1050eae50a7750d0b715b56972
\ No newline at end of file
+db6052e9725368736abd19f14f97376582d35d07f543046d39991d767ed29851
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index 34cb3e1bdd5a8035efcec8bac86cfb281acdb6af..62d0ff14d988a5a7838cc710079c25dc0ffd485c 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -225,7 +225,6 @@ void sqlite3FinishCoding(Parse *pParse){
   /* Get the VDBE program ready for execution
   */
   if( v && pParse->nErr==0 && !db->mallocFailed ){
-    assert( pParse->iCacheLevel==0 );  /* Disables and re-enables match */
     /* A minimum of one cursor is required if autoincrement is used
     *  See ticket [a696379c1f08866] */
     if( pParse->pAinc!=0 && pParse->nTab==0 ) pParse->nTab = 1;

diff --git a/src/expr.c b/src/expr.c
index 395a5599502a57987aabfde5ff08c275551a9b57..841f2f536870fb43537b3f9c9e5d2d2bea1c456c 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -3926,7 +3926,6 @@ expr_code_doover:
       Expr opCompare;                   /* The X==Ei expression */
       Expr *pX;                         /* The X expression */
       Expr *pTest = 0;                  /* X==Ei (form A) or just Ei (form B) */
-      VVA_ONLY( int iCacheLevel = pParse->iCacheLevel; )
 
       assert( !ExprHasProperty(pExpr, EP_xIsSelect) && pExpr->x.pList );
       assert(pExpr->x.pList->nExpr > 0);
@@ -3969,8 +3968,6 @@ expr_code_doover:
       }else{
         sqlite3VdbeAddOp2(v, OP_Null, 0, target);
       }
-      assert( pParse->db->mallocFailed || pParse->nErr>0 
-           || pParse->iCacheLevel==iCacheLevel );
       sqlite3VdbeResolveLabel(v, endLabel);
       break;
     }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 8684c146ea430c1690b7b84941cb1f5525b1a678..e02e876c84359ef0c2c4eb38f7b887e9ec127414 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3050,7 +3050,6 @@ struct Parse {
   u8 hasCompound;      /* Need to invoke convertCompoundSelectToSubquery() */
   u8 okConstFactor;    /* OK to factor out constants */
   u8 disableLookaside; /* Number of times lookaside has been disabled */
-  u8 nColCache;        /* Number of entries in aColCache[] */
   int nRangeReg;       /* Size of the temporary register block */
   int iRangeReg;       /* First register in temporary register block */
   int nErr;            /* Number of errors seen */
@@ -3060,8 +3059,6 @@ struct Parse {
   int szOpAlloc;       /* Bytes of memory space allocated for Vdbe.aOp[] */
   int iSelfTab;        /* Table associated with an index on expr, or negative
                        ** of the base register during check-constraint eval */
-  int iCacheLevel;     /* ColCache valid when aColCache[].iLevel<=iCacheLevel */
-  int iCacheCnt;       /* Counter used to generate aColCache[].lru values */
   int nLabel;          /* Number of labels used */
   int *aLabel;         /* Space to hold the labels */
   ExprList *pConstExpr;/* Constant expressions */