Additional debugging Noop-comment in the constraint generator when

wheretrace is enabled.

FossilOrigin-Name: 0ca7474f05e9f27f53f8c71f5a3ff99963ffef9be9c147869e096246d552d6f1

diff --git a/manifest b/manifest
index 4911a97bbab8ecc0ff14fd0e0e53a93fd622f22b..d7121fcc182e826c2442cb98a90b03902859c6eb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Small\sperformance\soptimization\sin\ssqlite3WhereExprUsage().
-D 2017-07-10T15:26:09.382
+C Additional\sdebugging\sNoop-comment\sin\sthe\sconstraint\sgenerator\swhen\nwheretrace\sis\senabled.
+D 2017-07-10T16:38:14.687
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba
@@ -531,7 +531,7 @@ F src/wal.h 06b2a0b599cc0f53ea97f497cf8c6b758c999f71
 F src/walker.c a7ca64ce08a83a20d32186fbe06bca9234e348cfcf07959ee322fdc3e8a6173a
 F src/where.c e7cc80943459ade4ccaeb5c7c10f8a0db8b797e0b0f2509de7efc557b76bf7b6
 F src/whereInt.h 93bb90b77d39901eda31b44d8e90da1351193ccfe96876f89b58a93a33b84c3d
-F src/wherecode.c cd923f921c31158c1a771f0332294e01790e13a2e3d166c40c08d78c8d85e9d6
+F src/wherecode.c c0c4c31573486cd14bb2cbfc63e41eda591609e5190416261999f211bf97abc1
 F src/whereexpr.c bf983d2d33e325cd63a36c40b8de289fd3d7b4d9f2db9052fb8f59f7161a34a0
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
@@ -1628,7 +1628,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 a4fc98113aeb10860834f68a2fdcef690ea15d8303d23b6dd416994a4b7edab6
-R 68686794179912ee0f124d7b66b93bd8
+P 38edc6770e54e456500e77389d42fdf39e9a7ed258a4e1fed3c6dd8fdf4dfcb7
+R 6bf4c162edf7ff6903aaf314bb0ae2fb
 U drh
-Z a9547d4838023b821662e4eab7778dcd
+Z 38d25901c93de0cd7a8af907f32d80a9

diff --git a/manifest.uuid b/manifest.uuid
index 2eadd0644da514afce57dff8eddf872a3659d333..fea24416b7e8ec569560e782e5944d38b42be702 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-38edc6770e54e456500e77389d42fdf39e9a7ed258a4e1fed3c6dd8fdf4dfcb7
\ No newline at end of file
+0ca7474f05e9f27f53f8c71f5a3ff99963ffef9be9c147869e096246d552d6f1
\ No newline at end of file

diff --git a/src/wherecode.c b/src/wherecode.c
index 63972b02020c7dc0f893efd54411e4dd869f9665..d577f1d3f67abe6c9e95c27bb31fe8263015d2f2 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -2081,6 +2081,12 @@ Bitmask sqlite3WhereCodeOneLoopStart(
         VdbeCoverage(v);
 #endif
       }
+#ifdef WHERETRACE_ENABLED /* 0xffff */
+      if( sqlite3WhereTrace ){
+        VdbeNoopComment((v, "WhereTerm[%d] (%p) priority=%d",
+                         pWC->nTerm-j, pTerm, iLoop));
+      }
+#endif
       sqlite3ExprIfFalse(pParse, pE, addrCont, SQLITE_JUMPIFNULL);
       if( skipLikeAddr ) sqlite3VdbeJumpHere(v, skipLikeAddr);
       pTerm->wtFlags |= TERM_CODED;