Claw back some performance from the sqlite3ExprGetColumnOfTable() routine.

FossilOrigin-Name: e8426acb94179ff49549aced6ea3c26c49ba4761c2f414fa1772d6a031edc79d

diff --git a/manifest b/manifest
index 8b1604787a8f4c2d093dbadcb1081a7774b8a484..281510f5d939c4db335c0a56c05314dd03fd7a7d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssqlite3ColumnOfIndex()\sto\saccount\sfor\svirtual\scolumns.
-D 2019-10-18T12:14:48.871
+C Claw\sback\ssome\sperformance\sfrom\sthe\ssqlite3ExprGetColumnOfTable()\sroutine.
+D 2019-10-18T12:52:08.655
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -476,8 +476,8 @@ F src/ctime.c 1b0724e66f95f33b160b1af85caaf9cceb325d22abf39bd24df4f54a73982251
 F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
-F src/delete.c fd10ac325c73bdf4d558530745d70df01fe6f7a0763553045adf42a62c303dc9
-F src/expr.c e492fffa17f9b89ba01790715d8f6b3a14b1af6b486163a6690b3fee4b3e4529
+F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
+F src/expr.c e2c2f78c9f63de2bedabf34f8f25968c6b2317313d1ef15a37c8aa9bd29dcf75
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 6271fda51794b569d736eba4097d28f13080cd0c9eb66d5fcecb4b77336fae50
 F src/func.c ed33e38cd642058182a31a3f518f2e34f4bbe53aa483335705c153c4d3e50b12
@@ -518,19 +518,19 @@ F src/parse.y bc453ce808316facd191413bfa4ec6730a1d693b98fd8be5addef8fbfd62bb7b
 F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c 62714cbd1b7299a6e6a27a587b66b4fd3a836a84e1181e7f96f5c34a50917848
-F src/pragma.c a2cee4630b456f1f4727f93e2813d1cd197965c2ba2105be30f4c6104343727f
+F src/pragma.c 986fdd27f1ddb712eaf7af4ac5c4d7e0ad97ce9c5d2f069e02f89bb7e7d06496
 F src/pragma.h 40962d65b645bb3f08c1f4c456effd01c6e7f073f68ea25177e0c95e181cff75
 F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057
 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 2160146697e6e0ba251b5a954e16f542b6e684fb4778cec2994094ab401ef996
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c ac9270006d5e1c283012fe116f36a8d496a49a296943f777176f61c0c903ea00
+F src/select.c 7ef05eeb7f686f84dd1428cbdca280c898915bbf56e1ea97bd42ecc070af78d3
 F src/shell.c.in d70bcf630c4073eaa994fa74be98886c781918e794cb8b562be8df10f018e274
 F src/sqlite.h.in 5725a6b20190a1e8d662077a1c1c8ea889ad7be90dd803f914c2de226f5fe6ab
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h cef696ce3293242c67b2339763608427bf72ee66f1f3a05389ac2a7b46001c31
-F src/sqliteInt.h aa16ccbbe83b06807da56079398412a995c904e0c0bb5a18eb5c659eb5c96898
+F src/sqliteInt.h 769a3d9f244fe08c219aadc8474d180e3adca2c26cb5b13603adef4910b6ccf1
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -592,16 +592,16 @@ F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c d3615f0cbe4db5949503bf5916f3cd4fa5de855d5b4ef560f3b6dd5629423a1e
 F src/treeview.c fddeb413159c3eeeaea3f496172f121cf3695606c461dc4e6dcee51417952df5
 F src/trigger.c 845ccc08f60716c58aa28fe6470385c18ef8c4e1d88c93dcf449bc13d464eb2e
-F src/update.c a66b56e5024541d2dd6794d0800b14f7a2cc968f6a1fdf84df2cb44048b35058
+F src/update.c c9020ecd59e80836a1bfccc406af3658a18bada4f17319fcc791db6643cbcac0
 F src/upsert.c 710c91bb13e3c3fed5b6fe17cb13e09560bdd003ad8b8c51e6b16c80cfc48b10
 F src/utf.c 2f0fac345c7660d5c5bd3df9e9d8d33d4c27f366bcfb09e07443064d751a0507
 F src/util.c 10d910e04a4f3842042485e0df01a484f57f912c10b60b3a09ccddd5019bd138
 F src/vacuum.c 82dcec9e7b1afa980288718ad11bc499651c722d7b9f32933c4d694d91cb6ebf
 F src/vdbe.c 9a3f4c2ec6c45e4bd5db465e77e79dfdf5bdc5cf3a8c0bfe9549da209b9c18bc
-F src/vdbe.h 3f2b571e702e77e6bf031f0236e554aedfae643e991f69000320f481408455cf
+F src/vdbe.h b02904e1bd45c26fdf00c04844b9cfa825763aa5150b6d89ce88b8ab03581d0a
 F src/vdbeInt.h bd589b8b7273286858950717e0e1ec5c88b18af45079a3366dc1371865cea704
 F src/vdbeapi.c 95001d0f84ee3cda344fed98ca0d7961deb4fc836b83495630d0af1f7cc4789e
-F src/vdbeaux.c a35a1785f980c44838b636a6d55a46b25ad80f2a2065851f165ab143aa46f99c
+F src/vdbeaux.c a669f412027b6820cace9bf42e280c28304fc72bfc3475283ef33a5cce80e2e8
 F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
 F src/vdbemem.c d8e10d1773806105e62094c4ede0a4684f46caaf07667a45e6d461e94306b530
 F src/vdbesort.c a3be032cc3fee0e3af31773af4a7a6f931b7230a34f53282ccf1d9a2a72343be
@@ -613,7 +613,7 @@ F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c d5a94907dcac990e31976be9dc769d17f6a806782593d6aec9d760ee01ec22cd
 F src/where.c 9f3f23efc45934e7b7ea6c0c1042420b73053e7c3264feef6faf9ce6fbd5df61
 F src/whereInt.h 2c6bae136a7c0be6ff75dc36950d1968c67d005c8e51d7a9d77cb996bb4843d9
-F src/wherecode.c 39df666a7281d3153b9f9d2cb04321cbb7cc403623a2862a292cb074e1b4a203
+F src/wherecode.c b9bb13fce68edf2eee56154a53adb923df7c0cf410fb319d0b2c4001c58a2c73
 F src/whereexpr.c 05c283d26aa9c3f5d1bf13a5f6a573b43295b9db280eff18e26f97d7d7f119b4
 F src/window.c 064f251451c8e2a1c76b6269229d911a651e119c6a5f522b6eaebf8dc8714041
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1847,7 +1847,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 450c48766c8e62653d074c95f69b0576de3880d183a1d1e5992d88b6fce6cc39
-R b12f2d235ff67ce42b63b55b4cb45601
+P 447271123e3b467d9271a4c0cf27f47af2f865c9298b8c355d9e766411a1f422
+R e46b1fe53b3eb28b7fe52d4e742c44d4
 U drh
-Z c0d073b04d67e49c297ac9c42fae3a3a
+Z 941773dbc3af30d7e5e82c7718d2d1bf

diff --git a/manifest.uuid b/manifest.uuid
index d4b8a06657b6f1de7b4e0fb68d2ebfbe31dcc48e..a7110e869abb5633735ce658a8a748317e310045 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-447271123e3b467d9271a4c0cf27f47af2f865c9298b8c355d9e766411a1f422
\ No newline at end of file
+e8426acb94179ff49549aced6ea3c26c49ba4761c2f414fa1772d6a031edc79d
\ No newline at end of file

diff --git a/src/delete.c b/src/delete.c
index 271bdbd482b69bad515878427d70d8a1e1f7cd3e..e3a0abc2c095bcff9b55b01c53210e02cb175068 100644 (file)
--- a/src/delete.c
+++ b/src/delete.c
@@ -475,13 +475,13 @@ void sqlite3DeleteFrom(
     if( pPk ){
       for(i=0; i<nPk; i++){
         assert( pPk->aiColumn[i]>=0 );
-        sqlite3ExprCodeGetColumnOfTable(pParse, pTab, iTabCur,
+        sqlite3ExprCodeGetColumnOfTable(v, pTab, iTabCur,
                                         pPk->aiColumn[i], iPk+i);
       }
       iKey = iPk;
     }else{
       iKey = ++pParse->nMem;
-      sqlite3ExprCodeGetColumnOfTable(pParse, pTab, iTabCur, -1, iKey);
+      sqlite3ExprCodeGetColumnOfTable(v, pTab, iTabCur, -1, iKey);
     }
   
     if( eOnePass!=ONEPASS_OFF ){
@@ -737,8 +737,7 @@ void sqlite3GenerateRowDelete(
       testcase( mask!=0xffffffff && iCol==31 );
       testcase( mask!=0xffffffff && iCol==32 );
       if( mask==0xffffffff || (iCol<=31 && (mask & MASKBIT32(iCol))!=0) ){
-        sqlite3ExprCodeGetColumnOfTable(pParse, pTab, iDataCur, iCol,
-                                        iOld+iCol+1);
+        sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, iCol, iOld+iCol+1);
       }
     }
 

diff --git a/src/expr.c b/src/expr.c
index c026c9583b07a01b2a6f8365ce61ba3617f2ec01..41ffe716eacaf4d089a50bac2fed92239e6ddb2c 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -3365,7 +3365,7 @@ void sqlite3ExprCodeLoadIndexColumn(
     sqlite3ExprCodeCopy(pParse, pIdx->aColExpr->a[iIdxCol].pExpr, regOut);
     pParse->iSelfTab = 0;
   }else{
-    sqlite3ExprCodeGetColumnOfTable(pParse, pIdx->pTable, iTabCur,
+    sqlite3ExprCodeGetColumnOfTable(pParse->pVdbe, pIdx->pTable, iTabCur,
                                     iTabCol, regOut);
   }
 }
@@ -3374,13 +3374,12 @@ void sqlite3ExprCodeLoadIndexColumn(
 ** Generate code to extract the value of the iCol-th column of a table.
 */
 void sqlite3ExprCodeGetColumnOfTable(
-  Parse *pParse,  /* Parsing context */
+  Vdbe *v,        /* Parsing context */
   Table *pTab,    /* The table containing the value */
   int iTabCur,    /* The table cursor.  Or the PK cursor for WITHOUT ROWID */
   int iCol,       /* Index of the column to extract */
   int regOut      /* Extract the value into this register */
 ){
-  Vdbe *v = pParse->pVdbe;
   Column *pCol;
   assert( v!=0 );
   if( pTab==0 ){
@@ -3397,6 +3396,7 @@ void sqlite3ExprCodeGetColumnOfTable(
       x = iCol;
 #ifndef SQLITE_OMIT_GENERATED_COLUMNS
     }else if( (pCol = &pTab->aCol[iCol])->colFlags & COLFLAG_VIRTUAL ){
+      Parse *pParse = sqlite3VdbeParser(v);
       if( pCol->colFlags & COLFLAG_BUSY ){
         sqlite3ErrorMsg(pParse, "generated column loop on \"%s\"", pCol->zName);
       }else{
@@ -3417,8 +3417,6 @@ void sqlite3ExprCodeGetColumnOfTable(
       op = OP_Column;
     }
     sqlite3VdbeAddOp3(v, op, iTabCur, x, regOut);
-  }
-  if( iCol>=0 ){
     sqlite3ColumnDefault(v, pTab, iCol, regOut);
   }
 }
@@ -3439,7 +3437,7 @@ int sqlite3ExprCodeGetColumn(
   u8 p5            /* P5 value for OP_Column + FLAGS */
 ){
   assert( pParse->pVdbe!=0 );
-  sqlite3ExprCodeGetColumnOfTable(pParse, pTab, iTable, iColumn, iReg);
+  sqlite3ExprCodeGetColumnOfTable(pParse->pVdbe, pTab, iTable, iColumn, iReg);
   if( p5 ){
     sqlite3VdbeChangeP5(pParse->pVdbe, p5);
   }

diff --git a/src/pragma.c b/src/pragma.c
index 750ddb140476cbddd8c8591b0037ee5d1b7440c6..8e2607e5a1de1ec5caf776c7fdc3946ccb7f7a6f 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1407,7 +1407,7 @@ void sqlite3Pragma(
         ** this case. */
         for(j=0; j<pFK->nCol; j++){
           int iCol = aiCols ? aiCols[j] : pFK->aCol[j].iFrom;
-          sqlite3ExprCodeGetColumnOfTable(pParse, pTab, 0, iCol, regRow+j);
+          sqlite3ExprCodeGetColumnOfTable(v, pTab, 0, iCol, regRow+j);
           sqlite3VdbeAddOp2(v, OP_IsNull, regRow+j, addrOk); VdbeCoverage(v);
         }
 
@@ -1595,7 +1595,7 @@ void sqlite3Pragma(
           int jmp2;
           if( j==pTab->iPKey ) continue;
           if( pTab->aCol[j].notNull==0 ) continue;
-          sqlite3ExprCodeGetColumnOfTable(pParse, pTab, iDataCur, j, 3);
+          sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, j, 3);
           sqlite3VdbeChangeP5(v, OPFLAG_TYPEOFARG);
           jmp2 = sqlite3VdbeAddOp1(v, OP_NotNull, 3); VdbeCoverage(v);
           zErr = sqlite3MPrintf(db, "NULL value in %s.%s", pTab->zName,

diff --git a/src/select.c b/src/select.c
index f63ca06f4a46ded237dc8c5cb2551151844115c7..a5377a2c2094f49b4a2312f01c93f62e1c02f382 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -6417,7 +6417,7 @@ int sqlite3Select(
           struct AggInfo_col *pCol = &sAggInfo.aCol[i];
           if( pCol->iSorterColumn>=j ){
             int r1 = j + regBase;
-            sqlite3ExprCodeGetColumnOfTable(pParse,
+            sqlite3ExprCodeGetColumnOfTable(v,
                                pCol->pTab, pCol->iTable, pCol->iColumn, r1);
             j++;
           }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index f6646e4b8201f0cad6c0db8cb430a5727cc109d8..2066ff5f82614309ddd5a2dfe98374df5017fddf 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -4077,7 +4077,7 @@ int sqlite3WhereOkOnePass(WhereInfo*, int*);
 #define ONEPASS_MULTI    2        /* ONEPASS is valid for multiple rows */
 void sqlite3ExprCodeLoadIndexColumn(Parse*, Index*, int, int, int);
 int sqlite3ExprCodeGetColumn(Parse*, Table*, int, int, int, u8);
-void sqlite3ExprCodeGetColumnOfTable(Parse*, Table*, int, int, int);
+void sqlite3ExprCodeGetColumnOfTable(Vdbe*, Table*, int, int, int);
 void sqlite3ExprCodeMove(Parse*, int, int, int);
 void sqlite3ExprCode(Parse*, Expr*, int);
 void sqlite3ExprCodeCopy(Parse*, Expr*, int);

diff --git a/src/update.c b/src/update.c
index 9b297579214b4b89b80c74c51445c2f70e4655c9..56ddec67bc01a7fb6956bfebf95ea57691959656 100644 (file)
--- a/src/update.c
+++ b/src/update.c
@@ -550,7 +550,7 @@ void sqlite3Update(
     ** is not required) and leave the PK fields in the array of registers.  */
     for(i=0; i<nPk; i++){
       assert( pPk->aiColumn[i]>=0 );
-      sqlite3ExprCodeGetColumnOfTable(pParse, pTab, iDataCur,
+      sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur,
                                       pPk->aiColumn[i], iPk+i);
     }
     if( eOnePass ){
@@ -642,7 +642,7 @@ void sqlite3Update(
        || (colFlags & COLFLAG_PRIMKEY)!=0
       ){
         testcase(  oldmask!=0xffffffff && i==31 );
-        sqlite3ExprCodeGetColumnOfTable(pParse, pTab, iDataCur, i, k);
+        sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, i, k);
       }else{
         sqlite3VdbeAddOp2(v, OP_Null, 0, k);
       }
@@ -685,7 +685,7 @@ void sqlite3Update(
         */
         testcase( i==31 );
         testcase( i==32 );
-        sqlite3ExprCodeGetColumnOfTable(pParse, pTab, iDataCur, i, k);
+        sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, i, k);
       }else{
         sqlite3VdbeAddOp2(v, OP_Null, 0, k);
       }
@@ -732,7 +732,7 @@ void sqlite3Update(
       if( pTab->aCol[i].colFlags & COLFLAG_GENERATED ){
         if( pTab->aCol[i].colFlags & COLFLAG_VIRTUAL ) k--;
       }else if( aXRef[i]<0 && i!=pTab->iPKey ){
-        sqlite3ExprCodeGetColumnOfTable(pParse, pTab, iDataCur, i, k);
+        sqlite3ExprCodeGetColumnOfTable(v, pTab, iDataCur, i, k);
       }
     }
 #ifndef SQLITE_OMIT_GENERATED_COLUMNS

diff --git a/src/vdbe.h b/src/vdbe.h
index e3aaaa1ce2fb55e7cb2fe44f735ccaa838032748..5d53017f5327f5228ccd691c44dd4c8c11b46ead 100644 (file)
--- a/src/vdbe.h
+++ b/src/vdbe.h
@@ -179,6 +179,7 @@ typedef struct VdbeOpList VdbeOpList;
 ** for a description of what each of these routines does.
 */
 Vdbe *sqlite3VdbeCreate(Parse*);
+Parse *sqlite3VdbeParser(Vdbe*);
 int sqlite3VdbeAddOp0(Vdbe*,int);
 int sqlite3VdbeAddOp1(Vdbe*,int,int);
 int sqlite3VdbeAddOp2(Vdbe*,int,int,int);

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index c89b7d4197f9068dc5e69ffa770f00eaf60004b5..c85bdc38744cce8092b38f2b84c643238d1f0817 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -42,6 +42,13 @@ Vdbe *sqlite3VdbeCreate(Parse *pParse){
   return p;
 }
 
+/*
+** Return the Parse object that owns a Vdbe object.
+*/
+Parse *sqlite3VdbeParser(Vdbe *p){
+  return p->pParse;
+}
+
 /*
 ** Change the error string stored in Vdbe.zErrMsg
 */

diff --git a/src/wherecode.c b/src/wherecode.c
index 39b9040db7adb8ae1ee4da7b9192fa50478824d3..af395a32669fa09bb15a64e21c7c1e1e43b9b3ec 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -2072,7 +2072,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
           if( (pWInfo->wctrlFlags & WHERE_DUPLICATES_OK)==0 ){
             int iSet = ((ii==pOrWc->nTerm-1)?-1:ii);
             if( HasRowid(pTab) ){
-              sqlite3ExprCodeGetColumnOfTable(pParse, pTab, iCur, -1, regRowid);
+              sqlite3ExprCodeGetColumnOfTable(v, pTab, iCur, -1, regRowid);
               jmp1 = sqlite3VdbeAddOp4Int(v, OP_RowSetTest, regRowset, 0,
                                           regRowid, iSet);
               VdbeCoverage(v);
@@ -2086,7 +2086,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
               r = sqlite3GetTempRange(pParse, nPk);
               for(iPk=0; iPk<nPk; iPk++){
                 int iCol = pPk->aiColumn[iPk];
-                sqlite3ExprCodeGetColumnOfTable(pParse, pTab, iCur, iCol,r+iPk);
+                sqlite3ExprCodeGetColumnOfTable(v, pTab, iCur, iCol,r+iPk);
               }
 
               /* Check if the temp table already contains this key. If so,