If the ".wheretrace 0x10000" bit is set, print WhereTerm.prereqAll

and .prereqRight fields in the WhereTerm trace output.

FossilOrigin-Name: a4f330b133a36356681dce7d2a65d8ab792620494d6cd4ef4934a97cf3a8e6fc

diff --git a/manifest b/manifest
index d1c0c6b2fb46ffe3698724471fb7d4df040659c0..c6cebb057e8e74b33188870ca27328f70bdf44ff 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Two\snew\stest\scases\sadded\sto\stest/fuzzdata8.db.
-D 2019-12-28T11:55:44.749
+C If\sthe\s".wheretrace\s0x10000"\sbit\sis\sset,\sprint\sWhereTerm.prereqAll\nand\s.prereqRight\sfields\sin\sthe\sWhereTerm\strace\soutput.
+D 2019-12-28T12:33:35.974
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -614,7 +614,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 2796f052b577e0c28d9e05e7fcbe30917af4a1263117b36a49d99feb01d5e851
+F src/where.c 476c0091eb27c99fb481730621838f646fba6d9ebc6e76a97e8caa9b7f08d933
 F src/whereInt.h 4a296fd4fa79fdcbc2b5e8c1b898901617655811223e1082b899c23ecb092217
 F src/wherecode.c d42d3e0fe93786621b84dec8065e1dc6b324d7c5934df52f141555843b6aef4e
 F src/whereexpr.c 4b34be1434183e7bb8a05d4bf42bd53ea53021b0b060936fbd12062b4ff6b396
@@ -1853,7 +1853,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 315d1f1a503e8c186739658c85b92fa3d12514e5baaa26925c85664b5e85d1c0
-R 38094d1bc8d84cfaffe3da68e5a91de4
+P 1be2c18f4021e1d0b8412ecb68a599475c717dd97c7db209fc4203358957fd70
+R 1077f4eb4d5b48d5e8fb352c3adc1164
 U drh
-Z 5a6ae9bcb7c62e50f1665981a625d451
+Z 26ea5bdabbe48f1cef138e8164f2fb1d

diff --git a/manifest.uuid b/manifest.uuid
index 77f7e4216a6f299acc99575cf3d16a894f06d462..556a07d0a298be6bccf490e0ac90e20dd4c2590d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1be2c18f4021e1d0b8412ecb68a599475c717dd97c7db209fc4203358957fd70
\ No newline at end of file
+a4f330b133a36356681dce7d2a65d8ab792620494d6cd4ef4934a97cf3a8e6fc
\ No newline at end of file

diff --git a/src/where.c b/src/where.c
index e2c31c64c8f6dabf7afdcc63cac399c53056b63b..0ea0026f489e816743169abf2525c9593d9a2091 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -1759,9 +1759,13 @@ static void whereTermPrint(WhereTerm *pTerm, int iTerm){
       sqlite3_snprintf(sizeof(zLeft),zLeft,"left=%d", pTerm->leftCursor);
     }
     sqlite3DebugPrintf(
-       "TERM-%-3d %p %s %-12s prob=%-3d op=0x%03x wtFlags=0x%04x",
+       "TERM-%-3d %p %s %-12s prob=%-3d op=%03x wtFlags=%04x",
        iTerm, pTerm, zType, zLeft, pTerm->truthProb,
        pTerm->eOperator, pTerm->wtFlags);
+    if( sqlite3WhereTrace & 0x10000 ){
+      sqlite3DebugPrintf(" prereq=%llx,%llx",
+        (u64)pTerm->prereqAll, (u64)pTerm->prereqRight);
+    }
     if( pTerm->iField ){
       sqlite3DebugPrintf(" iField=%d", pTerm->iField);
     }