From: drh Date: Mon, 10 Sep 2018 14:43:15 +0000 (+0000) Subject: New testcase() macros on virtual table xBestIndex logic. X-Git-Tag: version-3.25.0~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=473dc7347e4e65eecc1dd6d4896427c4bb3296e0;p=thirdparty%2Fsqlite.git New testcase() macros on virtual table xBestIndex logic. FossilOrigin-Name: 3bbd9c5f2f1990f7d187951474a86996650dcede12c2608484d43250ae0b30d6 --- diff --git a/manifest b/manifest index 7cace8ddff..13f8642c87 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\sLIKE\soptimization\sso\sthat\sit\sis\sdisabled\swhen\sthe\sLHS\sof\sthe\nexpression\sdoes\snot\shave\sTEXT\saffinity\sand\sthe\sRHS\sis\sthe\spattern\s'/%'\nor\sthe\sRHS\sbegins\swith\sthe\sescape\scharacter.\sFix\sfor\sticket\n[c94369cae9b561b1f996d0054b]. -D 2018-09-10T12:40:57.241 +C New\stestcase()\smacros\son\svirtual\stable\sxBestIndex\slogic. +D 2018-09-10T14:43:15.694 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 6b650013511fd9d8b094203ac268af9220d292cc7d4e1bc9fbca15aacd8c7995 @@ -586,7 +586,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/wal.c df50883d93689d009be5ad9bdc4e53a4ee45fcc291087ec9272569d00b360791 F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a F src/walker.c ba7225773931760cf60bf22f34d0cce2588df7ce5ce0f215a52eb88234b55ac4 -F src/where.c 071572677469d54899ef0d9fc3ad380a849b860375df5af5ebdc4f49f1dc20cc +F src/where.c 2019126801437944c38cc62a99491e98591460b7cc07ab57eb66165f710a289b F src/whereInt.h b90ef9b9707ef750eab2a7a080c48fb4900315033274689def32d0cf5a81ebe4 F src/wherecode.c 2b6cd1b27736cc803060289e04ecf9849976106f4077aa67d1a2c0e3ec420159 F src/whereexpr.c eb462ebe085f6cbb6bdda797a041fbd7e3724586203344043d1088a2117d8e44 @@ -1765,7 +1765,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 83da4d4104ee1870a2a95bb5fa15ee6584c655d8b314b6b8ab97592dad4ee811 -R 535b9d3fa97af3ca58d7939267f6f9d0 +P f191431d63aba187000b5cbaf3e072ff5f1b1eef6a2a407fb4d1629bda4e4e8f +R 66b88becb6ebd76c87c00586dc09fef7 U drh -Z 4f900079726ee27aee5deedbf4c96ffb +Z 59afcf7d6ee429bab5b2db8d3de75edb diff --git a/manifest.uuid b/manifest.uuid index 09c56b72f6..5406d80110 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f191431d63aba187000b5cbaf3e072ff5f1b1eef6a2a407fb4d1629bda4e4e8f \ No newline at end of file +3bbd9c5f2f1990f7d187951474a86996650dcede12c2608484d43250ae0b30d6 \ No newline at end of file diff --git a/src/where.c b/src/where.c index 61c671ac21..d8d577d521 100644 --- a/src/where.c +++ b/src/where.c @@ -976,6 +976,8 @@ static sqlite3_index_info *allocateIndexInfo( ** as: ** ** "LEFT JOIN vtab WHERE vtab.col IS NULL" */ + testcase( pTerm->eOperator & WO_ISNULL ); + testcase( pTerm->eOperator & WO_IS ); continue; } assert( pTerm->u.leftColumn>=(-1) );