This is another alternative fix to the covering index on WHERE_MULTI_OR in

a LEFT JOIN problem that is fixed on trunk nearby.  In this alternative,
covering indexes are simply disabled for WHERE_MULTI_OR on a LEFT JOIN.
This might have run-time impact on some obscure queries.  This patch is
saved for historical reference only.

FossilOrigin-Name: 668564100ecc55fbf042a78de467a4719c593b41de3ff66595978c53fa4c8ab5

diff --git a/manifest b/manifest
index 9a44b2b29fcc4d5c29e2a6e4f76999ffe9328cc3..5ab594eb9d76b1756e4500552ddf982a9af7cf1c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\ssqlite3_changes64()\sand\ssqlite3_total_changes64()\sAPI\sfunctions.
-D 2021-06-22T18:32:05.878
+C This\sis\sanother\salternative\sfix\sto\sthe\scovering\sindex\son\sWHERE_MULTI_OR\sin\na\sLEFT\sJOIN\sproblem\sthat\sis\sfixed\son\strunk\snearby.\s\sIn\sthis\salternative,\ncovering\sindexes\sare\ssimply\sdisabled\sfor\sWHERE_MULTI_OR\son\sa\sLEFT\sJOIN.\nThis\smight\shave\srun-time\simpact\son\ssome\sobscure\squeries.\s\sThis\spatch\sis\nsaved\sfor\shistorical\sreference\sonly.
+D 2021-06-22T23:30:06.516
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -633,7 +633,7 @@ F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c 7342becedf3f8a26f9817f08436bdf8b56ad69af83705f6b9320a0ad3092c2ac
 F src/where.c 4caf843825c6292440113258fefaa6f747fd570c6915628957e42e39529988f5
 F src/whereInt.h 9248161dd004f625ce5d3841ca9b99fed3fc8d61522cf76340fc5217dbe1375b
-F src/wherecode.c 9f1f65d11437b25cd0a1497a170514c785f19ce6ad9d3e6fc73719cb5a49012f
+F src/wherecode.c d2199da96f191487978eaa70567b3f226444513ece7f923eaf21b917b1e2e194
 F src/whereexpr.c 5a9c9f5d2dac4bcdcaae3035034b4667523f731df228e0bb1d4efc669efa9da5
 F src/window.c a6d624d83b2d5b3cfb82bb437a2fbae759c928d47dc9ad1338a9419269181bb2
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1919,7 +1919,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P f662ff4746aaa43e63e20710b8cbfeeceab3183e953ac1685c41846d2e9d124c
-R d7ab321cd3717ae98c57b82526dde848
-U dan
-Z 21b9ccfdea30ed9e9c32e68e5722010b
+P 48fdec22c966003f5577e0bf52906ef90df11e4e395723a646304e67ed976f37
+R 2fbe8535df5009cfcb361787e13ca954
+T *branch * multi-or-covidx-fix3
+T *sym-multi-or-covidx-fix3 *
+T +closed *
+T -sym-trunk *
+U drh
+Z 2e59fb54822b38aaf7a22a0d99f2706c

diff --git a/manifest.uuid b/manifest.uuid
index a38d5368183e3ca2648ab25d2b6b9eca2b7de56c..b0874711e59e295ad9436fed5aa3e99fd698f4ff 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-48fdec22c966003f5577e0bf52906ef90df11e4e395723a646304e67ed976f37
\ No newline at end of file
+668564100ecc55fbf042a78de467a4719c593b41de3ff66595978c53fa4c8ab5
\ No newline at end of file

diff --git a/src/wherecode.c b/src/wherecode.c
index 84fa1a14108e8c7cb37f38f44e25e36579f1a33e..d3fcc68a56a8a8b76716dd9f6b4246e1a48af6e0 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -2296,6 +2296,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
           if( (pSubLoop->wsFlags & WHERE_INDEXED)!=0
            && (ii==0 || pSubLoop->u.btree.pIndex==pCov)
            && (HasRowid(pTab) || !IsPrimaryKeyIndex(pSubLoop->u.btree.pIndex))
+           && pLevel->iLeftJoin==0
           ){
             assert( pSubWInfo->a[0].iIdxCur==iCovCur );
             pCov = pSubLoop->u.btree.pIndex;