Simplify branch coverage testing by interchanging the order of two tests

in the whereLoopInsert() function.

FossilOrigin-Name: f7079b5365dd6cd8324a4fb23605e81476122ed6

diff --git a/manifest b/manifest
index 74678df38daa377af95d543e616b8e87083eefd9..15dc352239ec94373f12b39ea561f654bb0c7ed4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\sstat4\srelated\stests.
-D 2013-09-02T18:58:11.176
+C Simplify\sbranch\scoverage\stesting\sby\sinterchanging\sthe\sorder\sof\stwo\stests\nin\sthe\swhereLoopInsert()\sfunction.
+D 2013-09-02T20:22:18.651
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -290,7 +290,7 @@ F src/vtab.c 165ce0e797c2cd23badb104c9f2ae9042d6d942c
 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c a37169b46fc03e381701852e43f85a51710986dd
+F src/where.c 573a815c28a7c70b5148a23ec040bb8992e51e5d
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1109,7 +1109,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 175842997af134138784bff6f8e93573deb5b36b
-R b9c05f2f20c9bc7024ff33ef435a0342
-U dan
-Z 4390b50c9d94be4a8d0945a9543a37a9
+P 0a702c4b4c35fdbcb62e3ab88b9e57d7ea0052a8
+R 5255609fa5f702769f786eafe83d1965
+U drh
+Z 3ad66b5373e173075a1fd9a0798ca8c7

diff --git a/manifest.uuid b/manifest.uuid
index f4fb99e6d6fc921d591a0bb3d5f9d3c8fc48ad56..59f020c938a703d39511ef5846dda0e6043a6fdc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0a702c4b4c35fdbcb62e3ab88b9e57d7ea0052a8
\ No newline at end of file
+f7079b5365dd6cd8324a4fb23605e81476122ed6
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 58410ca150549641e453981092d1dd29f7113e52..39650d62e933051004a86be17abab81b73ab94d3 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -4180,11 +4180,11 @@ static int whereLoopInsert(WhereLoopBuilder *pBuilder, WhereLoop *pTemplate){
       ** all of (1) dependencies (2) setup-cost, (3) run-cost, and
       ** (4) number of output rows. */
       assert( p->rSetup==pTemplate->rSetup );
-      if( p->nLTerm<pTemplate->nLTerm
+      if( p->prereq==pTemplate->prereq
+       && p->nLTerm<pTemplate->nLTerm
        && (p->wsFlags & WHERE_INDEXED)!=0
        && (pTemplate->wsFlags & WHERE_INDEXED)!=0
        && p->u.btree.pIndex==pTemplate->u.btree.pIndex
-       && p->prereq==pTemplate->prereq
       ){
         /* Overwrite an existing WhereLoop with an similar one that uses
         ** more terms of the index */