From 4ec4dd701ffa459a68c0382e102df86160c10039 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 13 Dec 2019 11:31:47 +0000 Subject: [PATCH 1/3] Remove unused macros formerly used to define built-in aggregate functions. FossilOrigin-Name: 3ef0d44edd0354cda9b6237f992cb67a2170ee8f1f464b1f38ac36e3a133bc71 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/sqliteInt.h | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index b8222b9a3f..398947f8f9 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Factor\sout\sthe\sconditional\s(which\sis\sonly\strue\sfor\srare\serrors)\sfrom\sthe\nnotValid()\sfunction\sin\sresolve.c,\sfor\sa\sperformance\simprovement\sand\ssize\nreduction.\s\sAlso\scause\sfailures\sto\sset\sthe\sExpr\snode\sto\sa\sNULL\soperator\sso\nthat\sit\sdoes\snot\scause\sproblems\slater\sin\scase\sPRAGMA\swritable_schema=ON\shas\nbeen\sset.\s\sTest\scases\sin\sTH3. -D 2019-12-12T15:19:18.293 +C Remove\sunused\smacros\sformerly\sused\sto\sdefine\sbuilt-in\saggregate\sfunctions. +D 2019-12-13T11:31:47.038 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -532,7 +532,7 @@ F src/shell.c.in 4a3a9e1c11847b1904f2b01d087af1c052f660902755abab457cab1756817de F src/sqlite.h.in 2a23e8161775253d9cf383c2c6aa559005dc787d350dcb0be67a6c4cc3bd1d19 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 72af51aa4e912e14cd495fb6e7fac65f0940db80ed950d90911aff292cc47ce2 -F src/sqliteInt.h 1ac4dfde728b9d5812d1223d668d5e1f43c6fe4f469d6a7a482f298a10a03210 +F src/sqliteInt.h 505a63c618e1c2033f9ee47b738212d6e1b7c883ade7f7adf4a9dd7092295f7c F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 @@ -1852,7 +1852,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 48ba5e5a2227257cebafacbb09e9dd91d9b89ab2d52a8b4e4113c1d017d95f41 -R fa3b00322fb92ab48dfb99988a8bcb8c +P c6af9f655b73200ecc0c4189698e421af6ca584babdc76e73a36d468b2eea1f9 +R d8f751c039e582d2b1259f3edeb257b3 U drh -Z 6fc68518985b2fcb5b612f7541971122 +Z 93f716a2a579af670cbf84e12039b504 diff --git a/manifest.uuid b/manifest.uuid index de3ce2760b..62059fc08e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c6af9f655b73200ecc0c4189698e421af6ca584babdc76e73a36d468b2eea1f9 \ No newline at end of file +3ef0d44edd0354cda9b6237f992cb67a2170ee8f1f464b1f38ac36e3a133bc71 \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 2aca2abfa9..0d62e9f6e9 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1767,12 +1767,14 @@ struct FuncDestructor { #define LIKEFUNC(zName, nArg, arg, flags) \ {nArg, SQLITE_FUNC_CONSTANT|SQLITE_UTF8|flags, \ (void *)arg, 0, likeFunc, 0, 0, 0, #zName, {0} } +/* #define AGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue) \ {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL), \ SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xValue,0,#zName, {0}} #define AGGREGATE2(zName, nArg, arg, nc, xStep, xFinal, extraFlags) \ {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL)|extraFlags, \ SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xFinal,0,#zName, {0}} +*/ #define WAGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue, xInverse, f) \ {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL)|f, \ SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xValue,xInverse,#zName, {0}} From 0d985985077695cc2a620c42194857f657c1a3e4 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 13 Dec 2019 11:32:28 +0000 Subject: [PATCH 2/3] *Remove* the macros, not just comment them out. FossilOrigin-Name: e5dc2939d3e8694d648fc9b73b1174da5b1349e20fbb9cf1c91268939f308f89 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/sqliteInt.h | 8 -------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/manifest b/manifest index 398947f8f9..4401393389 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\sunused\smacros\sformerly\sused\sto\sdefine\sbuilt-in\saggregate\sfunctions. -D 2019-12-13T11:31:47.038 +C *Remove*\sthe\smacros,\snot\sjust\scomment\sthem\sout. +D 2019-12-13T11:32:28.253 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -532,7 +532,7 @@ F src/shell.c.in 4a3a9e1c11847b1904f2b01d087af1c052f660902755abab457cab1756817de F src/sqlite.h.in 2a23e8161775253d9cf383c2c6aa559005dc787d350dcb0be67a6c4cc3bd1d19 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 F src/sqlite3ext.h 72af51aa4e912e14cd495fb6e7fac65f0940db80ed950d90911aff292cc47ce2 -F src/sqliteInt.h 505a63c618e1c2033f9ee47b738212d6e1b7c883ade7f7adf4a9dd7092295f7c +F src/sqliteInt.h 60d92fad64da7c3e77bbc35ee306340814cdaa5df32892b0ec58d306d99b5733 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 @@ -1852,7 +1852,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 c6af9f655b73200ecc0c4189698e421af6ca584babdc76e73a36d468b2eea1f9 -R d8f751c039e582d2b1259f3edeb257b3 +P 3ef0d44edd0354cda9b6237f992cb67a2170ee8f1f464b1f38ac36e3a133bc71 +R c66b26e93f66260bbdfb9270348c2018 U drh -Z 93f716a2a579af670cbf84e12039b504 +Z 650bf9c9615ba772561498de4d1519e2 diff --git a/manifest.uuid b/manifest.uuid index 62059fc08e..56422f5249 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -3ef0d44edd0354cda9b6237f992cb67a2170ee8f1f464b1f38ac36e3a133bc71 \ No newline at end of file +e5dc2939d3e8694d648fc9b73b1174da5b1349e20fbb9cf1c91268939f308f89 \ No newline at end of file diff --git a/src/sqliteInt.h b/src/sqliteInt.h index 0d62e9f6e9..4b4a9068cc 100644 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@ -1767,14 +1767,6 @@ struct FuncDestructor { #define LIKEFUNC(zName, nArg, arg, flags) \ {nArg, SQLITE_FUNC_CONSTANT|SQLITE_UTF8|flags, \ (void *)arg, 0, likeFunc, 0, 0, 0, #zName, {0} } -/* -#define AGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue) \ - {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL), \ - SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xValue,0,#zName, {0}} -#define AGGREGATE2(zName, nArg, arg, nc, xStep, xFinal, extraFlags) \ - {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL)|extraFlags, \ - SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xFinal,0,#zName, {0}} -*/ #define WAGGREGATE(zName, nArg, arg, nc, xStep, xFinal, xValue, xInverse, f) \ {nArg, SQLITE_UTF8|(nc*SQLITE_FUNC_NEEDCOLL)|f, \ SQLITE_INT_TO_PTR(arg), 0, xStep,xFinal,xValue,xInverse,#zName, {0}} From 2e2c8819f1a9008348b9d04b58ecbe5ebf1ead52 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 13 Dec 2019 11:42:56 +0000 Subject: [PATCH 3/3] Ensure that there is a containing SELECT statement when processing a normal aggregate function as if it were a window function. FossilOrigin-Name: c1014e80b26131200a115beb86929a8f0ded2dd65b075e47373346c0f170576a --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/resolve.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 4401393389..2135fb477d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C *Remove*\sthe\smacros,\snot\sjust\scomment\sthem\sout. -D 2019-12-13T11:32:28.253 +C Ensure\sthat\sthere\sis\sa\scontaining\sSELECT\sstatement\swhen\sprocessing\sa\nnormal\saggregate\sfunction\sas\sif\sit\swere\sa\swindow\sfunction. +D 2019-12-13T11:42:56.220 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -525,7 +525,7 @@ F src/pragma.h ec3b31eac9b1df040f1cc8cb3d89bc06605c3b4cb3d76f833de8d6d6c3f77f04 F src/prepare.c 6049beb71385f017af6fc320d2c75a4e50b75e280c54232442b785fbb83df057 F src/printf.c 9be6945837c839ba57837b4bc3af349eba630920fa5532aa518816defe42a7d4 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 -F src/resolve.c acc54d97e7e867a76e4e0fe407589be9a390f579e6a6a36fe4a0f62f7678d4e4 +F src/resolve.c 86a7773d2892227ba9ad1721c41bb03c501830f1bf6de5f78dd0062b82e10c9d F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93 F src/select.c 0fe10579de20eb8dc04ec9ed29659fa782bee2bcc85a35734637f3e2cabc2762 F src/shell.c.in 4a3a9e1c11847b1904f2b01d087af1c052f660902755abab457cab1756817ded @@ -1852,7 +1852,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 3ef0d44edd0354cda9b6237f992cb67a2170ee8f1f464b1f38ac36e3a133bc71 -R c66b26e93f66260bbdfb9270348c2018 +P e5dc2939d3e8694d648fc9b73b1174da5b1349e20fbb9cf1c91268939f308f89 +R e59b82d06383bd505b8273cd5ef0d82d U drh -Z 650bf9c9615ba772561498de4d1519e2 +Z 2895c09312f8773411c5f3c256e1384f diff --git a/manifest.uuid b/manifest.uuid index 56422f5249..179d24fa66 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e5dc2939d3e8694d648fc9b73b1174da5b1349e20fbb9cf1c91268939f308f89 \ No newline at end of file +c1014e80b26131200a115beb86929a8f0ded2dd65b075e47373346c0f170576a \ No newline at end of file diff --git a/src/resolve.c b/src/resolve.c index 85db915cf1..ea8f00244a 100644 --- a/src/resolve.c +++ b/src/resolve.c @@ -967,7 +967,7 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ Select *pSel = pNC->pWinSelect; assert( pWin==pExpr->y.pWin ); if( IN_RENAME_OBJECT==0 ){ - sqlite3WindowUpdate(pParse, pSel->pWinDefn, pWin, pDef); + sqlite3WindowUpdate(pParse, pSel ? pSel->pWinDefn : 0, pWin, pDef); } sqlite3WalkExprList(pWalker, pWin->pPartition); sqlite3WalkExprList(pWalker, pWin->pOrderBy);