From: drh Date: Wed, 10 Aug 2016 18:56:32 +0000 (+0000) Subject: Performance enhancement in the expression walker. X-Git-Tag: version-3.15.0~146 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=922802c44e912e9d854408afa9f7e48f8ff1208a;p=thirdparty%2Fsqlite.git Performance enhancement in the expression walker. FossilOrigin-Name: ebccbd96094ac64de39dbd0d220d3a7afd8cd40e --- diff --git a/manifest b/manifest index 40aa0f764a..5d7ed0ac68 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Tweaks\sto\spcache1TruncateUnsafe()\sto\smake\sit\sslightly\ssmaller\sand\sfaster\sand\neasier\sto\stest. -D 2016-08-10T15:02:49.189 +C Performance\senhancement\sin\sthe\sexpression\swalker. +D 2016-08-10T18:56:32.070 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a @@ -463,7 +463,7 @@ F src/vtab.c 6b3cfaff7e4397739d6b48511e777ca58c6d06d4 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2 -F src/walker.c 0f142b5bd3ed2041fc52d773880748b212e63354 +F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09 F src/where.c 5c9df42d50888be8274a5a0eb062eb0629869bd3 F src/whereInt.h e5b939701a7ceffc5a3a8188a37f9746416ebcd0 F src/wherecode.c 99707d11907c71d289ee9553d2d1a22f1fd8ba41 @@ -1510,7 +1510,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 25d1d02b3ea126ade22b2a72649ae55509aa1777 -R 828a3811914080064b74ae479ed3b60e +P 059f4e2efefb7b9deaf539110c19bceaeb10c6ce +R e10ecf5680d55c2be7b6807b82221bef U drh -Z 4a1a54abd34521e8d97a121a8de840a3 +Z 07228f4a19a0e884d96dc70fff71df0f diff --git a/manifest.uuid b/manifest.uuid index 3afecdeb57..821d79b57b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -059f4e2efefb7b9deaf539110c19bceaeb10c6ce \ No newline at end of file +ebccbd96094ac64de39dbd0d220d3a7afd8cd40e \ No newline at end of file diff --git a/src/walker.c b/src/walker.c index 1e0ad32871..82aae67a61 100644 --- a/src/walker.c +++ b/src/walker.c @@ -41,17 +41,15 @@ static SQLITE_NOINLINE int walkExpr(Walker *pWalker, Expr *pExpr){ testcase( ExprHasProperty(pExpr, EP_TokenOnly) ); testcase( ExprHasProperty(pExpr, EP_Reduced) ); rc = pWalker->xExprCallback(pWalker, pExpr); - if( rc==WRC_Continue - && !ExprHasProperty(pExpr,EP_TokenOnly) ){ - if( sqlite3WalkExpr(pWalker, pExpr->pLeft) ) return WRC_Abort; - if( sqlite3WalkExpr(pWalker, pExpr->pRight) ) return WRC_Abort; - if( ExprHasProperty(pExpr, EP_xIsSelect) ){ - if( sqlite3WalkSelect(pWalker, pExpr->x.pSelect) ) return WRC_Abort; - }else{ - if( sqlite3WalkExprList(pWalker, pExpr->x.pList) ) return WRC_Abort; - } + if( rc || ExprHasProperty(pExpr,EP_TokenOnly) ) return rc & WRC_Abort; + if( pExpr->pLeft && walkExpr(pWalker, pExpr->pLeft) ) return WRC_Abort; + if( pExpr->pRight && walkExpr(pWalker, pExpr->pRight) ) return WRC_Abort; + if( ExprHasProperty(pExpr, EP_xIsSelect) ){ + if( sqlite3WalkSelect(pWalker, pExpr->x.pSelect) ) return WRC_Abort; + }else{ + if( sqlite3WalkExprList(pWalker, pExpr->x.pList) ) return WRC_Abort; } - return rc & WRC_Abort; + return WRC_Continue; } int sqlite3WalkExpr(Walker *pWalker, Expr *pExpr){ return pExpr ? walkExpr(pWalker,pExpr) : WRC_Continue;