81 lines
2.4 KiB
Diff
81 lines
2.4 KiB
Diff
|
From effc07ec9c6e08d3bd17665f8800054770f8c643 Mon Sep 17 00:00:00 2001
|
||
|
|
From: drh <>
|
||
|
|
Date: Fri, 15 Jul 2022 12:34:31 +0000
|
||
|
|
Subject: [PATCH] Fix the whereKeyStats() routine (part of STAT4 processing
|
||
|
|
only) so that it is able to cope with row-value comparisons against the
|
||
|
|
primary key index of a WITHOUT ROWID table.
|
||
|
|
[forum:/forumpost/3607259d3c|Forum post 3607259d3c].
|
||
|
|
|
||
|
|
FossilOrigin-Name: 2a6f761864a462de5c2d5bc666b82fb0b7e124a03443cd1482620dde344b34bb
|
||
|
|
|
||
|
|
---
|
||
|
|
src/where.c | 4 ++--
|
||
|
|
test/rowvalue.test | 31 +++++++++++++++++++++++++++++++
|
||
|
|
2 files changed, 33 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/where.c b/src/where.c
|
||
|
|
index de6ea91e3..110eb4845 100644
|
||
|
|
--- a/src/where.c
|
||
|
|
+++ b/src/where.c
|
||
|
|
@@ -1433,7 +1433,7 @@ static int whereKeyStats(
|
||
|
|
#endif
|
||
|
|
assert( pRec!=0 );
|
||
|
|
assert( pIdx->nSample>0 );
|
||
|
|
- assert( pRec->nField>0 && pRec->nField<=pIdx->nSampleCol );
|
||
|
|
+ assert( pRec->nField>0 );
|
||
|
|
|
||
|
|
/* Do a binary search to find the first sample greater than or equal
|
||
|
|
** to pRec. If pRec contains a single field, the set of samples to search
|
||
|
|
@@ -1479,7 +1479,7 @@ static int whereKeyStats(
|
||
|
|
** it is extended to two fields. The duplicates that this creates do not
|
||
|
|
** cause any problems.
|
||
|
|
*/
|
||
|
|
- nField = pRec->nField;
|
||
|
|
+ nField = MIN(pRec->nField, pIdx->nSample);
|
||
|
|
iCol = 0;
|
||
|
|
iSample = pIdx->nSample * nField;
|
||
|
|
do{
|
||
|
|
diff --git a/test/rowvalue.test b/test/rowvalue.test
|
||
|
|
index 12fee8237..59b44d938 100644
|
||
|
|
--- a/test/rowvalue.test
|
||
|
|
+++ b/test/rowvalue.test
|
||
|
|
@@ -751,4 +751,35 @@ do_execsql_test 30.3 {
|
||
|
|
|
||
|
|
|
||
|
|
|
||
|
|
+# 2022-07-15
|
||
|
|
+# https://sqlite.org/forum/forumpost/3607259d3c
|
||
|
|
+#
|
||
|
|
+reset_db
|
||
|
|
+do_execsql_test 33.1 {
|
||
|
|
+ CREATE TABLE t1(a INT, b INT PRIMARY KEY) WITHOUT ROWID;
|
||
|
|
+ INSERT INTO t1(a, b) VALUES (0, 1),(15,-7),(3,100);
|
||
|
|
+ ANALYZE;
|
||
|
|
+} {}
|
||
|
|
+do_execsql_test 33.2 {
|
||
|
|
+ SELECT * FROM t1 WHERE (b,a) BETWEEN (0,5) AND (99,-2);
|
||
|
|
+} {0 1}
|
||
|
|
+do_execsql_test 33.3 {
|
||
|
|
+ SELECT * FROM t1 WHERE (b,a) BETWEEN (-8,5) AND (0,-2);
|
||
|
|
+} {15 -7}
|
||
|
|
+do_execsql_test 33.3 {
|
||
|
|
+ SELECT * FROM t1 WHERE (b,a) BETWEEN (3,5) AND (100,4);
|
||
|
|
+} {3 100}
|
||
|
|
+do_execsql_test 33.3 {
|
||
|
|
+ SELECT * FROM t1 WHERE (b,a) BETWEEN (3,5) AND (100,2);
|
||
|
|
+} {}
|
||
|
|
+do_execsql_test 33.3 {
|
||
|
|
+ SELECT * FROM t1 WHERE (a,b) BETWEEN (-2,99) AND (1,0);
|
||
|
|
+} {0 1}
|
||
|
|
+do_execsql_test 33.3 {
|
||
|
|
+ SELECT * FROM t1 WHERE (a,b) BETWEEN (14,99) AND (16,0);
|
||
|
|
+} {15 -7}
|
||
|
|
+do_execsql_test 33.3 {
|
||
|
|
+ SELECT * FROM t1 WHERE (a,b) BETWEEN (2,99) AND (4,0);
|
||
|
|
+} {3 100}
|
||
|
|
+
|
||
|
|
finish_test
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|