From: drh Date: Fri, 16 Sep 2016 14:50:38 +0000 (+0000) Subject: Add WHERETRACE macros showing every entry and exit from X-Git-Tag: version-3.15.0~87 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4313f045c2a473dcd5cee1adc4475db1a2181bfc;p=thirdparty%2Fsqlite.git Add WHERETRACE macros showing every entry and exit from whereLoopAddBtreeIndex(). FossilOrigin-Name: e7653decdcee161d379ced40aa1b27246337b000 --- diff --git a/manifest b/manifest index 65e8cf72c6..1049290a29 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sSQLITE_OMIT_AUTHORIZATION\sso\sthat\sit\scompiles\scleanly. -D 2016-09-16T11:53:10.715 +C Add\sWHERETRACE\smacros\sshowing\severy\sentry\sand\sexit\sfrom\nwhereLoopAddBtreeIndex(). +D 2016-09-16T14:50:38.605 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc e1aa788e84f926e42239ee167c53f785bedacacd @@ -467,7 +467,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2 F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09 -F src/where.c edbd73a87ba2e186928e9bfc14348b1bbb2628c5 +F src/where.c d0ca1b5e1c56249e7725cea66ce4e172c5845dec F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613 F src/wherecode.c d172dcf99932ba698dd304edc9a368cd52b4b2e5 F src/whereexpr.c e3db778ed205e982f31960896db71c50612ae009 @@ -1525,7 +1525,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 792afefa9c750910082fd102f1ccd10309759dfc -R 8c1833647015caee904c1e0d3421d795 +P a3e3b3e1c57178ccd38fc7375ec1de8e8ae45372 +R e3303608d5424eda671e1d828f84ecf6 U drh -Z 8c6311e2ea32e5d653d9fa56ba1b62fa +Z cc222b0997065c7a36fcdb84d3a6e5ff diff --git a/manifest.uuid b/manifest.uuid index ff2403cfc1..c069927d03 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -a3e3b3e1c57178ccd38fc7375ec1de8e8ae45372 \ No newline at end of file +e7653decdcee161d379ced40aa1b27246337b000 \ No newline at end of file diff --git a/src/where.c b/src/where.c index 1785107244..527698320f 100644 --- a/src/where.c +++ b/src/where.c @@ -2322,6 +2322,8 @@ static int whereLoopAddBtreeIndex( pNew = pBuilder->pNew; if( db->mallocFailed ) return SQLITE_NOMEM_BKPT; + WHERETRACE(0x800, ("BEGIN addBtreeIdx(%s), nEq=%d\n", + pProbe->zName, pNew->u.btree.nEq)); assert( (pNew->wsFlags & WHERE_VIRTUALTABLE)==0 ); assert( (pNew->wsFlags & WHERE_TOP_LIMIT)==0 ); @@ -2600,6 +2602,8 @@ static int whereLoopAddBtreeIndex( pNew->wsFlags = saved_wsFlags; } + WHERETRACE(0x800, ("END addBtreeIdx(%s), nEq=%d, rc=%d\n", + pProbe->zName, saved_nEq, rc)); return rc; }