Further enhancements to the "wheretrace" debugging output.

FossilOrigin-Name: 670993eb8113f386cb2cb8b1507917f6da3b4d98

diff --git a/manifest b/manifest
index 1c128cf92ed8c2a523d74e1a00f84990224a454b..2a2a4b68ccc8400042773ff7244cfb185f50f432 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhanced\sdebug\soutput\sfor\sOR-logic\sin\sthe\squery\sloop\soptimizer.
-D 2014-09-30T14:14:19.732
+C Further\senhancements\sto\sthe\s"wheretrace"\sdebugging\soutput.
+D 2014-09-30T17:03:35.868
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -302,7 +302,7 @@ F src/vtab.c 019dbfd0406a7447c990e1f7bd1dfcdb8895697f
 F src/wal.c 10e7de7ce90865a68153f001a61f1d985cd17983
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804
-F src/where.c 1d22623f4cc01ad34f4660daae77826550033c58
+F src/where.c a459332dc671138a6997904850ead36d83bfb8e0
 F src/whereInt.h 124d970450955a6982e174b07c320ae6d62a595c
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
@@ -1200,7 +1200,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 92e0b4bd4d75e8b000586e51a07b3e181d9af20b
-R ad11511f8b3c0903ec6511fb5cd0e86b
+P 2e375eae473e4a9f2e7870d59e22ba39051ecbce
+R c96a5d9652d91d70c0e54df21653ce3e
 U drh
-Z 55bafa322513796a5af056ecffd49293
+Z 7116ce524f0c5c15e04b43bf011b61b4

diff --git a/manifest.uuid b/manifest.uuid
index e80a6f2549c610a9e42890939dee85effd6e578f..42170fe6be3cc9be77579d5406f4ea6c610ae848 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2e375eae473e4a9f2e7870d59e22ba39051ecbce
\ No newline at end of file
+670993eb8113f386cb2cb8b1507917f6da3b4d98
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index 3cde23be49777dd3e4e308d088438b5060156602..bc7e58a7fef30d1d0d0b5f28918bafe01a740181 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -3537,6 +3537,7 @@ static Bitmask codeOneLoopStart(
           pOrExpr = pAndExpr;
         }
         /* Loop through table entries that match term pOrTerm. */
+        WHERETRACE(0xffff, ("Subplan for OR-clause:\n"));
         pSubWInfo = sqlite3WhereBegin(pParse, pOrTab, pOrExpr, 0, 0,
                                       wctrlFlags, iCovCur);
         assert( pSubWInfo || pParse->nErr || db->mallocFailed );
@@ -3761,15 +3762,19 @@ static Bitmask codeOneLoopStart(
 ** Print the content of a WhereTerm object
 */
 static void whereTermPrint(WhereTerm *pTerm, int iTerm){
-  char zType[4];
-  memcpy(zType, "...", 4);
-  if( pTerm->wtFlags & TERM_VIRTUAL ) zType[0] = 'V';
-  if( pTerm->eOperator & WO_EQUIV  ) zType[1] = 'E';
-  if( ExprHasProperty(pTerm->pExpr, EP_FromJoin) ) zType[2] = 'L';
-  sqlite3DebugPrintf("TERM-%-3d %p %s cursor=%-3d prob=%-3d op=0x%03x\n", iTerm,
-                     pTerm, zType, pTerm->leftCursor, pTerm->truthProb,
-                     pTerm->eOperator);
-  sqlite3TreeViewExpr(0, pTerm->pExpr, 0);
+  if( pTerm==0 ){
+    sqlite3DebugPrintf("TERM-%-3d NULL\n", iTerm);
+  }else{
+    char zType[4];
+    memcpy(zType, "...", 4);
+    if( pTerm->wtFlags & TERM_VIRTUAL ) zType[0] = 'V';
+    if( pTerm->eOperator & WO_EQUIV  ) zType[1] = 'E';
+    if( ExprHasProperty(pTerm->pExpr, EP_FromJoin) ) zType[2] = 'L';
+    sqlite3DebugPrintf("TERM-%-3d %p %s cursor=%-3d prob=%-3d op=0x%03x\n",
+                       iTerm, pTerm, zType, pTerm->leftCursor, pTerm->truthProb,
+                       pTerm->eOperator);
+    sqlite3TreeViewExpr(0, pTerm->pExpr, 0);
+  }
 }
 #endif
 
@@ -3818,9 +3823,7 @@ static void whereLoopPrint(WhereLoop *p, WhereClause *pWC){
   if( p->nLTerm && (sqlite3WhereTrace & 0x100)!=0 ){
     int i;
     for(i=0; i<p->nLTerm; i++){
-      WhereTerm *pTerm = p->aLTerm[i];
-      if( pTerm==0 ) continue;
-      whereTermPrint(pTerm, i);
+      whereTermPrint(p->aLTerm[i], i);
     }
   }
 }
@@ -5023,6 +5026,7 @@ static int whereLoopAddOr(WhereLoopBuilder *pBuilder, Bitmask mExtra){
       sSubBuild.pOrderBy = 0;
       sSubBuild.pOrSet = &sCur;
 
+      WHERETRACE(0x200, ("Begin processing OR-clause %p\n", pTerm));
       for(pOrTerm=pOrWC->a; pOrTerm<pOrWCEnd; pOrTerm++){
         if( (pOrTerm->eOperator & WO_AND)!=0 ){
           sSubBuild.pWC = &pOrTerm->u.pAndInfo->wc;
@@ -5038,9 +5042,12 @@ static int whereLoopAddOr(WhereLoopBuilder *pBuilder, Bitmask mExtra){
         }
         sCur.n = 0;
 #ifdef WHERETRACE_ENABLED
-        if( sqlite3WhereTrace & 0x200 ){
-          sqlite3DebugPrintf("OR-term %d:\n",(int)(pOrTerm-pOrWC->a));
-          sqlite3TreeViewExpr(0, pOrTerm->pExpr, 0);
+        WHERETRACE(0x200, ("OR-term %d of %p has %d subterms:\n", 
+                   (int)(pOrTerm-pOrWC->a), pTerm, sSubBuild.pWC->nTerm));
+        if( sqlite3WhereTrace & 0x400 ){
+          for(i=0; i<sSubBuild.pWC->nTerm; i++){
+            whereTermPrint(&sSubBuild.pWC->a[i], i);
+          }
         }
 #endif
 #ifndef SQLITE_OMIT_VIRTUALTABLE
@@ -5095,6 +5102,7 @@ static int whereLoopAddOr(WhereLoopBuilder *pBuilder, Bitmask mExtra){
         pNew->prereq = sSum.a[i].prereq;
         rc = whereLoopInsert(pBuilder, pNew);
       }
+      WHERETRACE(0x200, ("End processing OR-clause %p\n", pTerm));
     }
   }
   return rc;