Minor performance improvement in sqlite3ExprDeleteNN().

FossilOrigin-Name: bcc8b38ac75b731a4cd2873ab83f423be036467a511b617c779869de9bbb5383

diff --git a/manifest b/manifest
index 3cf1f3b3156a04abe94efbecb1f61b60aded99f0..07f6d39ac53c9dcd4514db8109602ff585f682cf 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Another\svery\ssmall\sperformance\simprovement.
-D 2019-07-05T19:10:41.614
+C Minor\sperformance\simprovement\sin\ssqlite3ExprDeleteNN().
+D 2019-07-10T20:16:53.830
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -474,7 +474,7 @@ F src/date.c e1d8ac7102f3f283e63e13867acb0efa33861cf34f0faf4cdbaf9fa7a1eb7041
 F src/dbpage.c 135eb3b5e74f9ef74bde5cec2571192c90c86984fa534c88bf4a055076fa19b7
 F src/dbstat.c c12833de69cb655751487d2c5a59607e36be1c58ba1f4bd536609909ad47b319
 F src/delete.c d08c9e01a2664afd12edcfa3a9c6578517e8ff8735f35509582693adbe0edeaf
-F src/expr.c 33267aaf04145af9f1f06c1f4c10f8e7a9acce1c681d75526e6a3fa7e58c1d79
+F src/expr.c 01bbd69f29936bba85dba6188a409c1e21a0c260bf04b9fc78d5e9702a77acb5
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 0e14d4bef8eac2d87bbd517e492d9084c65008d117823f8922c5e7b2b599bd33
 F src/func.c 905c0424900979fade3731b4a271592059425c988cb7d5b245032253712dd7c8
@@ -520,7 +520,7 @@ F src/pragma.h 4a9fabff14db4487a734dfeeb4be984ce662bfdccfae16145b9c732327735e13
 F src/prepare.c d633c3610c23dc98239ea445803c2a6188c2b8ab647e3df4243f369516e6c8d1
 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 3c0dc44956a909e135b92e7691e77fb7cf65ab55f03f0439b4e9758b29841fda
+F src/resolve.c 138c9e9d8828f199709bd7c970d98aaff47a21d33c6c42ffb6e1e809620fcc9e
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 F src/select.c 696107b0e89df923a1991fb638454767258bd67959249da09badfa6c94b4bd9e
 F src/shell.c.in 82f8a473c01662f52233c6c75b9bf88d0d2cab276086d5d4ca6f2ff57a3e48eb
@@ -607,7 +607,7 @@ F src/vtab.c 1fa256c6ddad7a81e2a4dc080d015d4b0a7135767717d311298e47f6fca64bb3
 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b09a2a9cab50efa08451a8c81d47052120ad5da174048c6d0b08d405384abdf2
 F src/wal.h 606292549f5a7be50b6227bd685fa76e3a4affad71bb8ac5ce4cb5c79f6a176a
-F src/walker.c 31844651eacdc408474c62df526f20d5ea7994b5b8ffcd23eed5dc8f688c26f5
+F src/walker.c 588e7f5faf30d2e68aa9b176258bb3225d0553171b998b06b69ed74a0528e986
 F src/where.c 2f11eeb14335b7640f886b2fb441f54a94c35ab5cde8b53461a1074bfd587081
 F src/whereInt.h 1b728f71654ebf8421a1715497a587f02d6f538e819af58dc826908f8577e810
 F src/wherecode.c 37a1004237d630d785c47bba2290eac652a7a8b0047518eba3cb7c808b604c4a
@@ -1833,7 +1833,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 81eed055de856068109a7e332cca0c3ff1120ebe2bfa5ed6383b165c726e0a7c
-R 46b156a94f9cfdf367fb299674af587d
+P 7a1e30a17f57ca006dd84b6f97b0c7811bf4c6da4b02903452ffc4bc363cab9b
+R 6bd4ab9e9ad32527f5b65731f0494801
 U dan
-Z 61e3b9e66b66516dc5ac189aabd81a74
+Z 7ff155988343772e802f3ddf15426065

diff --git a/manifest.uuid b/manifest.uuid
index 9481a3b9f0cac018e7e0dd3b13b06b7193efac67..5793e74a4cfc1bd932d928df5d68e3e844ac6c43 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7a1e30a17f57ca006dd84b6f97b0c7811bf4c6da4b02903452ffc4bc363cab9b
\ No newline at end of file
+bcc8b38ac75b731a4cd2873ab83f423be036467a511b617c779869de9bbb5383
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 75d0dbe9dab216ac8c7c6fefeda2bf43c7e8a3d3..6fbeb827fbe750d523caf7691701b1d28fac1588 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1040,21 +1040,25 @@ static SQLITE_NOINLINE void sqlite3ExprDeleteNN(sqlite3 *db, Expr *p){
     assert( p->x.pList==0 || p->pRight==0 );
     if( p->pLeft && p->op!=TK_SELECT_COLUMN ) sqlite3ExprDeleteNN(db, p->pLeft);
     if( p->pRight ){
+      assert( !ExprHasProperty(p, (EP_WinFunc|EP_Filter)) );
       sqlite3ExprDeleteNN(db, p->pRight);
     }else if( ExprHasProperty(p, EP_xIsSelect) ){
+      assert( !ExprHasProperty(p, (EP_WinFunc|EP_Filter)) );
       sqlite3SelectDelete(db, p->x.pSelect);
     }else{
       sqlite3ExprListDelete(db, p->x.pList);
-    }
 #ifndef SQLITE_OMIT_WINDOWFUNC
-    if( ExprHasProperty(p, EP_WinFunc) ){
-      assert( p->op==TK_FUNCTION && !ExprHasProperty(p, EP_Filter) );
-      sqlite3WindowDelete(db, p->y.pWin);
-    }else if( ExprHasProperty(p, EP_Filter) ){
-      assert( p->op==TK_FUNCTION || p->op==TK_AGG_FUNCTION );
-      sqlite3ExprDelete(db, p->y.pFilter);
-    }
+      if( ExprHasProperty(p, (EP_WinFunc|EP_Filter)) ){
+        if( ExprHasProperty(p, EP_WinFunc) ){
+          assert( p->op==TK_FUNCTION && !ExprHasProperty(p, EP_Filter) );
+          sqlite3WindowDelete(db, p->y.pWin);
+        }else{
+          assert( p->op==TK_FUNCTION || p->op==TK_AGG_FUNCTION );
+          sqlite3ExprDeleteNN(db, p->y.pFilter);
+        }
+      }
 #endif
+    }
   }
   if( ExprHasProperty(p, EP_MemToken) ) sqlite3DbFree(db, p->u.zToken);
   if( !ExprHasProperty(p, EP_Static) ){

diff --git a/src/resolve.c b/src/resolve.c
index d65344e2a84ad4398efd471abaf61347d3e90954..37aaa92606219a4fb8ad6fba3e43f3b5ea3e234e 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -826,23 +826,23 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
 
       if( 0==IN_RENAME_OBJECT ){
 #ifndef SQLITE_OMIT_WINDOWFUNC
-        int is_win = ExprHasProperty(pExpr, EP_WinFunc);
+        Window *pWin = (ExprHasProperty(pExpr, EP_WinFunc) ? pExpr->y.pWin : 0);
         assert( is_agg==0 || (pDef->funcFlags & SQLITE_FUNC_MINMAX)
           || (pDef->xValue==0 && pDef->xInverse==0)
           || (pDef->xValue && pDef->xInverse && pDef->xSFunc && pDef->xFinalize)
         );
-        if( pDef && pDef->xValue==0 && is_win ){
+        if( pDef && pDef->xValue==0 && pWin ){
           sqlite3ErrorMsg(pParse, 
               "%.*s() may not be used as a window function", nId, zId
           );
           pNC->nErr++;
         }else if( 
               (is_agg && (pNC->ncFlags & NC_AllowAgg)==0)
-           || (is_agg && (pDef->funcFlags&SQLITE_FUNC_WINDOW) && !is_win)
-           || (is_agg && is_win && (pNC->ncFlags & NC_AllowWin)==0)
+           || (is_agg && (pDef->funcFlags&SQLITE_FUNC_WINDOW) && !pWin)
+           || (is_agg && pWin && (pNC->ncFlags & NC_AllowWin)==0)
         ){
           const char *zType;
-          if( (pDef->funcFlags & SQLITE_FUNC_WINDOW) || is_win ){
+          if( (pDef->funcFlags & SQLITE_FUNC_WINDOW) || pWin ){
             zType = "window";
           }else{
             zType = "aggregate";
@@ -881,7 +881,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
           ** Or arguments of other window functions. But aggregate functions
           ** may be arguments for window functions.  */
 #ifndef SQLITE_OMIT_WINDOWFUNC
-          pNC->ncFlags &= ~(NC_AllowWin | (!is_win ? NC_AllowAgg : 0));
+          pNC->ncFlags &= ~(NC_AllowWin | (!pWin ? NC_AllowAgg : 0));
 #else
           pNC->ncFlags &= ~NC_AllowAgg;
 #endif

diff --git a/src/walker.c b/src/walker.c
index 766a345add135decf72d31592be0b528a796254f..44e3d18363a020ae51d448fda6caea499431c802 100644 (file)
--- a/src/walker.c
+++ b/src/walker.c
@@ -63,21 +63,26 @@ static SQLITE_NOINLINE int walkExpr(Walker *pWalker, Expr *pExpr){
       if( pExpr->pLeft && walkExpr(pWalker, pExpr->pLeft) ) return WRC_Abort;
        assert( pExpr->x.pList==0 || pExpr->pRight==0 );
       if( pExpr->pRight ){
+        assert( !ExprHasProperty(pExpr, EP_WinFunc|EP_Filter) );
         pExpr = pExpr->pRight;
         continue;
       }else if( ExprHasProperty(pExpr, EP_xIsSelect) ){
+        assert( !ExprHasProperty(pExpr, EP_WinFunc|EP_Filter) );
         if( sqlite3WalkSelect(pWalker, pExpr->x.pSelect) ) return WRC_Abort;
-      }else if( pExpr->x.pList ){
-        if( sqlite3WalkExprList(pWalker, pExpr->x.pList) ) return WRC_Abort;
-      }
+      }else{
+        if( pExpr->x.pList ){
+          if( sqlite3WalkExprList(pWalker, pExpr->x.pList) ) return WRC_Abort;
+        }
 #ifndef SQLITE_OMIT_WINDOWFUNC
-      if( ExprHasProperty(pExpr, EP_WinFunc) ){
-        if( walkWindowList(pWalker, pExpr->y.pWin) ) return WRC_Abort;
-      }
-      if( ExprHasProperty(pExpr, EP_Filter) ){
-        if( walkExpr(pWalker, pExpr->y.pFilter) ) return WRC_Abort;
-      }
+        if( ExprHasProperty(pExpr, EP_WinFunc|EP_Filter) ){
+          if( ExprHasProperty(pExpr, EP_WinFunc) ){
+            if( walkWindowList(pWalker, pExpr->y.pWin) ) return WRC_Abort;
+          }else if( ExprHasProperty(pExpr, EP_Filter) ){
+            if( walkExpr(pWalker, pExpr->y.pFilter) ) return WRC_Abort;
+          }
+        }
 #endif
+      }
     }
     break;
   }