Render scan-status values with 3 or 4 significant digits only, for

improved readability.

FossilOrigin-Name: d9102ff0c43a496e782b0a3ec86ba7cd45f8118a07f15a4f3d58b399466d6cf2

diff --git a/ext/qrf/qrf.c b/ext/qrf/qrf.c
index cea992a2c924781869102f059891d0a4b51b8d87..ff0a9180eecd9dd1f9304b10987a2254c89cdf7a 100644 (file)
--- a/ext/qrf/qrf.c
+++ b/ext/qrf/qrf.c
@@ -17,6 +17,7 @@
 #endif
 #include <string.h>
 #include <assert.h>
+#include <stdint.h>
 
 typedef sqlite3_int64 i64;
 
@@ -229,6 +230,64 @@ static void qrfEqpRenderLevel(Qrf *p, int iEqpId){
   }
 }
 
+/*
+** Render the 64-bit value N in a more human-readable format into
+** pOut.
+**
+**   +  Only show the first three significant digits.
+**   +  Append suffixes K, M, G, or T for 1e3, 1e6, 1e9, 1e12
+*/
+static void qrfApproxInt64(sqlite3_str *pOut, i64 N){
+  static const char aSuffix[] = { 'K', 'M', 'G', 'T' };
+  int i;
+  if( N<0 ){
+    N = N==INT64_MIN ? INT64_MAX : -N;
+    sqlite3_str_append(pOut, "-", 1);
+  }
+  if( N<10000 ){
+    sqlite3_str_appendf(pOut, "%lld", N);
+    return;
+  }
+  for(i=1; i<=12; i++){
+    N = (N+5)/10;
+    if( N<10000 ){
+      int n = (int)N;
+      switch( i%3 ){
+        case 0:
+          sqlite3_str_appendf(pOut, "%d.%02d", n/1000, (n%1000)/10);
+          break;
+        case 1:
+          sqlite3_str_appendf(pOut, "%d.%d", n/100, (n%100)/10);
+          break;
+        case 2:
+          sqlite3_str_appendf(pOut, "%d", n/10);
+          break;
+      }
+      sqlite3_str_append(pOut, &aSuffix[i/3], 1);
+      return;
+    }
+  }
+  sqlite3_str_appendf(pOut, "%lldT", N);
+}
+
+/*
+** Render a double r into pOut for use in scan-stats reporting.
+**
+** If r is greater than or equal to 1000, then render using qrfApproxInt64.
+** Otherwise render using %.1f.
+*/
+static void qrfApproxDouble(sqlite3_str *pOut, double r){
+  if( r<0.0 ){
+    sqlite3_str_append(pOut, "-", 1);
+    r = -r;
+  }
+  if( r>=1000.0 ){
+    qrfApproxInt64(pOut, (i64)r);
+  }else{
+    sqlite3_str_appendf(pOut, "%.1f", r);
+  }
+}
+
 /*
 ** Display and reset the EXPLAIN QUERY PLAN data
 */
@@ -244,7 +303,9 @@ static void qrfEqpRender(Qrf *p, i64 nCycle){
       p->u.pGraph->pRow = pRow->pNext;
       sqlite3_free(pRow);
     }else if( nCycle>0 ){
-      sqlite3_str_appendf(p->pOut, "QUERY PLAN (cycles=%lld [100%%])\n",nCycle);
+      sqlite3_str_appendf(p->pOut, "QUERY PLAN (cycles=");
+      qrfApproxInt64(p->pOut, nCycle);
+      sqlite3_str_appendf(p->pOut, " [100%%])\n");
     }else{
       sqlite3_str_appendall(p->pOut, "QUERY PLAN\n");
     }
@@ -341,23 +402,30 @@ static void qrfEqpStats(Qrf *p){
       double rpl;
       sqlite3_str_reset(pStats);
       if( nCycle>=0 && nTotal>0 ){
-        sqlite3_str_appendf(pStats, "cycles=%lld [%d%%]",
-            nCycle, ((nCycle*100)+nTotal/2) / nTotal
+        sqlite3_str_appendf(pStats, "cycles=");
+        qrfApproxInt64(pStats, nCycle);
+        sqlite3_str_appendf(pStats, " [%d%%]",
+            ((nCycle*100)+nTotal/2) / nTotal
         );
         zSp = " ";
       }
       if( nLoop>=0 ){
-        sqlite3_str_appendf(pStats, "%sloops=%lld", zSp, nLoop);
+        sqlite3_str_appendf(pStats, "%sloops=", zSp);
+        qrfApproxInt64(pStats, nLoop);
         zSp = " ";
       }
       if( nRow>=0 ){
-        sqlite3_str_appendf(pStats, "%srows=%lld", zSp, nRow);
+        sqlite3_str_appendf(pStats, "%srows=", zSp);
+        qrfApproxInt64(pStats, nRow);
         zSp = " ";
       }
 
       if( p->spec.eStyle==QRF_STYLE_StatsEst ){
-        rpl = (double)nRow / (double)nLoop;
-        sqlite3_str_appendf(pStats, "%srpl=%.1f est=%.1f", zSp, rpl, rEst);
+        rpl = nLoop ? (double)nRow / (double)nLoop : 0.0;
+        sqlite3_str_appendf(pStats, "%srpl=", zSp);
+        qrfApproxDouble(pStats, rpl);
+        sqlite3_str_appendf(pStats, " est=");
+        qrfApproxDouble(pStats, rEst);
       }
 
       sqlite3_str_appendf(pLine,
@@ -2807,8 +2875,10 @@ static void qrfFinalize(Qrf *p){
     case QRF_STYLE_Stats:
     case QRF_STYLE_StatsEst: {
       i64 nCycle = 0;
+#ifdef SQLITE_ENABLE_STMT_SCANSTATUS
       sqlite3_stmt_scanstatus_v2(p->pStmt, -1, SQLITE_SCANSTAT_NCYCLE,
                                  SQLITE_SCANSTAT_COMPLEX, (void*)&nCycle);
+#endif
       qrfEqpRender(p, nCycle);
       qrfWrite(p);
       break;

diff --git a/manifest b/manifest
index 0aa88f56649e4f8a9240eb53b04ee7492bdfd8bf..99edf4e34aa7112d524854df711d1245fc2718f0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sscanstatus\soutput\sin\sQRF\sso\sthat\sit\sshows\sthe\stotal\snumber\sof\scycles\non\sthe\s"QUERY\sPLAN"\sline.
-D 2026-02-04T11:51:20.221
+C Render\sscan-status\svalues\swith\s3\sor\s4\ssignificant\sdigits\sonly,\sfor\nimproved\sreadability.
+D 2026-02-04T13:35:32.765
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -420,7 +420,7 @@ F ext/misc/zipfile.c 837591f0505d21f7f7937ea046c9b0fc594f7fa3ca00c2bd54ffa1c94bf
 F ext/misc/zorder.c bddff2e1b9661a90c95c2a9a9c7ecd8908afab5763256294dd12d609d4664eee
 F ext/qrf/README.md e6e0ce2700acf6fd06312b42726a8f08ca240f30e1b122bff87c71c602046352
 F ext/qrf/dev-notes.md e68a6d91ce4c7eb296ef2daadc2bb79c95c317ad15b9fafe40850c67b29c2430
-F ext/qrf/qrf.c 2679e7d31c8f560ea08d256fb78e528492aef87ae8889d1b0bd7cec996ee4b1d
+F ext/qrf/qrf.c 1b9df1070489d0e82abbd5eec844bf20ef65787cc44f69b02649e47dc03bde7d
 F ext/qrf/qrf.h 2ac14b0aaacf44636d8c81051bfeab4afae50a98fbb2e10ff5aed0c28a87b2b2
 F ext/rbu/rbu.c 801450b24eaf14440d8fd20385aacc751d5c9d6123398df41b1b5aa804bf4ce8
 F ext/rbu/rbu1.test 25870dd7db7eb5597e2b4d6e29e7a7e095abf332660f67d89959552ce8f8f255
@@ -2194,8 +2194,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 6852843e6aa23051de0884593ce64b96a16f16c4d63b222bd324297581f7cf75
-R 4942f96654121dcb448939cb1dd44a80
+P 611cef0ec281ae06eac97df8048d617fd445c348c2fc1673202b9cc081a365db
+R 948a2925b6f14b356c852d71e9b3a7e0
 U drh
-Z 91037e821426352cbdf9cb6287b69533
+Z acac1c8caf17f6287150425d80569e65
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.tags b/manifest.tags
index bec971799ff1b8ee641c166c7aeb22d12c785393..9ae5f99f97a9056fcd6fd9e72a30f81c2aedc000 100644 (file)
--- a/manifest.tags
+++ b/manifest.tags
@@ -1,2 +1,2 @@
-branch trunk
-tag trunk
+branch scanstatus-improvements
+tag scanstatus-improvements

diff --git a/manifest.uuid b/manifest.uuid
index b423b09dfdc6d305191be27767d3d95a50e12fe9..603a58b399c2dd4158a366dbc1531e000a16fa9d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-611cef0ec281ae06eac97df8048d617fd445c348c2fc1673202b9cc081a365db
+d9102ff0c43a496e782b0a3ec86ba7cd45f8118a07f15a4f3d58b399466d6cf2