Make sure indexes on expressions skip over initial NULL values in the

index.  Fix for ticket [4baa464912129477f3c9]

FossilOrigin-Name: 71797ba431085f9ae381ed5ea6471967926f4043

diff --git a/manifest b/manifest
index 1c83b5d527ee529f4c562b0a3e195df7f263f1dd..4745f802cb88d8f20dfb657832bbcd0e073ec814 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scase\sin\swhich\sthe\srtree\smodule\swas\signoring\san\sOOM\swhile\sgenerating\san\serror\smessage.
-D 2016-10-10T10:06:59.217
+C Make\ssure\sindexes\son\sexpressions\sskip\sover\sinitial\sNULL\svalues\sin\sthe\nindex.\s\sFix\sfor\sticket\s[4baa464912129477f3c9]
+D 2016-10-10T13:29:15.581
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -469,7 +469,7 @@ F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
 F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0
 F src/where.c a2269d2df19d0e98717e163efaea8d1b532dfce4
 F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
-F src/wherecode.c d07f784cda9d51eb04f086171a67eadda17f963f
+F src/wherecode.c 717a65294df46f30e9b9933d2a63a4bcbca5a9a8
 F src/whereexpr.c 379d0017fb7bc9e5a4d8cd4b056c747de946430e
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@ -852,7 +852,7 @@ F test/index6.test b4fc812290067a578b98bb2667b676db89e202a7
 F test/index7.test 7feababe16f2091b229c22aff2bcc1d4d6b9d2bb
 F test/index8.test bc2e3db70e8e62459aaa1bd7e4a9b39664f8f9d7
 F test/indexedby.test 9c4cd331224e57f79fbf411ae245e6272d415985
-F test/indexexpr1.test cb71b6586177b840e28110dd952178bb2bdfedc2
+F test/indexexpr1.test 28a82b3ed15127b18eed7d71f548f84e3c8161c9
 F test/indexfault.test 31d4ab9a7d2f6e9616933eb079722362a883eb1d
 F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
 F test/insert.test 38742b5e9601c8f8d76e9b7555f7270288c2d371
@@ -1525,7 +1525,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 010ec22541a4c37f2d3b01b6a531b4b4264102b7
-R 77f705f1e0cdd507ef3a0aa0a78fee02
-U dan
-Z e4f9aa06315af4c14cd5c8e66a421664
+P 788f86bebe413b5a0ab41ba3d75ba8728827a964
+R 4e30116e3ed090b4bf1fd06f3d023297
+U drh
+Z 1a6f4c734753d210e419c3f7e49c53f1

diff --git a/manifest.uuid b/manifest.uuid
index 8ea56b44f7b79e34a6732c84ad75bb2a70995071..79583a19b63e7aa91fb1babce75d63fcacc70534 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-788f86bebe413b5a0ab41ba3d75ba8728827a964
\ No newline at end of file
+71797ba431085f9ae381ed5ea6471967926f4043
\ No newline at end of file

diff --git a/src/wherecode.c b/src/wherecode.c
index a244a303a6e751186cd9f0ce1cff9c0b6a9edb4a..c095ce7c87f7c0729ff61e23ddfdec4e91f33bc0 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -1446,11 +1446,11 @@ Bitmask sqlite3WhereCodeOneLoopStart(
         pLevel->iLikeRepCntr |= bRev ^ (pIdx->aSortOrder[nEq]==SQLITE_SO_DESC);
       }
 #endif
-      if( pRangeStart==0
-       && (j = pIdx->aiColumn[nEq])>=0 
-       && pIdx->pTable->aCol[j].notNull==0
-      ){
-        bSeekPastNull = 1;
+      if( pRangeStart==0 ){
+        j = pIdx->aiColumn[nEq];
+        if( (j>=0 && pIdx->pTable->aCol[j].notNull==0) || j==XN_EXPR ){
+          bSeekPastNull = 1;
+        }
       }
     }
     assert( pRangeEnd==0 || (pRangeEnd->wtFlags & TERM_VNULL)==0 );

diff --git a/test/indexexpr1.test b/test/indexexpr1.test
index a8a74f259ee4ba6194073629b46c27c695b28774..1737e25ea20f375680052d08e382e629fee5e67e 100644 (file)
--- a/test/indexexpr1.test
+++ b/test/indexexpr1.test
@@ -323,5 +323,21 @@ do_execsql_test indexexpr1-1010 {
   SELECT *, '|' FROM t0 ORDER BY +a;
 } {0 88 2 | 2 99 4 | 5 99 7 |}
 
+# 2016-10-10
+# Make sure indexes on expressions skip over initial NULL values in the
+# index as they are suppose to do.
+# Ticket https://www.sqlite.org/src/tktview/4baa46491212947
+#
+do_execsql_test indexexpr1-1100 {
+  DROP TABLE IF EXISTS t1;
+  CREATE TABLE t1(a);
+  INSERT INTO t1 VALUES(NULL),(1);
+  SELECT '1:', typeof(a), a FROM t1 WHERE a<10;
+  SELECT '2:', typeof(a), a FROM t1 WHERE a+0<10;
+  CREATE INDEX t1x1 ON t1(a);
+  CREATE INDEX t1x2 ON t1(a+0);
+  SELECT '3:', typeof(a), a FROM t1 WHERE a<10;
+  SELECT '4:', typeof(a), a FROM t1 WHERE a+0<10;
+} {1: integer 1 2: integer 1 3: integer 1 4: integer 1}
 
 finish_test