Enhance SQLITE_SCANSTAT_NCYCLE so that it reports on virtual tables.

FossilOrigin-Name: 622d8eb3724bee617b55d6fb71f1a2d683db6858065adced6bf3ce9525bcd6b5

diff --git a/manifest b/manifest
index 520ead0acf391e2e8b1cfa74febe8406b485d8e7..7ca1c989db1790d25c7c45f7ae69162fa2f36c17 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sCYCLES\sscanstat\smeasurement\sto\s"USE\sTEMP\sB-TREE\sFOR\sORDER\sBY"\slines.
-D 2022-12-03T18:16:25.876
+C Enhance\sSQLITE_SCANSTAT_NCYCLE\sso\sthat\sit\sreports\son\svirtual\stables.
+D 2022-12-03T21:24:26.253
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -646,7 +646,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c f6674cdcb839f118cf931b0c49e94d5fd37007a616239f62882d02df51cacbe7
-F src/shell.c.in 0e45a91da5426563c5b0c8f66fd51d5a5fcb3cc17faa44cd4ea8cc386bde146b
+F src/shell.c.in 8cfe0c7dbd3ac8f9eca40fdad85d90f22362a89ab9ad8d64826fd0ad5e408d13
 F src/sqlite.h.in 3ba99a3c2b414b9ad36d06e2f273ab6077f5f74e4d79630aee047394b92f7c7f
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
@@ -720,7 +720,7 @@ F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd
 F src/vdbe.c 5f5cc749c999d65e2115bb3ec555f7ac0ecfbda7f47526272d53a032e9d083b1
 F src/vdbe.h 77b3fb0abe5c5edaca849816584f0fd019c0f91e80410ef2d65f57fcf290ddd8
 F src/vdbeInt.h e83be1eea422758d42302941e96e59d93193c373da655a87befdc03a851e0f95
-F src/vdbeapi.c fed69b846866f1c74a17b8217497f379d1815256220006c072867737c43a741c
+F src/vdbeapi.c 35b4ca406f9a4bfd23fb7016b6d36280a5c1d68372b69271d6fbfcceead4b8ab
 F src/vdbeaux.c 7dcaff5933e4fbe5983be435b7cd2951d5f3ebd0f2acaf70fed4271dbfb57981
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
 F src/vdbemem.c 6cfed43758d57b6e3b99d9cdedfeccd86e45a07e427b22d8487cbdbebb6c522a
@@ -734,7 +734,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c bf470b5d1ba03af8d558a0c98cc1fa97b330e03a198a7af61895e5a2e8d93f20
 F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c
-F src/wherecode.c f7121f4c29e45ba7d38c91448e250ae5197a4b75e9fa75996ba6d5c81a3cc6e5
+F src/wherecode.c d3146e215f3a716c0e153ded68bfcc747aad550e114a79729bda887cf4ea6f00
 F src/whereexpr.c 05295b44b54eea76d1ba766f0908928d0e20e990c249344c9521454d3d09c7ae
 F src/window.c 14836767adb26573b50f528eb37f8b1336f2c430ab38de7cead1e5c546bb4d8c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1457,7 +1457,7 @@ F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
 F test/savepoint7.test cde525ea3075283eb950cdcdefe23ead4f700daa
 F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
 F test/scanstatus.test 7dbcfd6adc6a8df6abc59f83d6da5a27e1bce0b2f6fa55147c8176d7c44e0450
-F test/scanstatus2.test 7c4fb011e8018b638a39acfa8a93599b991ad0e56872df4556abf375d9663e95
+F test/scanstatus2.test 799129ea953ba1235d4d5e7f59375cdff79f9185142773ed5d9e1c2c14500833
 F test/schema.test 5dd11c96ba64744de955315d2e4f8992e447533690153b93377dffb2a5ef5431
 F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
 F test/schema3.test 8ed4ae66e082cdd8b1b1f22d8549e1e7a0db4527a8e6ee8b6193053ee1e5c9ce
@@ -2066,8 +2066,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 55800833645739efeddcacef464c623931cb6aeb43f4219b4e4faf473c25c8bb
-R 3092b93947ce4f84b005f0cef9aa6957
+P 365011ae8b7e3fcaa2c4ea9601231a3ef2223e60d7a53ec33013109dca22ad58
+R d4e70f090a6234401994809de206bf5b
 U dan
-Z 8d82637b2296891fd9a0f7cdb6b7a23f
+Z 77f61cda4725a7748ad22a19d7f4eb4e
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index eec563c182d90b22ebba8d53d146adb287fc2709..b1c968e110b3900b5c5cbce43d051aa508ddfd12 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-365011ae8b7e3fcaa2c4ea9601231a3ef2223e60d7a53ec33013109dca22ad58
\ No newline at end of file
+622d8eb3724bee617b55d6fb71f1a2d683db6858065adced6bf3ce9525bcd6b5
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 7cbd6b3c47a4fd968a8f6c7e97d564fabac5fb30..d3ef84e44ff4b48c23a1e5e095fe8f8dd73491d8 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -3054,7 +3054,7 @@ static void display_scanstats(
     zText = sqlite3_mprintf("%s", z);
     if( nCycle>=0 || nLoop>=0 || nRow>=0 ){
       char *z = 0;
-      if( nCycle>=0 ){
+      if( nCycle>=0 && nTotal>0 ){
         z = sqlite3_mprintf("%zcycles=%lld [%d%%]", z,
             nCycle, ((nCycle*100)+nTotal/2) / nTotal
         );

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index c00980d6b2f9d6b1de74f2f70b5e948ac94e4c0f..2b9b1087f2545bbb2c04934af67c167fa313a3d3 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -2206,17 +2206,33 @@ int sqlite3_stmt_scanstatus_v2(
       break;
     }
     case SQLITE_SCANSTAT_NCYCLE: {
-      i64 res = -1;
-      if( pScan->aAddrRange[0] ){
+      i64 res = 0;
+      if( pScan->aAddrRange[0]==0 ){
+        res = -1;
+      }else{
         int ii;
-        res = 0;
         for(ii=0; ii<ArraySize(pScan->aAddrRange); ii+=2){
           int iIns = pScan->aAddrRange[ii];
           int iEnd = pScan->aAddrRange[ii+1];
           if( iIns==0 ) break;
-          while( iIns<=iEnd ){
-            res += p->anCycle[iIns];
-            iIns++;
+          if( iIns>0 ){
+            while( iIns<=iEnd ){
+              res += p->anCycle[iIns];
+              iIns++;
+            }
+          }else{
+            int iOp;
+            for(iOp=0; iOp<p->nOp; iOp++){
+              Op *pOp = &p->aOp[iOp];
+              if( pOp->p1!=iEnd ) continue;
+              if( pOp->opcode!=OP_VFilter && pOp->opcode!=OP_VColumn
+               && pOp->opcode!=OP_Rowid   && pOp->opcode!=OP_VOpen
+               && pOp->opcode!=OP_VNext
+              ){
+                continue;
+              }
+              res += p->anCycle[iOp];
+            }
           }
         }
       }

diff --git a/src/wherecode.c b/src/wherecode.c
index b744556fa8dd4e9decd79d34c4314993699b5523..54c79baf976b387a9b1665dc455dfc62e67c3161 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -302,6 +302,9 @@ void sqlite3WhereAddScanStatus(
   sqlite3VdbeScanStatus(
       v, addrExplain, pLvl->addrBody, pLvl->addrVisit, pLoop->nOut, zObj
   );
+  if( pLoop->wsFlags & WHERE_VIRTUALTABLE ){
+    sqlite3VdbeScanStatusRange(v, addrExplain, -1, pLvl->iTabCur);
+  }
 }
 #endif
 

diff --git a/test/scanstatus2.test b/test/scanstatus2.test
index e3a8daaab545890325ed7ac20b1973f2a85dfdfe..a7dfabc4ac4bdf6ff50a6a6b4abfd02d2e0742fb 100644 (file)
--- a/test/scanstatus2.test
+++ b/test/scanstatus2.test
@@ -138,6 +138,23 @@ QUERY (nCycle=nnn)
 --USE TEMP B-TREE FOR ORDER BY
 }
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 2.0 {
+  CREATE VIRTUAL TABLE ft USING fts5(a);
+  INSERT INTO ft VALUES('abc');
+  INSERT INTO ft VALUES('def');
+  INSERT INTO ft VALUES('ghi');
+}
+
+explain_i {
+  SELECT * FROM ft('def')
+  }
+do_graph_test 2.1 {
+  SELECT * FROM ft('def')
+} {
+}
+
 finish_test