Only use indexes on expressions to optimize ORDER BY and GROUP BY if the

collation sequence matches. Possible fix for [e20dd54a].

FossilOrigin-Name: 37e1900880b70be6802eaf43b0e568fda709a1dd6083d8be11e5a7a7d1fda41a

diff --git a/manifest b/manifest
index bb8ae26a385d7dd24f80cb9ec0e97f987ab1732a..dad7e502b887ae8357bc7bcf7cdb4978a5e5c6ab 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\s__builtin_clzll()\sfunction\sof\sgcc\sto\simprove\sthe\sperformance\sand\nreduce\sthe\ssize\sof\sthe\ssqlite3LogEst()\sroutine.
-D 2017-08-17T20:53:07.912
+C Only\suse\sindexes\son\sexpressions\sto\soptimize\sORDER\sBY\sand\sGROUP\sBY\sif\sthe\ncollation\ssequence\smatches.\sPossible\sfix\sfor\s[e20dd54a].
+D 2017-08-18T08:29:37.727
 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@ -538,7 +538,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 40c543f0a2195d1b0dc88ef12142bea690009344
 F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 F src/walker.c 3ccfa8637f95355bff61144e01a615b8ef26f79c312880848da73f03367da1e6
-F src/where.c cbe8ddffbcec7ce86f7a800fe8fd10aee412c76c87e0dd3732a1682e68d74cd9
+F src/where.c ad558533d6fe6578857635218633aa241e2428835763c46801be9e68d6ec0701
 F src/whereInt.h 93bb90b77d39901eda31b44d8e90da1351193ccfe96876f89b58a93a33b84c3d
 F src/wherecode.c e7be3b7f4c11908500cdf02b299d190d3742659533f58e0f4047962fdb5a48da
 F src/whereexpr.c fe1fe600d7334e91f3d9d487021362d543fba8ab2f1be5e0d68063d619379c05
@@ -943,7 +943,7 @@ F test/index8.test bc2e3db70e8e62459aaa1bd7e4a9b39664f8f9d7
 F test/index9.test 0aa3e509dddf81f93380396e40e9bb386904c1054924ba8fa9bcdfe85a8e7721
 F test/indexedby.test 9c4cd331224e57f79fbf411ae245e6272d415985
 F test/indexexpr1.test 84100e880154a4b645db9f4fc7642756d9a2b6011b68f73c8efda4d244816de9
-F test/indexexpr2.test 3ddd7f23bc381b9f2b7a15f2d083b1a4078e7733dce8295602ecfa3c74a34cf9
+F test/indexexpr2.test 2237f1408efa921bd66d0a09ebf0208cb0c228c1bc3b3a18e9fb8fc87d6ed90b
 F test/indexfault.test 31d4ab9a7d2f6e9616933eb079722362a883eb1d
 F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
 F test/insert.test 38742b5e9601c8f8d76e9b7555f7270288c2d371
@@ -1649,7 +1649,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 264a5e1b75ee073bd019483e289c3d8d79abcf5a765435be23ac3c21b1db8246
-R 08353d9c0ca9dacc46ddab1c0e437979
-U drh
-Z 35417eeee14d21861c3f9ed9415c7596
+P a42a438cbbd721765ca55e71c464552dbaa494050cf472593599b8c7f0249516
+R 01b1b734d02df776d0a6e39431469431
+U dan
+Z 25c783941cfeb73ae08636afb42efa7c

diff --git a/manifest.uuid b/manifest.uuid
index 04447e26d5b5787e08ee628c45e5bcd96a8614d8..eae0feb8f2ac00f531ed381df8ea851574ec25de 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a42a438cbbd721765ca55e71c464552dbaa494050cf472593599b8c7f0249516
\ No newline at end of file
+37e1900880b70be6802eaf43b0e568fda709a1dd6083d8be11e5a7a7d1fda41a
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 0e82e471f40a56813908bf8dad658f77c354a26e..5402977c303c082d62ebf0644227d5b290f4dc29 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3689,7 +3689,7 @@ static i8 wherePathSatisfiesOrderBy(
               continue;
             }
           }
-          if( iColumn>=0 ){
+          if( iColumn!=XN_ROWID ){
             pColl = sqlite3ExprCollSeq(pWInfo->pParse, pOrderBy->a[i].pExpr);
             if( !pColl ) pColl = db->pDfltColl;
             if( sqlite3StrICmp(pColl->zName, pIndex->azColl[j])!=0 ) continue;

diff --git a/test/indexexpr2.test b/test/indexexpr2.test
index c72561f34760bae0f9e655203c5b96995aa6acac..7fa226cf8f6366208708e277ceb5de6e82bdd98d 100644 (file)
--- a/test/indexexpr2.test
+++ b/test/indexexpr2.test
@@ -40,4 +40,101 @@ do_execsql_test 2.1 {
   SELECT a+1, quote(a+1) FROM t1 ORDER BY 1;
 } {2 2 3 3 4 4}
 
+#-------------------------------------------------------------------------
+# At one point SQLite was incorrectly using indexes on expressions to
+# optimize ORDER BY and GROUP BY clauses even when the collation
+# sequences of the query and index did not match (ticket [e20dd54ab0e4]).
+# The following tests - 3.* - attempt to verify that this has been fixed.
+#
+
+reset_db
+do_execsql_test 3.1.0 {
+  CREATE TABLE t1(a, b);
+  CREATE INDEX i1 ON t1(a, b);
+} {}
+
+do_eqp_test 3.1.1 {
+  SELECT b FROM t1 WHERE b IS NOT NULL AND a IS NULL 
+  GROUP BY b COLLATE nocase
+  ORDER BY b COLLATE nocase;
+} {
+  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=? AND b>?)}
+  0 0 0 {USE TEMP B-TREE FOR GROUP BY}
+}
+
+do_execsql_test 3.2.0 {
+  CREATE TABLE t2(x);
+
+  INSERT INTO t2 VALUES('.ABC');
+  INSERT INTO t2 VALUES('.abcd');
+  INSERT INTO t2 VALUES('.defg');
+  INSERT INTO t2 VALUES('.DEF');
+} {}
+
+do_execsql_test 3.2.1 {
+  SELECT x FROM t2 ORDER BY substr(x, 2) COLLATE nocase;
+} {
+  .ABC .abcd .DEF .defg
+}
+
+do_execsql_test 3.2.2 {
+  CREATE INDEX i2 ON t2( substr(x, 2) );
+  SELECT x FROM t2 ORDER BY substr(x, 2) COLLATE nocase;
+} {
+  .ABC .abcd .DEF .defg
+}
+
+do_execsql_test 3.3.0 {
+  CREATE TABLE t3(x);
+}
+
+do_eqp_test 3.3.1 {
+  SELECT json_extract(x, '$.b') FROM t2 
+  WHERE json_extract(x, '$.b') IS NOT NULL AND json_extract(x, '$.a') IS NULL 
+  GROUP BY json_extract(x, '$.b') COLLATE nocase
+  ORDER BY json_extract(x, '$.b') COLLATE nocase;
+} {
+  0 0 0 {SCAN TABLE t2} 
+  0 0 0 {USE TEMP B-TREE FOR GROUP BY}
+}
+
+do_execsql_test 3.3.2 {
+  CREATE INDEX i3 ON t3(json_extract(x, '$.a'), json_extract(x, '$.b'));
+} {}
+
+do_eqp_test 3.3.3 {
+  SELECT json_extract(x, '$.b') FROM t3 
+  WHERE json_extract(x, '$.b') IS NOT NULL AND json_extract(x, '$.a') IS NULL 
+  GROUP BY json_extract(x, '$.b') COLLATE nocase
+  ORDER BY json_extract(x, '$.b') COLLATE nocase;
+} {
+  0 0 0 {SEARCH TABLE t3 USING INDEX i3 (<expr>=?)} 
+  0 0 0 {USE TEMP B-TREE FOR GROUP BY}
+}
+
+do_execsql_test 3.4.0 {
+  CREATE TABLE t4(a, b);
+  INSERT INTO t4 VALUES('.ABC', 1);
+  INSERT INTO t4 VALUES('.abc', 2);
+  INSERT INTO t4 VALUES('.ABC', 3);
+  INSERT INTO t4 VALUES('.abc', 4);
+}
+
+do_execsql_test 3.4.1 {
+  SELECT * FROM t4 
+  WHERE substr(a, 2) = 'abc' COLLATE NOCASE
+  ORDER BY substr(a, 2), b;
+} {
+  .ABC 1   .ABC 3   .abc 2   .abc 4
+}
+
+do_execsql_test 3.4.2 {
+  CREATE INDEX i4 ON t4( substr(a, 2) COLLATE NOCASE, b );
+  SELECT * FROM t4 
+  WHERE substr(a, 2) = 'abc' COLLATE NOCASE
+  ORDER BY substr(a, 2), b;
+} {
+  .ABC 1   .ABC 3   .abc 2   .abc 4
+}
+
 finish_test