From: drh <> Date: Wed, 21 Dec 2022 12:18:06 +0000 (+0000) Subject: New WHERETRACE entries for adding and removing objects from the X-Git-Tag: version-3.41.0~213 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f0c36b327cfd244adb8d126008ebc6ac32dff1f;p=thirdparty%2Fsqlite.git New WHERETRACE entries for adding and removing objects from the Parse.pIdxEpr list as part of indexed expression coverage. Debug and testing changes only - no affect on production builds. FossilOrigin-Name: 4dc438a951bdbe27fbd5ee7cfb907e30ec0efbf8ce02109f18997cc221e0ad3b --- diff --git a/manifest b/manifest index ff460a11b1..14d314ede0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sabout\s150\snew\sfuzzer\scases\sto\stest/fuzzdata8.db. -D 2022-12-20T15:22:57.938 +C New\sWHERETRACE\sentries\sfor\sadding\sand\sremoving\sobjects\sfrom\sthe\nParse.pIdxEpr\slist\sas\spart\sof\sindexed\sexpression\scoverage.\s\sDebug\sand\ntesting\schanges\sonly\s-\sno\saffect\son\sproduction\sbuilds. +D 2022-12-21T12:18:06.316 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -732,7 +732,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 1425edc179cce7db5e7e9626b01716fed8498cc1f63875e96905d515e5e90bec +F src/where.c d0d8e3cb2c11e77ba0f8f9ed8eada9d84dbd377167cdcf387b8eeb824c35a3ad F src/whereInt.h e25203e5bfee149f5f1225ae0166cfb4f1e65490c998a024249e98bb0647377c F src/wherecode.c 76bca3379219880d2527493b71a3be49e696f75396d3481e4de5d4ceec7886b2 F src/whereexpr.c 05295b44b54eea76d1ba766f0908928d0e20e990c249344c9521454d3d09c7ae @@ -2067,8 +2067,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 01fa760212a40cec5b43da99b917ab6389561c96d0567a9f67f516bdfa8f5f3d -R fa9bba51594fa2fc3abce27a3b0536c5 +P a8d8d9cd65e64e0a492a80c00050f54ab75de82651230049f65c9d2b78a164f2 +R 4779e9bead65004dcfdba7c0db75c978 U drh -Z bd8bdcd36b98de3b4592eb957ac2aa6d +Z def99c871ddc1fe71104a717acd8dc15 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 4fe42332ee..168ad0051e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a8d8d9cd65e64e0a492a80c00050f54ab75de82651230049f65c9d2b78a164f2 \ No newline at end of file +4dc438a951bdbe27fbd5ee7cfb907e30ec0efbf8ce02109f18997cc221e0ad3b \ No newline at end of file diff --git a/src/where.c b/src/where.c index d3e04808f3..890c3bf52c 100644 --- a/src/where.c +++ b/src/where.c @@ -5678,6 +5678,12 @@ static SQLITE_NOINLINE void whereAddIndexedExpr( p = sqlite3DbMallocRaw(pParse->db, sizeof(IndexedExpr)); if( p==0 ) break; p->pIENext = pParse->pIdxEpr; +#ifdef WHERETRACE_ENABLED + if( sqlite3WhereTrace & 0x200 ){ + sqlite3DebugPrintf("New pParse->pIdxEpr term {%d,%d}\n", iIdxCur, i); + if( sqlite3WhereTrace & 0x5000 ) sqlite3ShowExpr(pExpr); + } +#endif p->pExpr = sqlite3ExprDup(pParse->db, pExpr, 0); p->iDataCur = pTabItem->iCursor; p->iIdxCur = iIdxCur; @@ -6640,6 +6646,13 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){ IndexedExpr *p = pParse->pIdxEpr; while( p ){ if( p->iIdxCur==pLevel->iIdxCur ){ +#ifdef WHERETRACE_ENABLED + if( sqlite3WhereTrace & 0x200 ){ + sqlite3DebugPrintf("Disable pParse->pIdxEpr term {%d,%d}\n", + p->iIdxCur, p->iIdxCol); + if( sqlite3WhereTrace & 0x5000 ) sqlite3ShowExpr(p->pExpr); + } +#endif p->iDataCur = -1; p->iIdxCur = -1; }