Further refinements to the faststat1.c utility.

FossilOrigin-Name: b051fd19bc5b4e5805154b40beb703674f2a8ba8

diff --git a/manifest b/manifest
index 665d8208e9a1fabe4aa3bbacd2595cbf9045f770..20cf726cd7b98e937aa253ce3620d07b9b36a4a0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sfaststat1.c\sto\sdeal\sbetter\swith\sWITHOUT\sROWID\stables.
-D 2016-10-25T18:28:29.534
+C Further\srefinements\sto\sthe\sfaststat1.c\sutility.
+D 2016-10-25T19:21:18.947
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -1449,7 +1449,7 @@ F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
 F tool/dbhash.c a06228aa21ebc4e6ea8daa486601d938499238a5
 F tool/extract.c 054069d81b095fbdc189a6f5d4466e40380505e2
 F tool/fast_vacuum.c 5ba0d6f5963a0a63bdc42840f678bad75b2ebce1
-F tool/faststat1.c 1f95d54b32f96493ca3f1a9421eaf3e72a5c091e
+F tool/faststat1.c 61265716af50e067cd5a095f737ebde25b5179b4
 F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
 F tool/fuzzershell.c f294ca67a10e87db76af130d75b2c94be36359c6
 F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
@@ -1528,7 +1528,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 c3570e462a41586487c4ab3bd08129affe8bed3c
-R 213daab621065f2ee61de1ff06afe658
+P 65444f2e35cfd51ece1ba6e37b39d181da479137
+R dc5ab078ccee063ac5ecf0c1a702e09d
 U drh
-Z b9d2e2924768dab5d8a474892a087659
+Z e3cb65b107952edc3d499ff83f7648af

diff --git a/manifest.uuid b/manifest.uuid
index 927158706498cf998ab6eda3c3dbf2ef748d6d47..d886a0bd72474ec9558fe0dfa4acab4aaa6e3ccb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-65444f2e35cfd51ece1ba6e37b39d181da479137
\ No newline at end of file
+b051fd19bc5b4e5805154b40beb703674f2a8ba8
\ No newline at end of file

diff --git a/tool/faststat1.c b/tool/faststat1.c
index 7180f04414c4b009ae954069ef31bf1ee211085a..325afcf91310a9548bcb38e047650b44268b19d3 100644 (file)
--- a/tool/faststat1.c
+++ b/tool/faststat1.c
@@ -205,7 +205,7 @@ static int analyzeIndex(const char *zTab, const char *zIdx){
   iLimit = n>10000 ? 100 : 20000;
   pStmt = db_prepare("PRAGMA btree_sample(\"%w\",0.0,%lld)",
                      zIdx, n*2);
-  for(i=0; i<N_SPAN; i++){
+  for(i=0; i<=N_SPAN; i++){
     k = 0;
     while( k<iLimit && (rc = sqlite3_step(pStmt))==SQLITE_ROW ){
       int iFirst;
@@ -218,6 +218,9 @@ static int analyzeIndex(const char *zTab, const char *zIdx){
         sqlite3_value_free(apValue[j]);
         apValue[j] = sqlite3_value_dup(sqlite3_column_value(pStmt,j));
       }
+      if( k==0 && iFirst==nCol ){
+        nRow += n/(N_SPAN+1) - iLimit;
+      }
       nRow++;
       k++;
     }
@@ -406,7 +409,7 @@ int main(int argc, char **argv){
   if( zDb==0 ){
     cmdlineError("database filename required");
   }
-  rc = sqlite3_open(zDb, &g.db);
+  rc = sqlite3_open_v2(zDb, &g.db, SQLITE_OPEN_READONLY, 0);
   if( rc ){
     cmdlineError("cannot open database file \"%s\"", zDb);
   }