From: drh <drh@noemail.net>
Date: Fri, 26 Aug 2016 19:54:12 +0000 (+0000)
Subject: Add an EXPLAIN QUERY PLAN line for when a index is used to implement
X-Git-Tag: version-3.15.0~110^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=363fb95bc38825f49317532fe90241a172e1cf45;p=thirdparty%2Fsqlite.git

Add an EXPLAIN QUERY PLAN line for when a index is used to implement
an IN operator.

FossilOrigin-Name: 171aa833a2e1650c3d9cf9bd6438ae46f6c35871
---

diff --git a/manifest b/manifest
index 8bf9f54ae7..e112f421dc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stest\scases\sto\srowvalue2.test.
-D 2016-08-26T19:47:30.838
+C Add\san\sEXPLAIN\sQUERY\sPLAN\sline\sfor\swhen\sa\sindex\sis\sused\sto\simplement\nan\sIN\soperator.
+D 2016-08-26T19:54:12.433
 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@ -338,7 +338,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
 F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05
-F src/expr.c 192dac6da7ff380fde35861d3f9d40bab39fab2c
+F src/expr.c 935366a02ad0c33e7cd19ff382ef9bcdfa1aa7a9
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8
 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@@ -1521,7 +1521,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 4b589fbfcc4265902de0f552961d2df497a184da
-R 2639cfd9d35718211068678a56d30d2c
-U dan
-Z 1bf9a10eeccbff62da890e6c842f5df6
+P 078bb69e99891ba3b76a39ac974990714c43908f
+R 155df167db2a04d38d0a374ab683c0e3
+U drh
+Z d9ed9721b1e3c6348d8b59f53fc4268d
diff --git a/manifest.uuid b/manifest.uuid
index 54b588e6c5..5d43906475 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-078bb69e99891ba3b76a39ac974990714c43908f
\ No newline at end of file
+171aa833a2e1650c3d9cf9bd6438ae46f6c35871
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 3a5075719e..08b72fed80 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2229,6 +2229,11 @@ int sqlite3FindInIndex(
 
         if( i==nExpr ){
           int iAddr = sqlite3CodeOnce(pParse); VdbeCoverage(v);
+#ifndef SQLITE_OMIT_EXPLAIN
+          sqlite3VdbeAddOp4(v, OP_Explain, 0, 0, 0,
+            sqlite3MPrintf(db, "USING INDEX %s FOR IN-OPERATOR", pIdx->zName),
+            P4_DYNAMIC);
+#endif
           sqlite3VdbeAddOp3(v, OP_OpenRead, iTab, pIdx->tnum, iDb);
           sqlite3VdbeSetP4KeyInfo(pParse, pIdx);
           VdbeComment((v, "%s", pIdx->zName));