Optimizations to the new EQP framework.

FossilOrigin-Name: 956fef361a795bd081d8e23ce4075dc8aafcee63ab7275d13b657b529d185b30

diff --git a/manifest b/manifest
index a51339acd35a69fc9a050377c73ea63be8c87790..c007b732379288ea6a7760e4ab34885ae16a7d00 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\sEXPLAIN\sQUERY\sPLAN\sto\sreport\sthe\sgeneration\sof\sconstant\srows\susing\nVALUES\sor\sjust\sa\sSELECT\swithout\sFROM.
-D 2018-05-03T01:37:13.698
+C Optimizations\sto\sthe\snew\sEQP\sframework.
+D 2018-05-03T19:47:14.896
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@ -445,7 +445,7 @@ F src/date.c ebe1dc7c8a347117bb02570f1a931c62dd78f4a2b1b516f4837d45b7d6426957
 F src/dbpage.c 8db4c97f630e7d83f884ea75caf1ffd0988c160e9d530194d93721c80821e0f6
 F src/dbstat.c edabb82611143727511a45ca0859b8cd037851ebe756ae3db289859dd18b6f91
 F src/delete.c b0f90749e22d5e41a12dbf940f4811138cf97da54b46b737089b93eb64a2896f
-F src/expr.c 1757b6896ac542df8a90c0e00badc752abd90e04a852b7a947e33e94ee1fb46d
+F src/expr.c af4a81a385277510bfc56df87c25d76fc365f98c33bc8797c4a8d84b88e31013
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c d617daf66b5515e2b42c1405b2b4984c30ca50fb705ab164271a9bf66c69e331
 F src/func.c 94f42cba2cc1c34aeaa441022ba0170ec3fec4bba54db4e0ded085c6dc0fdc51
@@ -493,12 +493,12 @@ F src/printf.c d3b7844ddeb11fbbdd38dd84d09c9c1ac171d21fb038473c3aa97981201cc660
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 6415381a0e9d22c0e7cba33ca4a53f81474190862f5d4838190f5eb5b0b47bc9
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
-F src/select.c e612d71bc58cad38f06c9ebb9e71fa2a9f643d5775f220388b7ba17df5fe21e3
+F src/select.c 75ae3000bef42ea6a7271cf49f6bc5e94bdbf73026ddea251f2a8b6cf14960fd
 F src/shell.c.in 29309f2ab656c8817fbc3b7910b9af8464557b91cba75277a03669399c8e2730
 F src/sqlite.h.in d669de545f18f2f01362de02e309cd7f15185958c71bac8f53cd5438b46d2bea
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
-F src/sqliteInt.h 4095263176d49601f27086b7e66ca541923b72a909187923e3b45e60511cfe2a
+F src/sqliteInt.h 7fbd839f07d873a877375138f2681453232e2e2de8f48be65888e295cd05ced3
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -556,7 +556,7 @@ F src/test_windirent.h 90dfbe95442c9762357fe128dc7ae3dc199d006de93eb33ba3972e0a9
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c bbde32eac9eb1280f5292bcdfef66f5a57e43176cbf9347e0efab9f75e133f97
-F src/treeview.c 6cea286ca9af8b126dae9714799265353387244eba0d451c3cc2cd60946cc4c7
+F src/treeview.c 06dd506b1dcef01c5882a4189bc79afe2660dd992702f81cd7d003425a99cfbc
 F src/trigger.c 4ace6d1d5ba9a89822deb287317f33c810440526eafe185c2d8a48c31df1e995
 F src/update.c 5be2f501ddc704fc04183bdb28b25eab930bb8553d973429a089ec94fa85cf2b
 F src/upsert.c ae4a4823b45c4daf87e8aea8c0f582a8844763271f5ed54ee5956c4c612734f4
@@ -564,7 +564,7 @@ F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
 F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
 F src/vacuum.c 762ee9bbf8733d87d8cd06f58d950e881982e416f8c767334a40ffd341b6bff5
 F src/vdbe.c 066a4e1de2ed83e253adfd2e97a684cf562eaa41d31ee7f3d3e4c8aea4485a55
-F src/vdbe.h dc29bf94721964da367debfc4472f5546e910b26f66850a8936ae4db174699d8
+F src/vdbe.h d970d9738efdd09cb2df73e3a40856e7df13e88a3486789c49fcdd322c9eb8a2
 F src/vdbeInt.h 95f7adfdc5c8f1353321f55a6c5ec00a90877e3b85af5159e393afb41ff54110
 F src/vdbeapi.c 29d2baf9c1233131ec467d7bed1b7c8a03c27579048d768c4b04acf427838858
 F src/vdbeaux.c 58129ae46be079613df5c2c3714d80a78605415bfa10c9528634c7c2d2147727
@@ -1727,7 +1727,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 dab5e5294813891469660cceb211ac1a1e526715bb57dcdbb1ab90321e6a4dad
-R 53c64522178e60b44f774331a15b70e5
+P c75eee69fa8a9b56ee58a4cc539e80cc982f43390dc3a357344d58479dd89a41
+R ba11e840f6b4dabe2ff8e2cc2c44e56d
 U drh
-Z 33f2e8b7048beb839b528a03308b5edb
+Z 9f22c447b8f96bef0e022f4dc0cb4f93

diff --git a/manifest.uuid b/manifest.uuid
index 4dc52e5fa5a831ea1d4db5679f806cae476030e9..e64df66110bd579a8e7e79f943dc664c0afb373a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c75eee69fa8a9b56ee58a4cc539e80cc982f43390dc3a357344d58479dd89a41
\ No newline at end of file
+956fef361a795bd081d8e23ce4075dc8aafcee63ab7275d13b657b529d185b30
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index f2f1a86105b359f2fc7ebf8c5526ac2a34271ee2..6aff83a256a494fc57e53dc0370b285d14fa32bb 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -2646,7 +2646,6 @@ int sqlite3CodeSubselect(
         ExplainQueryPlan((pParse, 1, "%sLIST SUBQUERY",
             jmpIfDynamic>=0?"":"CORRELATED "
         ));
-        ExplainQueryPlanSetId(pParse, pSelect);
         assert( !isRowid );
         /* If the LHS and RHS of the IN operator do not match, that
         ** error will have been caught long before we reach this point. */
@@ -2770,7 +2769,6 @@ int sqlite3CodeSubselect(
       pSel = pExpr->x.pSelect;
       ExplainQueryPlan((pParse, 1, "%sSCALAR SUBQUERY",
             jmpIfDynamic>=0?"":"CORRELATED "));
-      ExplainQueryPlanSetId(pParse, pSel);
       nReg = pExpr->op==TK_SELECT ? pSel->pEList->nExpr : 1;
       sqlite3SelectDestInit(&dest, 0, pParse->nMem+1);
       pParse->nMem += nReg;

diff --git a/src/select.c b/src/select.c
index 14e485b2b3ac13f9abaf0a86185163d178dac621..065cdf7519006d42fb6e132c0aa6eb0a6c09b16e 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -147,9 +147,6 @@ Select *sqlite3SelectNew(
   pNew->iOffset = 0;
 #if SELECTTRACE_ENABLED
   pNew->zSelName[0] = 0;
-#endif
-#if SELECTTRACE_ENABLED || !defined(SQLITE_OMIT_EXPLAIN)
-  pNew->iSelectId = 0;
 #endif
   pNew->addrOpenEphm[0] = -1;
   pNew->addrOpenEphm[1] = -1;
@@ -2291,7 +2288,6 @@ static void generateWithRecursiveQuery(
   /* Store the results of the setup-query in Queue. */
   pSetup->pNext = 0;
   ExplainQueryPlan((pParse, 1, "SETUP"));
-  ExplainQueryPlanSetId(pParse, pSetup);
   rc = sqlite3Select(pParse, pSetup, &destQueue);
   pSetup->pNext = p;
   if( rc ) goto end_of_recursive_query;
@@ -2327,7 +2323,6 @@ static void generateWithRecursiveQuery(
   }else{
     p->pPrior = 0;
     ExplainQueryPlan((pParse, 1, "RECURSIVE STEP"));
-    ExplainQueryPlanSetId(pParse, p);
     sqlite3Select(pParse, p, &destQueue);
     assert( p->pPrior==0 );
     p->pPrior = pSetup;
@@ -2492,12 +2487,9 @@ static int multiSelect(
   }else{
 
 #ifndef SQLITE_OMIT_EXPLAIN
-    if( p->pNext==0 ){
-      ExplainQueryPlan((pParse, 1, "COMPOUND QUERY"));
-    }
     if( pPrior->pPrior==0 ){
+      ExplainQueryPlan((pParse, 1, "COMPOUND QUERY"));
       ExplainQueryPlan((pParse, 1, "LEFT-MOST SUBQUERY"));
-      ExplainQueryPlanSetId(pParse, pPrior);
     }
 #endif
 
@@ -2528,7 +2520,6 @@ static int multiSelect(
           }
         }
         ExplainQueryPlan((pParse, 1, "UNION ALL"));
-        ExplainQueryPlanSetId(pParse, p);
         rc = sqlite3Select(pParse, p, &dest);
         testcase( rc!=SQLITE_OK );
         pDelete = p->pPrior;
@@ -2599,7 +2590,6 @@ static int multiSelect(
         uniondest.eDest = op;
         ExplainQueryPlan((pParse, 1, "%s USING TEMP B-TREE",
                           selectOpName(p->op)));
-        ExplainQueryPlanSetId(pParse, p);
         rc = sqlite3Select(pParse, p, &uniondest);
         testcase( rc!=SQLITE_OK );
         /* Query flattening in sqlite3Select() might refill p->pOrderBy.
@@ -2678,7 +2668,6 @@ static int multiSelect(
         intersectdest.iSDParm = tab2;
         ExplainQueryPlan((pParse, 1, "%s USING TEMP B-TREE",
                           selectOpName(p->op)));
-        ExplainQueryPlanSetId(pParse, p);
         rc = sqlite3Select(pParse, p, &intersectdest);
         testcase( rc!=SQLITE_OK );
         pDelete = p->pPrior;
@@ -3186,7 +3175,6 @@ static int multiSelectOrderBy(
   VdbeComment((v, "left SELECT"));
   pPrior->iLimit = regLimitA;
   ExplainQueryPlan((pParse, 1, "LEFT"));
-  ExplainQueryPlanSetId(pParse, pPrior);
   sqlite3Select(pParse, pPrior, &destA);
   sqlite3VdbeEndCoroutine(v, regAddrA);
   sqlite3VdbeJumpHere(v, addr1);
@@ -3202,7 +3190,6 @@ static int multiSelectOrderBy(
   p->iLimit = regLimitB;
   p->iOffset = 0;  
   ExplainQueryPlan((pParse, 1, "RIGHT"));
-  ExplainQueryPlanSetId(pParse, p);
   sqlite3Select(pParse, p, &destB);
   p->iLimit = savedLimit;
   p->iOffset = savedOffset;
@@ -5575,7 +5562,6 @@ int sqlite3Select(
       pItem->addrFillSub = addrTop;
       sqlite3SelectDestInit(&dest, SRT_Coroutine, pItem->regReturn);
       ExplainQueryPlan((pParse, 1, "CO-ROUTINE 0x%p", pSub));
-      ExplainQueryPlanSetId(pParse, pSub);
       sqlite3Select(pParse, pSub, &dest);
       pItem->pTab->nRowLogEst = pSub->nSelectRow;
       pItem->fg.viaCoroutine = 1;
@@ -5615,7 +5601,6 @@ int sqlite3Select(
       }else{
         sqlite3SelectDestInit(&dest, SRT_EphemTab, pItem->iCursor);
         ExplainQueryPlan((pParse, 1, "MATERIALIZE 0x%p", pSub));
-        ExplainQueryPlanSetId(pParse,pSub);
         sqlite3Select(pParse, pSub, &dest);
       }
       pItem->pTab->nRowLogEst = pSub->nSelectRow;

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 74a08c030888f00c3f68e56eeb898e50a65471ac..751174d6f483cd043743875d1ed931041f56c8fd 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -2780,9 +2780,6 @@ struct Select {
   int iLimit, iOffset;   /* Memory registers holding LIMIT & OFFSET counters */
 #if SELECTTRACE_ENABLED
   char zSelName[12];     /* Symbolic name of this SELECT use for debugging */
-#endif
-#if defined(SQLITETRACE_ENABLED) || !defined(SQLITE_OMIT_EXPLAIN)
-  u32 iSelectId;         /* EXPLAIN QUERY PLAN select ID */
 #endif
   int addrOpenEphm[2];   /* OP_OpenEphem opcodes related to this select */
   SrcList *pSrc;         /* The FROM clause */

diff --git a/src/treeview.c b/src/treeview.c
index 51fa7f06ca9ba9f3f2c63694033cd9aef64b8411..562743e9d815b928c94d7852781857f0186c6bd2 100644 (file)
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -141,10 +141,10 @@ void sqlite3TreeViewSelect(TreeView *pView, const Select *p, u8 moreToFollow){
   do{
 #if SELECTTRACE_ENABLED
     sqlite3TreeViewLine(pView,
-      "SELECT%s%s (%s/%d/%p) selFlags=0x%x nSelectRow=%d",
+      "SELECT%s%s (%s/%p) selFlags=0x%x nSelectRow=%d",
       ((p->selFlags & SF_Distinct) ? " DISTINCT" : ""),
       ((p->selFlags & SF_Aggregate) ? " agg_flag" : ""),
-      p->zSelName, p->iSelectId, p, p->selFlags,
+      p->zSelName, p, p->selFlags,
       (int)p->nSelectRow
     );
 #else

diff --git a/src/vdbe.h b/src/vdbe.h
index b7f44ca9138058fc30960938fd5f25555edf0cbe..3177570a012cea02d0790a3a7fb31c004f3e6d50 100644 (file)
--- a/src/vdbe.h
+++ b/src/vdbe.h
@@ -205,12 +205,10 @@ VdbeOp *sqlite3VdbeAddOpList(Vdbe*, int nOp, VdbeOpList const *aOp,int iLineno);
 # define ExplainQueryPlan(P)        sqlite3VdbeExplain P
 # define ExplainQueryPlanPop(P)     sqlite3VdbeExplainPop(P)
 # define ExplainQueryPlanParent(P)  sqlite3VdbeExplainParent(P)
-# define ExplainQueryPlanSetId(P,S) (S)->iSelectId=(P)->addrExplain
 #else
 # define ExplainQueryPlan(P)
 # define ExplainQueryPlanPop(P)
 # define ExplainQueryPlanParent(P) 0
-# define ExplainQueryPlanSetId(P,S)
 #endif
 void sqlite3VdbeAddParseSchemaOp(Vdbe*,int,char*);
 void sqlite3VdbeChangeOpcode(Vdbe*, u32 addr, u8);