Additional debugging information printed with the ".wheretrace 0x100" option.

No changes to normally delivered code.

FossilOrigin-Name: fc72ec52c92ca6a953e765b48e21d52021fdb23a2cd84f737da4e43c642f6a5d

diff --git a/manifest b/manifest
index 83677eb9568d6fd2b0a4c9fb8918bf9ad11dd35e..be113bb639adc661ed874ea00de74dbb77cc53b2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\srowid\sof\san\sRTREE\svirtual\stable\shas\sinteger\saffinity.\nTicket\s[9fe487ba3c064b4e]
-D 2019-12-05T14:42:26.047
+C Additional\sdebugging\sinformation\sprinted\swith\sthe\s".wheretrace\s0x100"\soption.\nNo\schanges\sto\snormally\sdelivered\scode.
+D 2019-12-05T17:31:58.970
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -612,7 +612,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 15a2845769f51ba132f9cf0b2c7a6887a91fc8437892dbcce9fcdc68b66d60a1
 F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
 F src/walker.c a137468bf36c92e64d2275caa80c83902e3a0fc59273591b96c6416d3253d05d
-F src/where.c 2a5389e75730f2777801cc5b7bc65bc29ceb626217702c892964736d2275bc0c
+F src/where.c 6807232f4140477a15a8507f8063709d2da58a5daa17368308d82bcd7c4475f4
 F src/whereInt.h 4a296fd4fa79fdcbc2b5e8c1b898901617655811223e1082b899c23ecb092217
 F src/wherecode.c 909325b98d5cb313f24e5c8cb304a3e3c73ca6631cdb19cfa1f580dde182fedb
 F src/whereexpr.c 39b6a538804c6e1248c22b33e09d00f89ae6a099c849c4d841ce3995562287b4
@@ -1851,7 +1851,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 7e5ad8e0ab7ee91a5ccb19a9654d6a036233f74d2fdc45f7315feb3d9d035fd4
-R dd1fb900cbe23ca898a64778b6b34b3b
+P 7ae8c0d52f6aa7f27537216f85456ef49dade040366cfb250c789206ecd4dc5a
+R 153b7d647eeb32013cd1c11710341ef1
 U drh
-Z 957df8bc79d16338794e83c1c0d47a72
+Z b84a6a895890a94b59792736592969e7

diff --git a/manifest.uuid b/manifest.uuid
index bee7ae6b2c118371f616f698583d41f74c9e2180..71af3348161f27d2ad4df2894ed03dc049aaee01 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7ae8c0d52f6aa7f27537216f85456ef49dade040366cfb250c789206ecd4dc5a
\ No newline at end of file
+fc72ec52c92ca6a953e765b48e21d52021fdb23a2cd84f737da4e43c642f6a5d
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index b04522309ac9048e8ff57bee73141d09acd44197..2d115941ff6543ea78675689b52117ac8c05494e 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -1816,7 +1816,7 @@ static void whereLoopPrint(WhereLoop *p, WhereClause *pWC){
   }else{
     char *z;
     if( p->u.vtab.idxStr ){
-      z = sqlite3_mprintf("(%d,\"%s\",%x)",
+      z = sqlite3_mprintf("(%d,\"%s\",%#x)",
                 p->u.vtab.idxNum, p->u.vtab.idxStr, p->u.vtab.omitMask);
     }else{
       z = sqlite3_mprintf("(%d,%x)", p->u.vtab.idxNum, p->u.vtab.omitMask);
@@ -4810,6 +4810,7 @@ WhereInfo *sqlite3WhereBegin(
     }
   }
   if( sqlite3WhereTrace & 0x100 ){ /* Display all terms of the WHERE clause */
+    sqlite3DebugPrintf("---- WHERE clause at start of analysis:\n");
     sqlite3WhereClausePrint(sWLB.pWC);
   }
 #endif
@@ -4948,7 +4949,13 @@ WhereInfo *sqlite3WhereBegin(
       nTabList--;
     }
   }
+#if defined(WHERETRACE_ENABLED)
+  if( sqlite3WhereTrace & 0x100 ){ /* Display all terms of the WHERE clause */
+    sqlite3DebugPrintf("---- WHERE clause at end of analysis:\n");
+    sqlite3WhereClausePrint(sWLB.pWC);
+  }
   WHERETRACE(0xffff,("*** Optimizer Finished ***\n"));
+#endif
   pWInfo->pParse->nQueryLoop += pWInfo->nRowOut;
 
   /* If the caller is an UPDATE or DELETE statement that is requesting