Show the WhereTerm.iField value on debugging output, when it is non-zero.

FossilOrigin-Name: 931c95358d8bc02f3e3d8ee4e545a07b2d2c97e8
This commit is contained in:
drh 2016-08-19 18:40:17 +00:00
parent 4602b8e89d
commit a15a8bc822
3 changed files with 13 additions and 8 deletions

View File

@ -1,5 +1,5 @@
C Fix\san\sobsolete\scomment\son\scodeEqualityTerm().\s\sNo\schanges\sto\scode. C Show\sthe\sWhereTerm.iField\svalue\son\sdebugging\soutput,\swhen\sit\sis\snon-zero.
D 2016-08-19T18:28:00.523 D 2016-08-19T18:40:17.138
F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@ -464,7 +464,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a
F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2 F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2
F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09 F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09
F src/where.c 5bee250c8233c43bd7f53897d12b8468004f63db F src/where.c c7cdfd54f383090bb801cdd50d36de1a24684bb2
F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613 F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613
F src/wherecode.c f3fd16b9b4cef1345330d22cf3f1628f87a56456 F src/wherecode.c f3fd16b9b4cef1345330d22cf3f1628f87a56456
F src/whereexpr.c 8d9903d16ae45d15736745f7b75df2340c729782 F src/whereexpr.c 8d9903d16ae45d15736745f7b75df2340c729782
@ -1518,7 +1518,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P b17872363b60edab05a5d382a44038aad91e4d9f P d07be5afb0a915769382dfd815403f8832cb3eec
R 81462375f5cd0ff256194ab35ae61f4d R 8b996d549f6c06da9085faa1b04f9847
U drh U drh
Z 0138a28f257e6cf64f3bd77d61380c55 Z 5690c4429160dd9b0cc8734ae0e94c60

View File

@ -1 +1 @@
d07be5afb0a915769382dfd815403f8832cb3eec 931c95358d8bc02f3e3d8ee4e545a07b2d2c97e8

View File

@ -1677,9 +1677,14 @@ static void whereTermPrint(WhereTerm *pTerm, int iTerm){
sqlite3_snprintf(sizeof(zLeft),zLeft,"left=%d", pTerm->leftCursor); sqlite3_snprintf(sizeof(zLeft),zLeft,"left=%d", pTerm->leftCursor);
} }
sqlite3DebugPrintf( sqlite3DebugPrintf(
"TERM-%-3d %p %s %-12s prob=%-3d op=0x%03x wtFlags=0x%04x\n", "TERM-%-3d %p %s %-12s prob=%-3d op=0x%03x wtFlags=0x%04x",
iTerm, pTerm, zType, zLeft, pTerm->truthProb, iTerm, pTerm, zType, zLeft, pTerm->truthProb,
pTerm->eOperator, pTerm->wtFlags); pTerm->eOperator, pTerm->wtFlags);
if( pTerm->iField ){
sqlite3DebugPrintf(" iField=%d\n", pTerm->iField);
}else{
sqlite3DebugPrintf("\n");
}
sqlite3TreeViewExpr(0, pTerm->pExpr, 0); sqlite3TreeViewExpr(0, pTerm->pExpr, 0);
} }
} }