mirror of
https://github.com/sqlite/sqlite.git
synced 2025-07-30 19:03:16 +03:00
Merge Bloom filter bug fix from trunk into the right-join branch.
FossilOrigin-Name: 72131ad1bda3d087e59cd4a51d87f10f65a55e658645397e1ede15f9fb1f5143
This commit is contained in:
16
manifest
16
manifest
@ -1,5 +1,5 @@
|
|||||||
C Fix\sa\stypo\sin\sa\scomment.
|
C Merge\sBloom\sfilter\sbug\sfix\sfrom\strunk\sinto\sthe\sright-join\sbranch.
|
||||||
D 2022-05-03T16:18:25.563
|
D 2022-05-03T16:26:50.091
|
||||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||||
@ -625,7 +625,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937
|
|||||||
F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
|
F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
|
||||||
F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
|
F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23
|
||||||
F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
|
F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3
|
||||||
F src/vdbe.c 9527ab7f71c5b0291e5ed7727f213f4d7f6e0a82af019da5b365fd5a0f56bb96
|
F src/vdbe.c a6a20956fa128c0b8d3c5592a9a3db890a46cf626f46ffee0cab2ac5bf8d04b2
|
||||||
F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
|
F src/vdbe.h 07641758ca8b4f4c6d81ea667ea167c541e6ece21f5574da11e3d21ec37e2662
|
||||||
F src/vdbeInt.h ef43f7fdc5fde29fc3fd29c506c12830f366178fdb4edbbf0cbc3dfbd1278b5f
|
F src/vdbeInt.h ef43f7fdc5fde29fc3fd29c506c12830f366178fdb4edbbf0cbc3dfbd1278b5f
|
||||||
F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
|
F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217
|
||||||
@ -642,7 +642,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
|
|||||||
F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
|
F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
|
||||||
F src/where.c eb86c068e8e24a1e0a650beb20573bd5648fe1584f11d5bdffaf17ec3de52b5d
|
F src/where.c eb86c068e8e24a1e0a650beb20573bd5648fe1584f11d5bdffaf17ec3de52b5d
|
||||||
F src/whereInt.h 4db5a877a9d1f38b5c928c1c84297c07f30b9a3bc1f5f66214cf1a8ef90a0556
|
F src/whereInt.h 4db5a877a9d1f38b5c928c1c84297c07f30b9a3bc1f5f66214cf1a8ef90a0556
|
||||||
F src/wherecode.c dfc3fbb6b7cb14a5a8e022d22f4d2c6004807e458a7cd8278194fbef7c1670e1
|
F src/wherecode.c cd9da760d391a51013f9ab8bc8ca7ad67f3b96e4857efe0d1dd85f538b3494a6
|
||||||
F src/whereexpr.c e036477ac8424de50ae5b36a71103405d3f86b33ba11125ec7a2a99d501b0622
|
F src/whereexpr.c e036477ac8424de50ae5b36a71103405d3f86b33ba11125ec7a2a99d501b0622
|
||||||
F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
|
F src/window.c fff1b51757438c664e471d5184634e48dcdf8ea34b640f3b1b0810b1e06de18c
|
||||||
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
|
F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
|
||||||
@ -1145,7 +1145,7 @@ F test/join.test e5f165dfd84fd46406ddae6614b0122c3bfa23a26ef62966442e1503c40d96a
|
|||||||
F test/join2.test 466b07233820f5deee66a6c3bf6e4500c8bbf7b83649e67606f5f649c07928c0
|
F test/join2.test 466b07233820f5deee66a6c3bf6e4500c8bbf7b83649e67606f5f649c07928c0
|
||||||
F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
|
F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
|
||||||
F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
|
F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
|
||||||
F test/join5.test c4df54e2e204d7f1417bfbdd21ca324b4b07415c647595cc47798eacfddc96d3
|
F test/join5.test d22b6cba8fb59ab3f1c82701434c360705eb12d4ce200c449f37b018fc47681a
|
||||||
F test/join6.test f809c025fa253f9e150c0e9afd4cef8813257bceeb6f46e04041228c9403cc2c
|
F test/join6.test f809c025fa253f9e150c0e9afd4cef8813257bceeb6f46e04041228c9403cc2c
|
||||||
F test/join7.test 8e72de4b45e5e930d18c305c7efe86015fb2552731e4e03ea226353036b0dab0
|
F test/join7.test 8e72de4b45e5e930d18c305c7efe86015fb2552731e4e03ea226353036b0dab0
|
||||||
F test/join8.test 9a4b2f53d5358abb29e6356e357c0cd40f4d8f282589300dcb76728dce050b51
|
F test/join8.test 9a4b2f53d5358abb29e6356e357c0cd40f4d8f282589300dcb76728dce050b51
|
||||||
@ -1952,8 +1952,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
|
|||||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||||
P 5341d4bbe9a943f9cdbbdea829e18f108e98972ebb706396c50fc62fcc6a6328
|
P c19c3c48698bf2543d775411c62d01e629791e2f3c5317970fdbb830eacafac6 6eda9b1a7784cf6d58c8876551f67ab98e78a08e726a0579d4def5ba881985bb
|
||||||
R 57e92245f83a453fc0fb383304aceb64
|
R 2d89cb1e36090ec16d6f7a3a0d57b198
|
||||||
U drh
|
U drh
|
||||||
Z acf0fb1e4a92d1326c45eaf045dbeceb
|
Z bc3c00e875924c9bd573570421780b97
|
||||||
# Remove this line to create a well-formed Fossil manifest.
|
# Remove this line to create a well-formed Fossil manifest.
|
||||||
|
@ -1 +1 @@
|
|||||||
c19c3c48698bf2543d775411c62d01e629791e2f3c5317970fdbb830eacafac6
|
72131ad1bda3d087e59cd4a51d87f10f65a55e658645397e1ede15f9fb1f5143
|
@ -1043,6 +1043,8 @@ case OP_InitCoroutine: { /* jump */
|
|||||||
/* Most jump operations do a goto to this spot in order to update
|
/* Most jump operations do a goto to this spot in order to update
|
||||||
** the pOp pointer. */
|
** the pOp pointer. */
|
||||||
jump_to_p2:
|
jump_to_p2:
|
||||||
|
assert( pOp->p2>0 ); /* There are never any jumps to instruction 0 */
|
||||||
|
assert( pOp->p2<p->nOp ); /* Jumps must be in range */
|
||||||
pOp = &aOp[pOp->p2 - 1];
|
pOp = &aOp[pOp->p2 - 1];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1412,6 +1412,8 @@ static SQLITE_NOINLINE void filterPullDown(
|
|||||||
/* ,--- Because sqlite3ConstructBloomFilter() has will not have set
|
/* ,--- Because sqlite3ConstructBloomFilter() has will not have set
|
||||||
** vvvvv--' pLevel->regFilter if this were true. */
|
** vvvvv--' pLevel->regFilter if this were true. */
|
||||||
if( NEVER(pLoop->prereq & notReady) ) continue;
|
if( NEVER(pLoop->prereq & notReady) ) continue;
|
||||||
|
assert( pLevel->addrBrk==0 );
|
||||||
|
pLevel->addrBrk = addrNxt;
|
||||||
if( pLoop->wsFlags & WHERE_IPK ){
|
if( pLoop->wsFlags & WHERE_IPK ){
|
||||||
WhereTerm *pTerm = pLoop->aLTerm[0];
|
WhereTerm *pTerm = pLoop->aLTerm[0];
|
||||||
int regRowid;
|
int regRowid;
|
||||||
@ -1438,6 +1440,7 @@ static SQLITE_NOINLINE void filterPullDown(
|
|||||||
VdbeCoverage(pParse->pVdbe);
|
VdbeCoverage(pParse->pVdbe);
|
||||||
}
|
}
|
||||||
pLevel->regFilter = 0;
|
pLevel->regFilter = 0;
|
||||||
|
pLevel->addrBrk = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -393,6 +393,38 @@ do_execsql_test 11.4 {
|
|||||||
SELECT count(*) FROM t1 LEFT JOIN t2 ON c=b WHERE d>=300;
|
SELECT count(*) FROM t1 LEFT JOIN t2 ON c=b WHERE d>=300;
|
||||||
} {2}
|
} {2}
|
||||||
|
|
||||||
|
# 2022-05-03 https://sqlite.org/forum/forumpost/2482b32700384a0f
|
||||||
|
# Bloom-filter pull-down does not handle NOT NULL constraints correctly.
|
||||||
|
#
|
||||||
|
reset_db
|
||||||
|
do_execsql_test 12.1 {
|
||||||
|
CREATE TABLE t1(a INT, b INT, c INT);
|
||||||
|
WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM c WHERE x<100)
|
||||||
|
INSERT INTO t1(a,b,c) SELECT x, x*1000, x*1000000 FROM c;
|
||||||
|
CREATE TABLE t2(b INT, x INT);
|
||||||
|
INSERT INTO t2(b,x) SELECT b, a FROM t1 WHERE a%3==0;
|
||||||
|
CREATE INDEX t2b ON t2(b);
|
||||||
|
CREATE TABLE t3(c INT, y INT);
|
||||||
|
INSERT INTO t3(c,y) SELECT c, a FROM t1 WHERE a%4==0;
|
||||||
|
CREATE INDEX t3c ON t3(c);
|
||||||
|
INSERT INTO t1(a,b,c) VALUES(200, 200000, NULL);
|
||||||
|
ANALYZE;
|
||||||
|
} {}
|
||||||
|
do_execsql_test 12.2 {
|
||||||
|
SELECT * FROM t1 NATURAL JOIN t2 NATURAL JOIN t3 WHERE x>0 AND y>0
|
||||||
|
ORDER BY +a;
|
||||||
|
} {
|
||||||
|
12 12000 12000000 12 12
|
||||||
|
24 24000 24000000 24 24
|
||||||
|
36 36000 36000000 36 36
|
||||||
|
48 48000 48000000 48 48
|
||||||
|
60 60000 60000000 60 60
|
||||||
|
72 72000 72000000 72 72
|
||||||
|
84 84000 84000000 84 84
|
||||||
|
96 96000 96000000 96 96
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
finish_test
|
finish_test
|
||||||
|
Reference in New Issue
Block a user