More aggressive use of EP_Leaf on expression nodes, to help prune searches.

FossilOrigin-Name: c1a1d68c8219c8072e60af5c46a30849ae9a04fa1a6b2a8b22b82fec069d691d

diff --git a/manifest b/manifest
index 888dfa5ec4f29a7303d51c8accfb5f392e990f94..a3b0cd440592e5314376d8e7add323b11a88b95a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Very\sslightly\ssmaller\sand\sfaster\ssqlite3WalkSelect().
-D 2017-07-07T11:49:48.109
+C More\saggressive\suse\sof\sEP_Leaf\son\sexpression\snodes,\sto\shelp\sprune\ssearches.
+D 2017-07-07T12:43:57.009
 F Makefile.in 081e48dfe7f995d57ce1a88ddf4d2917b4349158648a6cd45b42beae30de3a12
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 4ebb1d257cac7fb1bcb4ba59278416d410ff1c4bf59447a9c37a415f3516056a
@@ -401,7 +401,7 @@ F src/ctime.c 928954802b1397d9fb1378c7eb702c94b4735bbab1d5793e21b6a77734f56a1b
 F src/date.c cc42a41c7422389860d40419a5e3bce5eaf6e7835c3ba2677751dc653550a5c7
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c 3213547e97b676c6fa79948b7a9ede4801ea04a01a2043241deafedf132ecf5d
-F src/expr.c cc024ddd19aa37b6672caedab90e2a5ec69a4a1a97da94c2f1a0bd81cf0cd922
+F src/expr.c 26f51aa89dd4fb89f2addf1c5b75e2505e2df638d7df36663b2e1d77e15d1950
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 5ff2c895fe087756d8085dc1a9bc229b5670e2a65c3929dd87c71e43649af333
 F src/func.c 7647140a8624c66cc6e34bdf8005a92390253d6272e87c7901dc8065b563d435
@@ -446,7 +446,7 @@ F src/pragma.h 99d3df4a3d2f12c5227ad403f767334910e6356325b6d155a9a99b4037093460
 F src/prepare.c 4b84ae7458febe1df3e04ae62ba56abc851f771340e460d14426e6802c5615f4
 F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c d1e69759e7a79c156c692793f5d16f82f9a60ce5e82efd95e4374b2423034946
+F src/resolve.c 6aa1fb1212e601f65b983ee1215d69a591986c8f97a3805c425c625a53839539
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c c9f7b7196e196e93979665680d055a789938b8e025556097bf484b184c0dd576
 F src/shell.c a2b148e4ca8eb81b96e1050207c83d4a16ea6bf9182374faee4dd2a43628c291
@@ -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 7c7d53a9bbc27fde2dcc028cb7765c76cad0a784e53095b652c90d371968c53d
-R 11c8cbc2a5387dcf85eec229cbb392a6
+P 9bc65635b29a4991c7821ef0939975d007f9ac23716717699353ef3246e27791
+R a3cdeda4bac6b83a0a83684ff5b8d25b
 U drh
-Z 97ecd3b102419405784f5c0503e71057
+Z f3a2b3ed70fa21b681b3e9640670979a

diff --git a/manifest.uuid b/manifest.uuid
index 659758031304f99829e86a7894193fe7f50610ef..8cb356a276bc97ebd2c15a4ad07337ed19a48b48 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9bc65635b29a4991c7821ef0939975d007f9ac23716717699353ef3246e27791
\ No newline at end of file
+c1a1d68c8219c8072e60af5c46a30849ae9a04fa1a6b2a8b22b82fec069d691d
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index fc24ffbe062c87ef129af14eae2b74522ecf95d0..2e8b1960366cd8647d8fe10c95b5556adac61f93 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -744,7 +744,7 @@ Expr *sqlite3ExprAlloc(
     pNew->iAgg = -1;
     if( pToken ){
       if( nExtra==0 ){
-        pNew->flags |= EP_IntValue;
+        pNew->flags |= EP_IntValue|EP_Leaf;
         pNew->u.iValue = iValue;
       }else{
         pNew->u.zToken = (char*)&pNew[1];

diff --git a/src/resolve.c b/src/resolve.c
index 8cddfd80bc194fb6cbc0830d3caeb200a0caad09..b13786f4df8a3ca737e9637c0b7da329b7692481 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -478,6 +478,7 @@ static int lookupName(
   sqlite3ExprDelete(db, pExpr->pRight);
   pExpr->pRight = 0;
   pExpr->op = (isTrigger ? TK_TRIGGER : TK_COLUMN);
+  ExprSetProperty(pExpr, EP_Leaf);
 lookupname_end:
   if( cnt==1 ){
     assert( pNC!=0 );