From: dan <dan@noemail.net>
Date: Sat, 28 Dec 2019 18:08:39 +0000 (+0000)
Subject: Change an assert() in where.c to a testcase() macro, since the condition may be false... 
X-Git-Tag: version-3.31.0~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4adb1d0000c8bd3d194518bf3e164d90cdecb93b;p=thirdparty%2Fsqlite.git

Change an assert() in where.c to a testcase() macro, since the condition may be false. This was a problem with the assert() only, there is no bug in release builds that omit assert().

FossilOrigin-Name: 82be135dee7ccfde5f8a67f3621b7ced449dce89bae9cadf025154a4de848c11
---

diff --git a/manifest b/manifest
index 4c24f6497b..2fbed9f1d1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\searly\scoding\sof\stransitive\sconstraints\sat\sthe\send\sof\seach\sloop\sin\nthe\sWHERE\sclause\sprocessing\sif\sthe\sloop\sbeing\scoded\sis\sfor\sa\sLEFT\sJOIN,\neven\sif\sthe\sloop\sis\spart\sof\san\sOR-clause\soptimization\sfor\svirtual\stables.\nTest\scases\sin\sTH3.
-D 2019-12-28T16:20:23.018
+C Change\san\sassert()\sin\swhere.c\sto\sa\stestcase()\smacro,\ssince\sthe\scondition\smay\sbe\sfalse.\sThis\swas\sa\sproblem\swith\sthe\sassert()\sonly,\sthere\sis\sno\sbug\sin\srelease\sbuilds\sthat\somit\sassert().
+D 2019-12-28T18:08:39.531
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -616,7 +616,7 @@ F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c a137468bf36c92e64d2275caa80c83902e3a0fc59273591b96c6416d3253d05d
 F src/where.c 7bb294fdada405412dfd76d351286e0dec3dda07a8e19b0f904b8e8fc0ced41f
 F src/whereInt.h de1b77e416ad5a7cc60a71fc1317484f8d83ca1e52b805dc8c978785a92eeded
-F src/wherecode.c 8f4b83ef410a5144bf65e2986d72df5b25c9dd6b0ef1676e9dc8efefdba011f8
+F src/wherecode.c 3c9b185cdb6950fa1043d324d3e8ef14b07cef4f5cfb475611b6f43480494fb2
 F src/whereexpr.c 4b34be1434183e7bb8a05d4bf42bd53ea53021b0b060936fbd12062b4ff6b396
 F src/window.c 87795bb8293179cb8a92529264d49bd66b5bcad5e91cfc17dd8d3e66a2a77f88
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1191,7 +1191,7 @@ F test/notify2.test 2ecabaa1305083856b7c39cf32816b612740c161
 F test/notify3.test 10ff25cde502e72a92053a2f215d64bece4ef934
 F test/notnull.test a37b663d5bb728d66fc182016613fb8e4a0a4bbf3d75b8876a7527f7d4ed3f18
 F test/null.test 0dcce4f04284ec66108c503327ad6d224c0752b3
-F test/nulls1.test c8fc1b223f06e60007e0cd3e498ccb10195cf75a18fc3312508b3cf679ecb806
+F test/nulls1.test fe4153fd59a3786b4b9f3663a3e65a3aa43a318c7b4d7dcb3f6c3ed5652c9095
 F test/numcast.test 5d126f7f581432e86a90d1e35cac625164aec4a1
 F test/numindex1.test 20a5450d4b056e48cd5db30e659f13347a099823
 F test/offset1.test f06b83657bcf26f9ce805e67450e189e282143b2
@@ -1853,7 +1853,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 f4bed1d7af8a94c6facd567dec5afae8865a5ad76b8834493099e5e30bed1132
-R f70080212a74811cf1e55e61f62a66ab
-U drh
-Z 43a1d545f913b52be3ee48c625515a53
+P 9421b442cad9858ec21050c106aa935a1c0723ab08ef9a867a79638b040b6e68
+R e9385abc46897bbfbfbfbc6bfbcfd8c7
+U dan
+Z 8385698bc4652e7f942fce6214733907
diff --git a/manifest.uuid b/manifest.uuid
index 4d2a2dac46..f86444f188 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9421b442cad9858ec21050c106aa935a1c0723ab08ef9a867a79638b040b6e68
\ No newline at end of file
+82be135dee7ccfde5f8a67f3621b7ced449dce89bae9cadf025154a4de848c11
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index 289eecb306..9c51b5669c 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -1685,7 +1685,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
     ){
       assert( bSeekPastNull==0 && nExtraReg==0 && nBtm==0 && nTop==0 );
       assert( pRangeEnd==0 && pRangeStart==0 );
-      assert( pLoop->nSkip==0 );
+      testcase( pLoop->nSkip>0 );
       nExtraReg = 1;
       bSeekPastNull = 1;
       pLevel->regBignull = regBignull = ++pParse->nMem;
diff --git a/test/nulls1.test b/test/nulls1.test
index a6bf62c159..9f4402f916 100644
--- a/test/nulls1.test
+++ b/test/nulls1.test
@@ -255,4 +255,47 @@ do_catchsql_test 8.0 {
   CREATE TABLE t80(a, b INTEGER, PRIMARY KEY(b NULLS LAST)) WITHOUT ROWID;
 } {1 {unsupported use of NULLS LAST}}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 9.0 {
+  CREATE TABLE v0 (c1, c2, c3);
+  CREATE INDEX v3 ON v0 (c1, c2, c3);
+}
+do_execsql_test 9.1 {
+  ANALYZE sqlite_master;
+  INSERT INTO sqlite_stat1 VALUES('v0','v3','648 324 81');
+  ANALYZE sqlite_master;
+}
+
+do_execsql_test 9.2 {
+  INSERT INTO v0 VALUES
+      (1, 10, 'b'),
+      (1, 10, 'd'),
+      (1, 10, NULL),
+      (2, 10, 'a'),
+      (2, 10, NULL),
+      (1, 10, 'c'),
+      (2, 10, 'b'),
+      (1, 10, 'a'),
+      (1, 10, NULL),
+      (2, 10, NULL),
+      (2, 10, 'd'),
+      (2, 10, 'c');
+}
+
+do_execsql_test 9.3 {
+  SELECT c1, c2, ifnull(c3, 'NULL') FROM v0 
+  WHERE c2=10 ORDER BY c1, c3 NULLS LAST
+} {
+  1 10 a 1 10 b 1 10 c 1 10 d 1 10 NULL 1 10 NULL
+  2 10 a 2 10 b 2 10 c 2 10 d 2 10 NULL 2 10 NULL
+}
+
+do_eqp_test 9.4 {
+  SELECT c1, c2, ifnull(c3, 'NULL') FROM v0 
+  WHERE c2=10 ORDER BY c1, c3 NULLS LAST
+} {SEARCH TABLE v0 USING COVERING INDEX v3 (ANY(c1) AND c2=?)}
+
+
+
 finish_test