Improved WHERETRACE messages for the estimated output row reductions from

range scans.

FossilOrigin-Name: fdd478bb11eb9e244a7a1fb628ac27c53830fb24

diff --git a/manifest b/manifest
index 0b3792092e02d2a298c6a4167b6e95f080ca2145..dbe5333a459a39bbf4008886bcb150b39248c768 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\san\sinaccurate\sstat4-based\sestimate\sfor\sthe\nnumber\sof\srows\svisited\sby\sa\srange\sscan.
-D 2014-08-28T17:30:28.372
+C Improved\sWHERETRACE\smessages\sfor\sthe\sestimated\soutput\srow\sreductions\sfrom\nrange\sscans.
+D 2014-08-28T19:38:22.884
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -297,7 +297,7 @@ F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
 F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 11edb74d587bc87b33ca96a5173e3ec1b8389e45
-F src/where.c 8214c30123537c5ae49f5775f7298dbb1c64d676
+F src/where.c d9eae96b2cbbe4842eac3ee156ccd1b933d802c4
 F src/whereInt.h 923820bee9726033a501a08d2fc69b9c1ee4feb3
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1188,8 +1188,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c931ca2b7763cf894ece26ca4775d638876107e9 6ba609522ea7325341fad93bdb5f869c6506dea4
-R 3ae9c7f00ac4ed418fd1e37d2965b964
-T +closed 6ba609522ea7325341fad93bdb5f869c6506dea4
+P a9daf3ac444b896013f4054051937d49a597624a
+R 9b7fb0a8b772f987f88c09068dd60142
 U drh
-Z 21e61dd5628a06df27222872476717f3
+Z 8017c3a896f88a1957938bddddebc44a

diff --git a/manifest.uuid b/manifest.uuid
index 21fb81eb3526480ce79b953f1bdb918e96094fd8..9b52e2f1ba7fae90cd0de0a1917cd540dc6fb0d3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a9daf3ac444b896013f4054051937d49a597624a
\ No newline at end of file
+fdd478bb11eb9e244a7a1fb628ac27c53830fb24
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index e5f61c0edd4e535695d4642e5e39973a437a1e6d..e1e1e1d528e0fbfb8f7fb5d6c1da3bc720035ecd 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -2254,7 +2254,7 @@ static int whereRangeScanEst(
         if( nNew<nOut ){
           nOut = nNew;
         }
-        WHERETRACE(0x10, ("range scan regions: %u..%u  est=%d\n",
+        WHERETRACE(0x10, ("STAT4 range scan: %u..%u  est=%d\n",
                            (u32)iLower, (u32)iUpper, nOut));
       }
     }else{
@@ -2282,6 +2282,12 @@ static int whereRangeScanEst(
   nOut -= (pLower!=0) + (pUpper!=0);
   if( nNew<10 ) nNew = 10;
   if( nNew<nOut ) nOut = nNew;
+#if defined(WHERETRACE_ENABLED)
+  if( pLoop->nOut>nOut ){
+    WHERETRACE(0x10,("Range scan lowers nOut from %d to %d\n",
+                    pLoop->nOut, nOut));
+  }
+#endif
   pLoop->nOut = (LogEst)nOut;
   return rc;
 }