Remove Window objects from the corresponding Select.pWin list when they are deleted.

FossilOrigin-Name: d23f33168222dfa40a67dc7de58057418151989e81429e4af47617e86db04667

diff --git a/manifest b/manifest
index 529dd7cfe55800dc4f744a41295e7948503adc87..4d2185e45ef38b0fbf2d58404e3c2a14c7fecb8e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sany\swindow\sdefinitions\sin\san\sORDER\sBY\sclause\sare\sremoved\sfrom\nthe\sSELECT\sstatement\sif\sthe\sORDER\sBY\sclause\sgets\soptimized\sout.
-D 2019-07-20T21:12:31.257
+C Remove\sWindow\sobjects\sfrom\sthe\scorresponding\sSelect.pWin\slist\swhen\sthey\sare\sdeleted.
+D 2019-07-22T16:20:03.092
 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 f1d87bc9f2d0f14df97b768d5a3d4e4e606fbe45372bc9a0cb6a2623d1933e6d
+F src/expr.c 3dba8ac22b89b6af10cff7d672f8cab4a71c7ee75abb4cbc0a6a79d32f752a4a
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c ab1971900477e93b6aaabf160d2d1c79c06edd9227441ccfaf0de7e7431d7f48
 F src/func.c 905c0424900979fade3731b4a271592059425c988cb7d5b245032253712dd7c8
@@ -520,14 +520,14 @@ F src/pragma.h 4a9fabff14db4487a734dfeeb4be984ce662bfdccfae16145b9c732327735e13
 F src/prepare.c 1fdf68a8add154bd1de978dde5a4819478e2576d5701b93db2c65d78c3daf1c8
 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 78066ab31d1bef84ee08867afc861759a590dcfe87e1096e31bbf094f7e5faf8
+F src/resolve.c b65e59bb9ab798daa269988978a4457e09688b2b14ccca1283df312dff09e176
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c 2890d92d5d8a4b00092a34dfe03d0acf752972c2ec3443ee519d54f3b18e286b
+F src/select.c 9817d812b13c956ac28d27390602751a8add217f87224d2636fb3ef7e4d646a7
 F src/shell.c.in a571d51dd7605b34796e9942dce0e895156d1860383faf6aaca3c88b08fe2a43
 F src/sqlite.h.in 83ebc8ab1a2e82d92214006ea2c15bf8a0604f3fac2c31dd9ce9021f568c71f2
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h 9ecc93b8493bd20c0c07d52e2ac0ed8bab9b549c7f7955b59869597b650dd8b5
-F src/sqliteInt.h 4d078408e4abf88bee4c620e010bfa06f547df824b28b70cac8bc85d5fcb515f
+F src/sqliteInt.h 01af0390cccdf0ea1c3057923afe7370a1f24a6e3363d802dd2e15fe66b0ea88
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -612,7 +612,7 @@ F src/where.c 2f508c9a6dd2a42ad2b692105e77eb92cdec201d32916962ccdeff71836acb52
 F src/whereInt.h 1b728f71654ebf8421a1715497a587f02d6f538e819af58dc826908f8577e810
 F src/wherecode.c 37a1004237d630d785c47bba2290eac652a7a8b0047518eba3cb7c808b604c4a
 F src/whereexpr.c 5e559bdd24b06e3bc2e68f258bf751302954dc1e432daf71fdd8098a71462326
-F src/window.c cdce0114be495ceb97b92abfb437e75fa4a56cfae84895579af1374e2025d0cd
+F src/window.c 2c958b4bdccbd5a7450621541563d4263e50953a4454d97d44171aab2c549d30
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1713,7 +1713,7 @@ F test/window7.tcl 6a1210f05d40ec89c22960213a22cd3f98d4e2f2eb20646c83c8c30d4d761
 F test/window7.test ce7f865241fdd1c5c4db869cd7bb2986c3be836bc2e73649a6846dd920f63e0f
 F test/window8.tcl 9e9a82ae9eea90a4a83481d641a812b974980c38f9247f3b89a6e3c8bed45518
 F test/window8.test df187dc19921f7be0ab709d531d681bd80ccaac96a913a89ecee8b272b91d43f
-F test/window9.test 06495ac733843849b1fca8a79d13ba330d04aba02099703198af2ba7e231f90c
+F test/window9.test 4329f463a151eb12ede2a73bbcf67abf0b9f781c8a1346f4138249f228a02b7e
 F test/windowerr.tcl f5acd6fbc210d7b5546c0e879d157888455cd4a17a1d3f28f07c1c8a387019e0
 F test/windowerr.test a8b752402109c15aa1c5efe1b93ccb0ce1ef84fa964ae1cd6684dd0b3cc1819b
 F test/windowfault.test 403693d7d951c5473f052f7ecddb61ed15ac9d212f238b8904ea270ba90f83e5
@@ -1837,10 +1837,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 2bf5a4c16457562dc942bcc6ec06d9b4e795ef3ea8e31550e18857bbebd08a76
-R 6add6e706621c6ad32ed71a1edb66a9a
-T *branch * winfunc-in-orderby
-T *sym-winfunc-in-orderby *
-T -sym-trunk *
-U drh
-Z ed84c88ba9a0094fa58af4bcbfad001d
+P 23b119671f0be3c6b72cf2dc5f7707a0626766db7aa56529ab00d33d1a0a1bee
+R 13a07fa9ef49fc058e474311b2df66d2
+U dan
+Z fdd41db124ff7febe0dc66dbeefcc10c

diff --git a/manifest.uuid b/manifest.uuid
index e6dccde7f709642cfe42a9a052725d0bd8d0313f..698e86eae378ef608bf8233d1a3824cec393439d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-23b119671f0be3c6b72cf2dc5f7707a0626766db7aa56529ab00d33d1a0a1bee
\ No newline at end of file
+d23f33168222dfa40a67dc7de58057418151989e81429e4af47617e86db04667
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index 56b3148ede87be495337531853e9fda6606ea309..571e9e494b159c890a3af05a51b2a2cdd1c9eccd 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1326,10 +1326,17 @@ static With *withDup(sqlite3 *db, With *p){
 */
 static int gatherSelectWindowsCallback(Walker *pWalker, Expr *pExpr){
   if( pExpr->op==TK_FUNCTION && ExprHasProperty(pExpr, EP_WinFunc) ){
-    assert( pExpr->y.pWin );
+    Select *pSelect = pWalker->u.pSelect;
+    Window *pWin = pExpr->y.pWin;
+    assert( pWin );
     assert( IsWindowFunc(pExpr) );
-    pExpr->y.pWin->pNextWin = pWalker->u.pSelect->pWin;
-    pWalker->u.pSelect->pWin = pExpr->y.pWin;
+    if( pSelect->pWin ){
+      *pSelect->pWin->ppThis = pSelect->pWin->pNextWin;
+      pSelect->pWin->ppThis = &pWin->pNextWin;
+    }
+    pWin->pNextWin = pSelect->pWin;
+    pWin->ppThis = &pSelect->pWin;
+    pSelect->pWin = pWin;
   }
   return WRC_Continue;
 }

diff --git a/src/resolve.c b/src/resolve.c
index cf3d9c339f457038116f60fdd611b1723c6c4db8..2fd98ef0b6f962da16141fd58eb9580b937d9aed 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -901,6 +901,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
 #ifndef SQLITE_OMIT_WINDOWFUNC
         if( pWin ){
           Select *pSel = pNC->pWinSelect;
+          assert( pWin==pExpr->y.pWin );
           if( IN_RENAME_OBJECT==0 ){
             sqlite3WindowUpdate(pParse, pSel->pWinDefn, pWin, pDef);
           }
@@ -910,8 +911,12 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){
           if( 0==pSel->pWin 
            || 0==sqlite3WindowCompare(pParse, pSel->pWin, pWin, 0)
           ){
-            pExpr->y.pWin->pNextWin = pSel->pWin;
-            pSel->pWin = pExpr->y.pWin;
+            pWin->pNextWin = pSel->pWin;
+            if( pSel->pWin ){
+              pSel->pWin->ppThis = &pWin->pNextWin;
+            }
+            pSel->pWin = pWin;
+            pWin->ppThis = &pSel->pWin;
           }
           pNC->ncFlags |= NC_HasWin;
         }else
@@ -1295,17 +1300,15 @@ int sqlite3ResolveOrderGroupBy(
 
 #ifndef SQLITE_OMIT_WINDOWFUNC
 /*
-** Walker callback for sqlite3WindowRemoveExprFromSelect() and
-** sqlite3WindowRemoveExprListFromSelect()
+** Walker callback for windowRemoveExprFromSelect().
 */
 static int resolveRemoveWindowsCb(Walker *pWalker, Expr *pExpr){
   if( ExprHasProperty(pExpr, EP_WinFunc) ){
-    Window **pp;
-    for(pp=&pWalker->u.pSelect->pWin; *pp; pp=&(*pp)->pNextWin){
-      if( *pp==pExpr->y.pWin ){
-        *pp = (*pp)->pNextWin;
-        break;
-      }    
+    Window *pWin = pExpr->y.pWin;
+    if( pWin->ppThis ){
+      *pWin->ppThis = pWin->pNextWin;
+      if( pWin->pNextWin ) pWin->pNextWin->ppThis = pWin->ppThis;
+      pWin->ppThis = 0;
     }
   }
   return WRC_Continue;
@@ -1315,7 +1318,7 @@ static int resolveRemoveWindowsCb(Walker *pWalker, Expr *pExpr){
 ** Remove any Window objects owned by the expression pExpr from the
 ** Select.pWin list of Select object pSelect.
 */
-void sqlite3WindowRemoveExprFromSelect(Select *pSelect, Expr *pExpr){
+static void windowRemoveExprFromSelect(Select *pSelect, Expr *pExpr){
   if( pSelect->pWin ){
     Walker sWalker;
     memset(&sWalker, 0, sizeof(Walker));
@@ -1324,23 +1327,8 @@ void sqlite3WindowRemoveExprFromSelect(Select *pSelect, Expr *pExpr){
     sqlite3WalkExpr(&sWalker, pExpr);
   }
 }
-
-/*
-** Remove any Window objects owned by the expression list from the
-** Select.pWin list of Select object pSelect.
-*/
-void sqlite3WindowRemoveExprListFromSelect(Select *pSelect, ExprList *pList){
-  if( pList && pSelect->pWin ){
-    int i;
-    Walker sWalker;
-    memset(&sWalker, 0, sizeof(Walker));
-    sWalker.xExprCallback = resolveRemoveWindowsCb;
-    sWalker.u.pSelect = pSelect;
-    for(i=0; i<pList->nExpr; i++){
-      sqlite3WalkExpr(&sWalker, pList->a[i].pExpr);
-    }
-  }
-}
+#else
+# define windowRemoveExprFromSelect(a, b)
 #endif /* SQLITE_OMIT_WINDOWFUNC */
 
 /*
@@ -1412,7 +1400,7 @@ static int resolveOrderGroupBy(
         /* Since this expresion is being changed into a reference
         ** to an identical expression in the result set, remove all Window
         ** objects belonging to the expression from the Select.pWin list. */
-        sqlite3WindowRemoveExprFromSelect(pSelect, pE);
+        windowRemoveExprFromSelect(pSelect, pE);
         pItem->u.x.iOrderByCol = j+1;
       }
     }

diff --git a/src/select.c b/src/select.c
index 824583c8f4bb0a27923ea024313b0e49b84f1c26..6e0eeb2f4e5e709d43e38456047dc5c9dc37136c 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -102,6 +102,7 @@ static void clearSelect(sqlite3 *db, Select *p, int bFree){
     }
 #endif
     if( OK_IF_ALWAYS_TRUE(p->pWith) ) sqlite3WithDelete(db, p->pWith);
+    assert( p->pWin==0 );
     if( bFree ) sqlite3DbFreeNN(db, p);
     p = pPrior;
     bFree = 1;
@@ -5661,7 +5662,6 @@ int sqlite3Select(
            pDest->eDest==SRT_DistQueue || pDest->eDest==SRT_Fifo);
     /* If ORDER BY makes no difference in the output then neither does
     ** DISTINCT so it can be removed too. */
-    sqlite3WindowRemoveExprListFromSelect(p, p->pOrderBy);
     sqlite3ExprListDelete(db, p->pOrderBy);
     p->pOrderBy = 0;
     p->selFlags &= ~SF_Distinct;

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 0d3e19efc40a0d88bfc1cec6b91d59fd71d07013..e55eadea67058b55213f9162be90bd7e61c818c5 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3594,6 +3594,7 @@ struct Window {
   u8 eExclude;            /* TK_NO, TK_CURRENT, TK_TIES, TK_GROUP, or 0 */
   Expr *pStart;           /* Expression for "<expr> PRECEDING" */
   Expr *pEnd;             /* Expression for "<expr> FOLLOWING" */
+  Window **ppThis;        /* Pointer to this object in Select.pWin list */
   Window *pNextWin;       /* Next window function belonging to this SELECT */
   Expr *pFilter;          /* The FILTER expression */
   FuncDef *pFunc;         /* The function */
@@ -3627,14 +3628,10 @@ Window *sqlite3WindowListDup(sqlite3 *db, Window *p);
 void sqlite3WindowFunctions(void);
 void sqlite3WindowChain(Parse*, Window*, Window*);
 Window *sqlite3WindowAssemble(Parse*, Window*, ExprList*, ExprList*, Token*);
-void sqlite3WindowRemoveExprFromSelect(Select*,Expr*);
-void sqlite3WindowRemoveExprListFromSelect(Select*,ExprList*);
 #else
 # define sqlite3WindowDelete(a,b)
 # define sqlite3WindowFunctions()
 # define sqlite3WindowAttach(a,b,c)
-# define sqlite3WindowRemoveExprFromSelect(Select*,Expr*);
-# define sqlite3WindowRemoveExprListFromSelect(Select*,ExprList*);
 #endif
 
 /*

diff --git a/src/window.c b/src/window.c
index d769b0bb7a2ddcd70eaab80ad9e26c11532821ba..f94370a497a1a9f32f42855e6602ce10c224a4a5 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1022,6 +1022,10 @@ int sqlite3WindowRewrite(Parse *pParse, Select *p){
 */
 void sqlite3WindowDelete(sqlite3 *db, Window *p){
   if( p ){
+    if( p->ppThis ){
+      *p->ppThis = p->pNextWin;
+      if( p->pNextWin ) p->pNextWin->ppThis = p->ppThis;
+    }
     sqlite3ExprDelete(db, p->pFilter);
     sqlite3ExprListDelete(db, p->pPartition);
     sqlite3ExprListDelete(db, p->pOrderBy);

diff --git a/test/window9.test b/test/window9.test
index 5a32a75378c9eb3a79c9c177b2bfca412268cab8..602a7bdfb3c116cb8b98aac1abfb293dc798b4d1 100644 (file)
--- a/test/window9.test
+++ b/test/window9.test
@@ -98,5 +98,29 @@ do_execsql_test 2.2.2 {
   SELECT b=='2', rank() OVER (ORDER BY a) FROM t1
 } {1 1   0 2}
 
+#-------------------------------------------------------------------------
+reset_db
+do_execsql_test 3.0 {
+  CREATE TABLE t1(a);
+  CREATE TABLE t2(a,b,c);
+}
+
+do_execsql_test 3.1 {
+  SELECT EXISTS(SELECT 1 FROM t1 ORDER BY sum(a) OVER ()) FROM t1;
+}
+
+do_execsql_test 3.2 {
+  SELECT sum(a) OVER () FROM t2
+   ORDER BY EXISTS(SELECT 1 FROM t2 ORDER BY sum(a) OVER ());
+}
+
+do_catchsql_test 3.3 {
+  SELECT a, sum(a) OVER (ORDER BY a DESC) FROM t2 
+  ORDER BY EXISTS(
+    SELECT 1 FROM t2 ORDER BY sum(a) OVER (ORDER BY a)
+  ) OVER (ORDER BY a);
+} {1 {near "OVER": syntax error}}
+
+
 finish_test