Consolidate the removal of Window objects from the Select.pWin list into

a single subroutine.

FossilOrigin-Name: e46b2afc99329c43de08d4a2e6ade4d2239d7409c5d5626bf272a3e0dd24d1b4

diff --git a/manifest b/manifest
index 203c6808128bf9fc534805ce9c8aee1514115f45..93a074cf6a85abb4504097641155634ac7e19348 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbug\sin\sthe\slinked-list\shandling\scode\sadded\sby\scommit\s[fd7316cd].
-D 2019-07-22T17:28:43.613
+C Consolidate\sthe\sremoval\sof\sWindow\sobjects\sfrom\sthe\sSelect.pWin\slist\sinto\na\ssingle\ssubroutine.
+D 2019-07-22T19:01:38.804
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -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 63f353113a133810388e45c222ed512ea8d2371a4a9e9ec54001e84072a3df5c
+F src/resolve.c edf29463177e9fa9dad5346e9adf482f24db9f180c693d0ba993e25dc797f6b7
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
 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 01af0390cccdf0ea1c3057923afe7370a1f24a6e3363d802dd2e15fe66b0ea88
+F src/sqliteInt.h 122621557d07c6102d5a41897fe50eabe9767ca7db8ded6746de0446225d03d3
 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 2c958b4bdccbd5a7450621541563d4263e50953a4454d97d44171aab2c549d30
+F src/window.c 7728ba7a3d44084a44eefb60464a88fb2ff035eb20cdeb1160ae65ac3c0be6b9
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd
 F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
@@ -1837,7 +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 25fec62ac5a23382a54eee78d3705885eb4065826d7e8da098816d03ae9dc639
-R 5cbae4427975359f2ddc6c8d60a43a9b
-U dan
-Z 8c151ed28bc28c3158076ee41a997089
+P 05080344dceafcfb670fbf01f7d69a1d713a54b6845f968a9cfe941fb53b13af
+R 68f2a6c5bb2074234576113e077b07ec
+U drh
+Z 439cda0a805b8a43919b98d5efe84140

diff --git a/manifest.uuid b/manifest.uuid
index 895b0c0e00f645a9a6cab97fee44b3870a43d8bc..bc1cb2f0766f47382fd584aaa065489ac5f5abd4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-05080344dceafcfb670fbf01f7d69a1d713a54b6845f968a9cfe941fb53b13af
\ No newline at end of file
+e46b2afc99329c43de08d4a2e6ade4d2239d7409c5d5626bf272a3e0dd24d1b4
\ No newline at end of file

diff --git a/src/resolve.c b/src/resolve.c
index 48d8fcb9b616cf870de67119542915f98f0082b9..672f1356d834912618bf5a46620b3e50df96c4bb 100644 (file)
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -1305,11 +1305,7 @@ int sqlite3ResolveOrderGroupBy(
 static int resolveRemoveWindowsCb(Walker *pWalker, Expr *pExpr){
   if( ExprHasProperty(pExpr, EP_WinFunc) ){
     Window *pWin = pExpr->y.pWin;
-    if( pWin->ppThis ){
-      *pWin->ppThis = pWin->pNextWin;
-      if( pWin->pNextWin ) pWin->pNextWin->ppThis = pWin->ppThis;
-      pWin->ppThis = 0;
-    }
+    sqlite3WindowUnlinkFromSelect(pWin);
   }
   return WRC_Continue;
 }

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index e55eadea67058b55213f9162be90bd7e61c818c5..b41ba4ed8f58183271750436f8bbce3f50854a4c 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3614,6 +3614,7 @@ struct Window {
 
 #ifndef SQLITE_OMIT_WINDOWFUNC
 void sqlite3WindowDelete(sqlite3*, Window*);
+void sqlite3WindowUnlinkFromSelect(Window*);
 void sqlite3WindowListDelete(sqlite3 *db, Window *p);
 Window *sqlite3WindowAlloc(Parse*, int, int, Expr*, int , Expr*, u8);
 void sqlite3WindowAttach(Parse*, Expr*, Window*);

diff --git a/src/window.c b/src/window.c
index f94370a497a1a9f32f42855e6602ce10c224a4a5..199185013ea5eb2be510604b81f1958dc1822d12 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1017,15 +1017,24 @@ int sqlite3WindowRewrite(Parse *pParse, Select *p){
   return rc;
 }
 
+/*
+** Unlink the Window object from the Select to which it is attached,
+** if it is attached.
+*/
+void sqlite3WindowUnlinkFromSelect(Window *p){
+  if( p->ppThis ){
+    *p->ppThis = p->pNextWin;
+    if( p->pNextWin ) p->pNextWin->ppThis = p->ppThis;
+    p->ppThis = 0;
+  }
+}
+
 /*
 ** Free the Window object passed as the second argument.
 */
 void sqlite3WindowDelete(sqlite3 *db, Window *p){
   if( p ){
-    if( p->ppThis ){
-      *p->ppThis = p->pNextWin;
-      if( p->pNextWin ) p->pNextWin->ppThis = p->ppThis;
-    }
+    sqlite3WindowUnlinkFromSelect(p);
     sqlite3ExprDelete(db, p->pFilter);
     sqlite3ExprListDelete(db, p->pPartition);
     sqlite3ExprListDelete(db, p->pOrderBy);