From: drh <> Date: Wed, 4 Mar 2026 13:08:14 +0000 (+0000) Subject: Remove dead (commented-out) code that came to my attention because it X-Git-Tag: version-3.52.0~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f7f9ab007e4ad02ddb03dddbaa53ae000f7ec74;p=thirdparty%2Fsqlite.git Remove dead (commented-out) code that came to my attention because it ws nearby the fix of the previous check-in. FossilOrigin-Name: 61f8a28591a833b1f5834a347feefeba8414fecc7ff154f1b6ef19963f181812 --- diff --git a/manifest b/manifest index 6dcb09672c..c825abc294 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\scode-generator\sbug\sintroduced\sby\sthe\sUNION/INTERSECT/EXISTS\noptimization\sof\scheck-in\s[132ba781b031972c]\sand\sreported\sin\n[forum:/forumpost/2026-03-04T05:06:26Z|forum\spost\s2026-03-04T05:06:26Z]. -D 2026-03-04T13:02:08.305 +C Remove\sdead\s(commented-out)\scode\sthat\scame\sto\smy\sattention\sbecause\sit\nws\snearby\sthe\sfix\sof\sthe\sprevious\scheck-in. +D 2026-03-04T13:08:14.899 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -729,7 +729,7 @@ F src/printf.c 9cff219dba73b1aa9a8113e83e962f03f7bea8b6eb51cefb25bc468d5a69fb2d F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 -F src/select.c d739fb0ac7e632327b9fb4a1ac46629ec93f5e3438943df813f230f7822c56ab +F src/select.c ffe199f025a0dd74670d2a77232bdea364a4d7b36f32c64a6572d39ba6a11576 F src/shell.c.in 2acdfca982deb70cdfefb8b422822d4e0234fe4dde6ff2bd9020b26445853917 F src/sqlite.h.in 1f853f1d836af3e5a0b451521041d05658988a45f6978aaae08286e483fee5ac F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 @@ -2189,8 +2189,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 7168988acbec2d8d51106a263e553f8942b8b23d983dbbe5028e0f9be68cbb83 -R 919bab5ba9cb4a7afc21d24bdc3fa2c5 +P 6ba7797cac7dc873b62a12be5712511c9199b379342dac4a1887bfd65227a298 +R 7127c439ea41ec62f75cef8391656a07 U drh -Z 463d87a5025767bf46752b6593cc33c4 +Z 05c4a0745826c227013aa02b8d852b71 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 171b2c7c09..78bbfcdc32 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6ba7797cac7dc873b62a12be5712511c9199b379342dac4a1887bfd65227a298 +61f8a28591a833b1f5834a347feefeba8414fecc7ff154f1b6ef19963f181812 diff --git a/src/select.c b/src/select.c index 027c776911..e8e9f36a88 100644 --- a/src/select.c +++ b/src/select.c @@ -3251,20 +3251,6 @@ static int generateOutputSubroutine( r2 = sqlite3GetTempRange(pParse, nKey+2); r3 = r2+nKey+1; -#if 0 /* <-- Why the next block of code is commented out: (tag-20260125-a) - ** - ** If the destination is DistQueue, then cursor (iParm+1) is open - ** on a second ephemeral index that holds all values previously - ** added to the queue. This code only runs during the setup phase - ** using the merge algorithm, and so the values here are already - ** guaranteed to be unique. - */ - if( pDest->eDest==SRT_DistQueue ){ - addrTest = sqlite3VdbeAddOp4Int(v, OP_Found, iParm+1, 0, - pIn->iSdst, pIn->nSdst); - VdbeCoverage(v); - } -#endif sqlite3VdbeAddOp3(v, OP_MakeRecord, pIn->iSdst, pIn->nSdst, r3); if( pDest->eDest==SRT_DistQueue ){ sqlite3VdbeAddOp2(v, OP_IdxInsert, iParm+1, r3); @@ -3277,9 +3263,6 @@ static int generateOutputSubroutine( sqlite3VdbeAddOp2(v, OP_Sequence, iParm, r2+nKey); sqlite3VdbeAddOp3(v, OP_MakeRecord, r2, nKey+2, r1); sqlite3VdbeAddOp4Int(v, OP_IdxInsert, iParm, r1, r2, nKey+2); -#if 0 /* tag-20260125-a */ - if( addrTest ) sqlite3VdbeJumpHere(v, addrTest); -#endif sqlite3ReleaseTempReg(pParse, r1); sqlite3ReleaseTempRange(pParse, r2, nKey+2); break;