Add a testcase() macro to help verfity the row estimation logic.

FossilOrigin-Name: 6ba609522ea7325341fad93bdb5f869c6506dea4

diff --git a/manifest b/manifest
index de99e3bdbb36c36971e9b969344dc880ff38b6e4..8348ae46360e0c2be7b757f7cc7725a297112896 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\san\sinaccurate\sstat4-based\sestimate\sfor\sthe\snumber\sof\srows\svisited\sby\sa\srange\sscan.
-D 2014-08-28T16:01:31.625
+C Add\sa\stestcase()\smacro\sto\shelp\sverfity\sthe\srow\sestimation\slogic.
+D 2014-08-28T17:20:37.257
 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 70dc8408930f9361d7b6240bf61c08ac3990ee4b
+F src/where.c 8214c30123537c5ae49f5775f7298dbb1c64d676
 F src/whereInt.h 923820bee9726033a501a08d2fc69b9c1ee4feb3
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1188,10 +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
-R ef66ab622eee0820f789fdd0466c8ee4
-T *branch * stat4-experimental
-T *sym-stat4-experimental *
-T -sym-trunk *
-U dan
-Z 96900af81552b8a268140227f697d961
+P 052d89b554a947b7e420b7feb6650f5069b7cefa
+R 3ae9c7f00ac4ed418fd1e37d2965b964
+U drh
+Z 6043bd4cd21e295f0b7cecd3f4e6f8d8

diff --git a/manifest.uuid b/manifest.uuid
index 029666a0e85670fc389cb6236140b1bfb24039ca..0e4f3928fc403b05213ea06710afbbb33e360089 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-052d89b554a947b7e420b7feb6650f5069b7cefa
\ No newline at end of file
+6ba609522ea7325341fad93bdb5f869c6506dea4
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 64b3286086ce56e2dde78a49eb8ece747099198b..e5f61c0edd4e535695d4642e5e39973a437a1e6d 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -2191,7 +2191,10 @@ static int whereRangeScanEst(
       tRowcnt iLower;
       tRowcnt iUpper;
 
-      if( pRec ) pRec->nField = pBuilder->nRecValid;
+      if( pRec ){
+        testcase( pRec->nField!=pBuilder->nRecValid );
+        pRec->nField = pBuilder->nRecValid;
+      }
       if( nEq==p->nKeyCol ){
         aff = SQLITE_AFF_INTEGER;
       }else{