]> git.ipfire.org Git - thirdparty/sqlite.git/commitdiff
Do try to evaluate the Bloom filter on a LEFT JOIN early, as doing so
authordrh <>
Fri, 4 Mar 2022 20:54:09 +0000 (20:54 +0000)
committerdrh <>
Fri, 4 Mar 2022 20:54:09 +0000 (20:54 +0000)
essentially converts it into an INNER JOIN.  See
[forum:/forumpost/544af7eee2|forum thread 544af7eee2].

FossilOrigin-Name: d46d0e67c96bd49add4f71194496804a31209f2027a2e48eaf36dde26c1ca7df

manifest
manifest.uuid
src/where.c

index d67961edefbe58ddfc1cee7dd9498565e3453b1c..42daecdadea606c2f0a2f89b32495735f59100e3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\ssetting\san\ssqlite3_value\sobject\sto\sa\spointer\svalue,\smake\ssure\sany\sprior\nmemory\sallocations\sassociated\swith\sthat\sobject\shave\sbeen\scleared\sfirst.\ndbsqlfuzz\s33f842d1a09afaad5f078c3e1162a54b78e5f2ab.
-D 2022-03-04T16:28:24.220
+C Do\stry\sto\sevaluate\sthe\sBloom\sfilter\son\sa\sLEFT\sJOIN\searly,\sas\sdoing\sso\nessentially\sconverts\sit\sinto\san\sINNER\sJOIN.\s\sSee\n[forum:/forumpost/544af7eee2|forum\sthread\s544af7eee2].
+D 2022-03-04T20:54:09.487
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -639,7 +639,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b9df133a705093da8977da5eb202eaadb844839f1c7297c08d33471f5491843d
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c f890a3298418d7cba3b69b8803594fdc484ea241206a8dfa99db6dd36f8cbb3b
-F src/where.c 0d75d7514764726409ea945520fe9fb515e7d9ae52a5a3c0a136142cfaa19087
+F src/where.c 1471be86b34b8ce328c6c68d7e2ee667c7f801ddf83ff179bc5936700cf43aa7
 F src/whereInt.h 15d2975c3b4c193c78c26674400a840da8647fe1777ae3b026e2d15937b38a03
 F src/wherecode.c e0f6be39a0938008a20f1b1a528225f2364c459e88603799c417247a4ea3836c
 F src/whereexpr.c 2a71f5491798460c9590317329234d332d9eb1717cba4f3403122189a75c465e
@@ -1944,8 +1944,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d71fb6fdc32d2fce73059b6ab86d7d7bbc812c637469755dd45b6794aadc3a80
-R 65843abfd17a21a032904c45a4211684
+P 31e1bde4b20bec4242b4101adad29bfa85648ea703d6e8c5c75e8c49b54a3a0f
+R ad552847ccd96e978367f3230e28420d
 U drh
-Z 30a89616aec618962c425515c30f7a87
+Z ad96c30e3eedda5fc4e20235f373b88a
 # Remove this line to create a well-formed Fossil manifest.
index 70d5b1929a0a192d01b8723ef7f8f256c2ba44f5..3417925d68fda456ec2c388e08bb3fc202d0dac5 100644 (file)
@@ -1 +1 @@
-31e1bde4b20bec4242b4101adad29bfa85648ea703d6e8c5c75e8c49b54a3a0f
\ No newline at end of file
+d46d0e67c96bd49add4f71194496804a31209f2027a2e48eaf36dde26c1ca7df
\ No newline at end of file
index c1a2f0595e0e209a04a3af59394c22a9fd215d40..ddec44723fd8d930ea9d6722cc0ecb93151332ca 100644 (file)
@@ -1078,7 +1078,10 @@ static SQLITE_NOINLINE void sqlite3ConstructBloomFilter(
     pLoop->wsFlags &= ~WHERE_BLOOMFILTER;
     if( OptimizationDisabled(pParse->db, SQLITE_BloomPulldown) ) break;
     while( ++iLevel < pWInfo->nLevel ){
+      const SrcItem *pTabItem;
       pLevel = &pWInfo->a[iLevel];
+      pTabItem = &pWInfo->pTabList->a[pLevel->iFrom];
+      if( pTabItem->fg.jointype & JT_LEFT ) continue;
       pLoop = pLevel->pWLoop;
       if( NEVER(pLoop==0) ) continue;
       if( pLoop->prereq & notReady ) continue;