From: dan <dan@noemail.net>
Date: Mon, 10 Oct 2016 14:34:00 +0000 (+0000)
Subject: When handling ORDER BY expressions, do not assume all values of an indexed expression... 
X-Git-Tag: version-3.15.0~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90b2fe6b1ea1a7f0d4064290462f0a6106c3b327;p=thirdparty%2Fsqlite.git

When handling ORDER BY expressions, do not assume all values of an indexed expressions are distinct. Fix for [4766f444].

FossilOrigin-Name: aebe429e52ffef026cb0803fb164339d61bd2e88
---

diff --git a/manifest b/manifest
index 4745f802cb..fe7d790eb4 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-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
+C When\shandling\sORDER\sBY\sexpressions,\sdo\snot\sassume\sall\svalues\sof\san\sindexed\sexpressions\sare\sdistinct.\sFix\sfor\s[4766f444].
+D 2016-10-10T14:34:00.108
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -467,7 +467,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
 F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
 F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0
-F src/where.c a2269d2df19d0e98717e163efaea8d1b532dfce4
+F src/where.c 43b53ef361d1b01002376eff5d33de0898f4dd94
 F src/whereInt.h 2bcc3d176e6091cb8f50a30b65c006e88a73614d
 F src/wherecode.c 717a65294df46f30e9b9933d2a63a4bcbca5a9a8
 F src/whereexpr.c 379d0017fb7bc9e5a4d8cd4b056c747de946430e
@@ -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 28a82b3ed15127b18eed7d71f548f84e3c8161c9
+F test/indexexpr1.test 7d243fac508b4a99fb900ffe34eb488312cfce84
 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 788f86bebe413b5a0ab41ba3d75ba8728827a964
-R 4e30116e3ed090b4bf1fd06f3d023297
-U drh
-Z 1a6f4c734753d210e419c3f7e49c53f1
+P 71797ba431085f9ae381ed5ea6471967926f4043
+R eb83b0ec6e44fd9a4ddc7d39014a988d
+U dan
+Z e53885d9c26ab892c301951bca3836f9
diff --git a/manifest.uuid b/manifest.uuid
index 79583a19b6..42bdf45b1d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-71797ba431085f9ae381ed5ea6471967926f4043
\ No newline at end of file
+aebe429e52ffef026cb0803fb164339d61bd2e88
\ No newline at end of file
diff --git a/src/where.c b/src/where.c
index cccf2c47f4..ca5d90a46d 100644
--- a/src/where.c
+++ b/src/where.c
@@ -3669,7 +3669,7 @@ static i8 wherePathSatisfiesOrderBy(
           }
         }
         if( isMatch ){
-          if( iColumn<0 ){
+          if( iColumn==XN_ROWID ){
             testcase( distinctColumns==0 );
             distinctColumns = 1;
           }
diff --git a/test/indexexpr1.test b/test/indexexpr1.test
index 1737e25ea2..cd72430d91 100644
--- a/test/indexexpr1.test
+++ b/test/indexexpr1.test
@@ -340,4 +340,34 @@ do_execsql_test indexexpr1-1100 {
   SELECT '4:', typeof(a), a FROM t1 WHERE a+0<10;
 } {1: integer 1 2: integer 1 3: integer 1 4: integer 1}
 
+do_execsql_test indexexpr1-1200 {
+  CREATE TABLE t10(a int, b int, c int, d int);
+  INSERT INTO t10(a, b, c, d) VALUES(0, 0, 2, 2);
+  INSERT INTO t10(a, b, c, d) VALUES(0, 0, 0, 0);
+  INSERT INTO t10(a, b, c, d) VALUES(0, 0, 1, 1);
+  INSERT INTO t10(a, b, c, d) VALUES(1, 1, 1, 1);
+  INSERT INTO t10(a, b, c, d) VALUES(1, 1, 0, 0);
+  INSERT INTO t10(a, b, c, d) VALUES(2, 2, 0, 0);
+
+  SELECT a+b, c+d FROM t10 ORDER BY a+b, c+d;
+} {
+  0 0 0 2 0 4 2 0 2 2 4 0
+}
+do_execsql_test indexexpr1-1200.1 {
+  CREATE INDEX t10_ab ON t10(a+b);
+}
+do_execsql_test indexexpr1-1200.2 {
+  SELECT a+b, c+d FROM t10 ORDER BY a+b, c+d;
+} {
+  0 0 0 2 0 4 2 0 2 2 4 0
+}
+do_execsql_test indexexpr1-1200.3 {
+  CREATE INDEX t10_abcd ON t10(a+b,c+d);
+}
+do_execsql_test indexexpr1-1200.4 {
+  SELECT a+b, c+d FROM t10 ORDER BY a+b, c+d;
+} {
+  0 0 0 2 0 4 2 0 2 2 4 0
+}
+
 finish_test