Remove a testcase() macro which is now unreachable due to the contraction of

the use of IN_INDEX_ROWID.

FossilOrigin-Name: 90c5a17cd526b256753f876e575f3e731d5e8b9dd6e196cf8d8f7306e099b91c

diff --git a/manifest b/manifest
index 83c7b99bb15f3862073f908dbf1d1882598a4495..d7d81d4706c49b7a9f6b3e0631976f5f1d74501a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sall\sephemeral\stables\sbuilt\sto\shold\sthe\sRHS\sof\san\sIN\soperator\sbe\nindex-btrees,\snever\stable-btrees,\sregardless\sof\swhether\sor\snot\sthey\sare\nused\sas\sIN_INDEX_LOOP\sor\sIN_INDEX_MEMBERSHIP.\s\sThat\sway,\sthe\ssame\sephmerial\ntable\scan\sbe\sreused\sfor\sboth\scases.
-D 2019-02-22T23:29:56.457
+C Remove\sa\stestcase()\smacro\swhich\sis\snow\sunreachable\sdue\sto\sthe\scontraction\sof\nthe\suse\sof\sIN_INDEX_ROWID.
+D 2019-02-23T00:08:09.169
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 178d8eb6840771149cee40b322d1b3be30d330198c522c903c1b66fb5a1bfca4
@@ -602,7 +602,7 @@ F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c 7607f1a68130c028255d8d56094ea602fc402c79e1e35a46e6282849d90d5fe4
 F src/where.c 8a207cb2ca6b99e1edb1e4bbff9b0504385a759cbf66180d1deb34d80ca4b799
 F src/whereInt.h 5f14db426ca46a83eabab1ae9aa6d4b8f27504ad35b64c290916289b1ddb2e88
-F src/wherecode.c cdeb7c7028dfcf1c473c5d91c4ae4e579a8d35337e0042788022063bb6db2a51
+F src/wherecode.c 061848646cc46a137d9038e47e666a955b3b2a1b458365eeed76b004c0053f3b
 F src/whereexpr.c 36b47f7261d6b6f1a72d774c113b74beddf6745aba1018e64b196e29db233442
 F src/window.c df2456386e0b1553a8d1fcf3a0ddc4c058fe2c650ea8c74b6bf8862082ddafc9
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1805,7 +1805,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 0d456456da6e25b20d9d27ca95f1013082bca52ee74ee9bf91732a9fa843ea45
-R 63e80740e79601900e62b0317140d8ef
+P c2d50df8fd1a1fdae6226a3e77296ded09b53a74540caedd4868e686a93cbc10
+R c922ba3f62286cb9bc5a2acd31d21a66
 U drh
-Z b87326ad069ad8da755635bc9cbd9517
+Z 4c57ce6adbcc41ffca57692643360ae6

diff --git a/manifest.uuid b/manifest.uuid
index 2e02e213eb9ecf0760959f411072c9c9cffc0ce9..2c4694a5fdebe9ec664b21871a39a0289e0272aa 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c2d50df8fd1a1fdae6226a3e77296ded09b53a74540caedd4868e686a93cbc10
\ No newline at end of file
+90c5a17cd526b256753f876e575f3e731d5e8b9dd6e196cf8d8f7306e099b91c
\ No newline at end of file

diff --git a/src/wherecode.c b/src/wherecode.c
index 4ca9c8853ba0ff3c809a6ac39513372f44056d6e..79189386b63ed10d1d7cf5a257a73ebe63f49e9b 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -582,7 +582,6 @@ static int codeEqualityTerm(
         if( pLoop->aLTerm[i]->pExpr==pX ){
           int iOut = iReg + i - iEq;
           if( eType==IN_INDEX_ROWID ){
-            testcase( nEq>1 );  /* Happens with a UNIQUE index on ROWID */
             pIn->addrInTop = sqlite3VdbeAddOp2(v, OP_Rowid, iTab, iOut);
           }else{
             int iCol = aiMap ? aiMap[iMap++] : 0;