Small performance enhancement for whereScanInit().

FossilOrigin-Name: ed84e124c6097b756ca687ac64df7ee801d14b16c835f1a9e8b336f785157d85

diff --git a/manifest b/manifest
index aebe38655cfce5676d700210a9975f2d56d8a760..f2027f792a3053530e0b3807db05cf0962ca95a1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Performance\simprovement\sin\squery\splanning.
-D 2021-12-02T01:30:16.970
+C Small\sperformance\senhancement\sfor\swhereScanInit().
+D 2021-12-02T02:22:35.475
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -637,7 +637,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c ed0398a7adf02c31e34aada42cc86c58f413a7afe5f741a5d373ad087abde028
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c db68967fe15efdddbc067835401a0c02e2d8460daee2fdda85ca491451865170
+F src/where.c 36e6ce4c1dd564885f2596e2c2aab61c7a56c7f9aeae63d6bb258d1464883ad6
 F src/whereInt.h 83877a75a1bce056ea44aff02f1dfa958ad1d6038c213ddadb8652003b45151d
 F src/wherecode.c 1f5b62f46d284c8886945eb7438415bc27e23e87bb60b9ee468fa6bd31268f33
 F src/whereexpr.c 17bdbf4f5b490e70a18635498f0b910a558f953a9bf80af7f19cbde6e60e6825
@@ -1933,7 +1933,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 a818ba2ed635b91e279dde44236fc7446a33db2b46c9409b67021248c01bf4e5
-R b96a809fd19be7cd4fca1d2cbe967f1c
+P ca59533bbb7f21d7b39dee7999d3f36ac516f8c75b2203039beeb2852ada42d4
+R af3fe3cb608001edf986e30906f5d5ad
 U drh
-Z 9b172105eb69d7dd67f53ef8928dc7e1
+Z e7cfc5073afcf7170a57b786bbc9a825

diff --git a/manifest.uuid b/manifest.uuid
index b993f82b3726b1be6861edda946c33bbe544e055..7e8fe9d6a35ece2358e5e8f263433f84c05f4347 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ca59533bbb7f21d7b39dee7999d3f36ac516f8c75b2203039beeb2852ada42d4
\ No newline at end of file
+ed84e124c6097b756ca687ac64df7ee801d14b16c835f1a9e8b336f785157d85
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index fd67ac5f17a34bb829348bfc07cc1fc5eaa377cc..53fa001dee0aec5e02e2e5f428e6355883c8e4cb 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -419,16 +419,16 @@ static WhereTerm *whereScanInit(
   if( pIdx ){
     int j = iColumn;
     iColumn = pIdx->aiColumn[j];
-    if( iColumn==XN_EXPR ){
-      pScan->pIdxExpr = pIdx->aColExpr->a[j].pExpr;
-      pScan->zCollName = pIdx->azColl[j];
-      pScan->aiColumn[0] = XN_EXPR;
-      return whereScanInitIndexExpr(pScan);
-    }else if( iColumn==pIdx->pTable->iPKey ){
+    if( iColumn==pIdx->pTable->iPKey ){
       iColumn = XN_ROWID;
     }else if( iColumn>=0 ){
       pScan->idxaff = pIdx->pTable->aCol[iColumn].affinity;
       pScan->zCollName = pIdx->azColl[j];
+    }else if( iColumn==XN_EXPR ){
+      pScan->pIdxExpr = pIdx->aColExpr->a[j].pExpr;
+      pScan->zCollName = pIdx->azColl[j];
+      pScan->aiColumn[0] = XN_EXPR;
+      return whereScanInitIndexExpr(pScan);
     }
   }else if( iColumn==XN_EXPR ){
     return 0;