From: drh <>
Date: Fri, 7 Oct 2022 18:06:51 +0000 (+0000)
Subject: Fix a problem that occurred when using a bloom filter to optimize an (ipk = ?) lookup... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=136273c1938b4a64a98cf5d53e06587554839243;p=thirdparty%2Fsqlite.git

Fix a problem that occurred when using a bloom filter to optimize an (ipk = ?) lookup in the case where the RHS of the expression is a TEXT value. First reported by [forum:/forumpost/f61a8b7053|forum post f61a8b7053].

FossilOrigin-Name: dc01d9d8d898ac864811d39e7f3a47be2f179bbda137500da6874f461315d4b3
---

diff --git a/manifest b/manifest
index 7d52d9574e..e662921547 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Increase\sthe\sversion\snumber\sto\s3.39.5.
-D 2022-10-07T17:58:06.457
+C Fix\sa\sproblem\sthat\soccurred\swhen\susing\sa\sbloom\sfilter\sto\soptimize\san\s(ipk\s=\s?)\slookup\sin\sthe\scase\swhere\sthe\sRHS\sof\sthe\sexpression\sis\sa\sTEXT\svalue.\sFirst\sreported\sby\s[forum:/forumpost/f61a8b7053|forum\spost\sf61a8b7053].
+D 2022-10-07T18:06:51.355
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -659,7 +659,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
 F src/where.c e7b7c9d37f4f8d14d4d05b20e57ae43712a51ffed7d45f547a23f9c42ee483dd
 F src/whereInt.h b48ca529ffe293c18cbfa8326af18a09e39910de66fb3e96ef788c7cbf8ef3a7
-F src/wherecode.c f8acceb057286ed95b66689d1981985228fd925001fdc49dbd3b112f4d739174
+F src/wherecode.c 4f05c8af3fb1312807654e517de08203c40479b48614fccaedcdf44c628209d7
 F src/whereexpr.c 55a39f42aaf982574fbf52906371a84cceed98a994422198dfd03db4fce4cc46
 F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -763,6 +763,7 @@ F test/bind2.test 918bc35135f4141809ead7585909cde57d44db90a7a62aef540127148f91aa
 F test/bindxfer.test efecd12c580c14df5f4ad3b3e83c667744a4f7e0
 F test/bitvec.test 75894a880520164d73b1305c1c3f96882615e142
 F test/blob.test e7ac6c7d3a985cc4678c64f325292529a69ae252
+F test/bloom1.test 5318eb0648dff073ca9b9a54387ec2c0a7a07ed3490461fe2db0d074b2eb0e7f
 F test/boundary1.tcl 6421b2d920d8b09539503a8673339d32f7609eb1
 F test/boundary1.test 66d7f4706ccdb42d58eafdb081de07b0eb42d77b
 F test/boundary2.tcl e34ef4e930cf1083150d4d2c603e146bd3b76bcb
@@ -1978,8 +1979,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a29f9949895322123f7c38fbe94c649a9d6e6c9cd0c3b41c96d694552f26b309
-R 71ddfb78def0b8661853e01392a741e3
+P 8eb0048ece0259e4bfef5de1bfee0b860839ae97756020b40e1d6a8e3a2ea119
+Q +8e14c351b29bb434ac4e2510681e95716424a73e340d39feff4919f0431c2e00
+R 42894e9b44d60bc4074dcd1d624092ac
 U drh
-Z 79a51395b233dcad2c3bb71d8616dc17
+Z 939678c5b31e195a348345a08acb669c
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9173ddcdc9..ef539c13a4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8eb0048ece0259e4bfef5de1bfee0b860839ae97756020b40e1d6a8e3a2ea119
\ No newline at end of file
+dc01d9d8d898ac864811d39e7f3a47be2f179bbda137500da6874f461315d4b3
\ No newline at end of file
diff --git a/src/wherecode.c b/src/wherecode.c
index c582ec6571..e26504aace 100644
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -1422,6 +1422,8 @@ static SQLITE_NOINLINE void filterPullDown(
       testcase( pTerm->wtFlags & TERM_VIRTUAL );
       regRowid = sqlite3GetTempReg(pParse);
       regRowid = codeEqualityTerm(pParse, pTerm, pLevel, 0, 0, regRowid);
+      sqlite3VdbeAddOp2(pParse->pVdbe, OP_MustBeInt, regRowid, addrNxt);
+      VdbeCoverage(pParse->pVdbe);
       sqlite3VdbeAddOp4Int(pParse->pVdbe, OP_Filter, pLevel->regFilter,
                            addrNxt, regRowid, 1);
       VdbeCoverage(pParse->pVdbe);
@@ -1683,6 +1685,8 @@ Bitmask sqlite3WhereCodeOneLoopStart(
     if( iRowidReg!=iReleaseReg ) sqlite3ReleaseTempReg(pParse, iReleaseReg);
     addrNxt = pLevel->addrNxt;
     if( pLevel->regFilter ){
+      sqlite3VdbeAddOp2(v, OP_MustBeInt, iRowidReg, addrNxt);
+      VdbeCoverage(v);
       sqlite3VdbeAddOp4Int(v, OP_Filter, pLevel->regFilter, addrNxt,
                            iRowidReg, 1);
       VdbeCoverage(v);
diff --git a/test/bloom1.test b/test/bloom1.test
new file mode 100644
index 0000000000..12b53ddf14
--- /dev/null
+++ b/test/bloom1.test
@@ -0,0 +1,70 @@
+# 2022 October 06
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+#
+# Tests for queries that use bloom filters
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+source $testdir/lock_common.tcl
+source $testdir/malloc_common.tcl
+
+set testprefix bloom1
+
+# Tests 1.*  verify that the bloom filter code correctly handles the
+# case where the RHS of an (<ipk-column> = ?) expression must be coerced
+# to an integer before the comparison made.
+#
+do_execsql_test 1.0 {
+  CREATE TABLE t1(a, b);
+  CREATE TABLE t2(c INTEGER PRIMARY KEY, d);
+}
+
+do_execsql_test 1.1 {
+  INSERT INTO t1 VALUES('hello', 'world');
+  INSERT INTO t2 VALUES(14, 'fourteen');
+}
+
+do_execsql_test 1.2 {
+  ANALYZE sqlite_schema;
+  INSERT INTO sqlite_stat1 VALUES('t2','idx1','6 6');
+  ANALYZE sqlite_schema;
+}
+
+do_execsql_test 1.3 {
+  SELECT 'affinity!' FROM t1 CROSS JOIN t2 WHERE t2.c = '14';
+} {affinity!}
+
+
+reset_db
+do_execsql_test 1.4 {
+  CREATE TABLE t1(a, b TEXT);
+  CREATE TABLE t2(c INTEGER PRIMARY KEY, d);
+  CREATE TABLE t3(e INTEGER PRIMARY KEY, f);
+
+  ANALYZE sqlite_schema;
+  INSERT INTO sqlite_stat1 VALUES('t1','idx1','600 6');
+  INSERT INTO sqlite_stat1 VALUES('t2','idx1','6 6');
+  INSERT INTO sqlite_stat1 VALUES('t3','idx2','6 6');
+  ANALYZE sqlite_schema;
+
+  INSERT INTO t1 VALUES(1, '123');
+  INSERT INTO t2 VALUES(123, 'one');
+  INSERT INTO t3 VALUES(123, 'two');
+}
+
+do_execsql_test 1.5 {
+  SELECT 'result' FROM t1, t2, t3 
+  WHERE t2.c=t1.b AND t2.d!='silly'
+    AND t3.e=t1.b AND t3.f!='silly'
+} {result}
+
+finish_test
+