Additional unlikely() test cases. Logic tweaks to support test coverage.

FossilOrigin-Name: 5d00cce74a7aefaf30022ae971ab1e0451e0ad6e

diff --git a/manifest b/manifest
index 022df6e64665eab4e6499269f7ba1553623edc47..9e53d5e7f40c25bca36641c12eb119f84ce1e1ed 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sthe\sname\sof\sthe\stwo-argument\sunlikely()\sfunction\sto\slikelihood().\nAdd\stest\scases.
-D 2013-09-11T11:38:58.186
+C Additional\sunlikely()\stest\scases.\s\sLogic\stweaks\sto\ssupport\stest\scoverage.
+D 2013-09-11T14:34:58.423
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -214,7 +214,7 @@ F src/pragma.c 3aa3d8c8623b7b71c5b1bfb72dcc31fb0c25665f
 F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
 F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b
 F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
-F src/resolve.c fde5b5c5be70edb1994e5fbef86f0e08fd267333
+F src/resolve.c 0e5b31ef428a76782c6ea8244d820f94f55c8110
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c 9239586282bd146ec5843a2cde7d54cd7816cf78
 F src/shell.c d920a891ca09b8bd262cced7fb0ab9d723f7a747
@@ -290,7 +290,7 @@ F src/vtab.c 5a423b042eb1402ef77697d03d6a67378d97bc8d
 F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c 6b9e2bc47dd1225d690a9c770f157693519b7391
+F src/where.c 74beca71522c95dde151a379cef6badb168a49de
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
@@ -1059,7 +1059,7 @@ F test/whereC.test d6f4ecd4fa2d9429681a5b22a25d2bda8e86ab8a
 F test/whereD.test 6c2feb79ef1f68381b07f39017fe5f9b96da8d62
 F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f
 F test/whereF.test 5b2ba0dbe8074aa13e416b37c753991f0a2492d7
-F test/whereG.test fa2da659bd2c88314774dc5ff7c297c027eb92ba
+F test/whereG.test 5e6954236069469b939d3e0ccaf09dc38dc8320b
 F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/wild001.test bca33f499866f04c24510d74baf1e578d4e44b1c
 F test/win32lock.test 7a6bd73a5dcdee39b5bb93e92395e1773a194361
@@ -1112,7 +1112,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 52d52688644f635a50a60ff17b160f3affa8fa6c
-R 31254cf1d66f852ba95ac31e1e5bad22
+P 29a359b8d7f90e6fa2b28ce2a112284fd3870494
+R 93dee01cdf95f7285a0f10ba394514d9
 U drh
-Z 703ec90474ce0af750c28f3450c33fc9
+Z 1aa243de8c46c2869ae531db3feb1a86

diff --git a/manifest.uuid b/manifest.uuid
index 9111f5c25b9b33dec44c5d478a388bace0bd1676..a7dc88fb9b429ad94a8e61cb5211ab48e97a25da 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29a359b8d7f90e6fa2b28ce2a112284fd3870494
\ No newline at end of file
+5d00cce74a7aefaf30022ae971ab1e0451e0ad6e
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 5f238e1027aa543c6d305f1927081467e3682948..0abd61d39974b058d5906fe76bfadea078ac6ab0 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -579,7 +579,8 @@ static int exprProbability(Expr *p){
   double r = -1.0;
   if( p->op!=TK_FLOAT ) return -1;
   sqlite3AtoF(p->u.zToken, &r, sqlite3Strlen30(p->u.zToken), SQLITE_UTF8);
-  if( r<0.0 || r>1.0 ) return -1;
+  assert( r>=0.0 );
+  if( r>1.0 ) return -1;
   return (int)(r*1000.0);
 }
 

diff --git a/src/where.c b/src/where.c
index f2ecb764093adf64fdad8a56c7e385398df0549a..540ab075e6fdcd7c6c9952527a6489a85231c7e7 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -691,7 +691,7 @@ static int whereClauseInsert(WhereClause *pWC, Expr *p, u8 wtFlags){
   pTerm = &pWC->a[idx = pWC->nTerm++];
   if( wtFlags & TERM_VIRTUAL ){
     pTerm->truthProb = 0;
-  }else if( p && ExprHasAnyProperty(p, EP_Hint) ){
+  }else if( ALWAYS(p) && ExprHasAnyProperty(p, EP_Hint) ){
     pTerm->truthProb = whereCost(p->iTable) - 99;
   }else{
     pTerm->truthProb = -1;

diff --git a/test/whereG.test b/test/whereG.test
index 257a410aae368e66f74fb85116313751208df305..38dfeb07bc557671a7f76cf5f5fc5bfc722c8c6d 100644 (file)
--- a/test/whereG.test
+++ b/test/whereG.test
@@ -32,6 +32,32 @@ do_execsql_test whereG-1.0 {
   );
   CREATE INDEX track_i1 ON track(cid);
   CREATE INDEX track_i2 ON track(aid);
+  INSERT INTO composer VALUES(1, 'W. A. Mozart');
+  INSERT INTO composer VALUES(2, 'Beethoven');
+  INSERT INTO composer VALUES(3, 'Thomas Tallis');
+  INSERT INTO composer VALUES(4, 'Joseph Hayden');
+  INSERT INTO composer VALUES(5, 'Thomas Weelkes');
+  INSERT INTO composer VALUES(6, 'J. S. Bach');
+  INSERT INTO composer VALUES(7, 'Orlando Gibbons');
+  INSERT INTO composer VALUES(8, 'Josquin des Prés');
+  INSERT INTO composer VALUES(9, 'Byrd');
+  INSERT INTO composer VALUES(10, 'Francis Poulenc');
+  INSERT INTO composer VALUES(11, 'Mendelsshon');
+  INSERT INTO composer VALUES(12, 'Zoltán Kodály');
+  INSERT INTO composer VALUES(13, 'Handel');
+  INSERT INTO album VALUES(100, 'Kodály: Missa Brevis');
+  INSERT INTO album VALUES(101, 'Messiah');
+  INSERT INTO album VALUES(102, 'Missa Brevis in D-, K.65');
+  INSERT INTO album VALUES(103, 'The complete English anthems');
+  INSERT INTO album VALUES(104, 'Mass in B Minor, BWV 232');
+  INSERT INTO track VALUES(10005, 12, 100, 'Sanctus');
+  INSERT INTO track VALUES(10007, 12, 100, 'Agnus Dei');
+  INSERT INTO track VALUES(10115, 13, 101, 'Surely He Hath Borne Our Griefs');
+  INSERT INTO track VALUES(10129, 13, 101, 'Since By Man Came Death');
+  INSERT INTO track VALUES(10206, 1, 102, 'Agnus Dei');
+  INSERT INTO track VALUES(10301, 3, 103, 'If Ye Love Me');
+  INSERT INTO track VALUES(10402, 6, 104, 'Domine Deus');
+  INSERT INTO track VALUES(10403, 6, 104, 'Qui tollis');
 } {}
 do_eqp_test whereG-1.1 {
   SELECT DISTINCT aname
@@ -40,27 +66,58 @@ do_eqp_test whereG-1.1 {
      AND composer.cid=track.cid
      AND album.aid=track.aid;
 } {/.*composer.*track.*album.*/}
-do_eqp_test whereG-1.2 {
+do_execsql_test whereG-1.2 {
+  SELECT DISTINCT aname
+    FROM album, composer, track
+   WHERE unlikely(cname LIKE '%bach%')
+     AND composer.cid=track.cid
+     AND album.aid=track.aid;
+} {{Mass in B Minor, BWV 232}}
+
+do_eqp_test whereG-1.3 {
   SELECT DISTINCT aname
     FROM album, composer, track
    WHERE likelihood(cname LIKE '%bach%', 0.5)
      AND composer.cid=track.cid
      AND album.aid=track.aid;
 } {/.*track.*composer.*album.*/}
-do_eqp_test whereG-1.3 {
+do_execsql_test whereG-1.4 {
+  SELECT DISTINCT aname
+    FROM album, composer, track
+   WHERE likelihood(cname LIKE '%bach%', 0.5)
+     AND composer.cid=track.cid
+     AND album.aid=track.aid;
+} {{Mass in B Minor, BWV 232}}
+
+do_eqp_test whereG-1.5 {
   SELECT DISTINCT aname
     FROM album, composer, track
    WHERE cname LIKE '%bach%'
      AND composer.cid=track.cid
      AND album.aid=track.aid;
 } {/.*track.*composer.*album.*/}
-do_eqp_test whereG-1.4 {
+do_execsql_test whereG-1.6 {
+  SELECT DISTINCT aname
+    FROM album, composer, track
+   WHERE cname LIKE '%bach%'
+     AND composer.cid=track.cid
+     AND album.aid=track.aid;
+} {{Mass in B Minor, BWV 232}}
+
+do_eqp_test whereG-1.7 {
   SELECT DISTINCT aname
     FROM album, composer, track
    WHERE cname LIKE '%bach%'
      AND unlikely(composer.cid=track.cid)
      AND unlikely(album.aid=track.aid);
 } {/.*track.*composer.*album.*/}
+do_execsql_test whereG-1.8 {
+  SELECT DISTINCT aname
+    FROM album, composer, track
+   WHERE cname LIKE '%bach%'
+     AND unlikely(composer.cid=track.cid)
+     AND unlikely(album.aid=track.aid);
+} {{Mass in B Minor, BWV 232}}
 
 do_test whereG-2.1 {
   catchsql {