Fix an adverse interaction between the new aggregate ORDER BY logic and the

expression compressor.

FossilOrigin-Name: f371e4c0f8ea73aee9ea0645f396e3da20f1eb97be34c83de9d94c9cbb959934

diff --git a/manifest b/manifest
index 2ec42087c4aee19fb80d7f4c2a8fd3dbd4306b3c..ee9b2d6e440bf602b8b530a81a588e2ff7b1a229 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sTreeView\slogic\s(used\sfor\sdebugging\sonly)\sdo\snot\sshow\sunnecessary\sfields\nof\sthe\sWindow\sobject\swhen\sa\sfunction\shas\sa\sFILTER.
-D 2023-10-19T19:08:33.080
+C Fix\san\sadverse\sinteraction\sbetween\sthe\snew\saggregate\sORDER\sBY\slogic\sand\sthe\nexpression\scompressor.
+D 2023-10-19T19:19:59.307
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -668,7 +668,7 @@ F src/date.c eebc54a00e888d3c56147779e9f361b77d62fd69ff2008c5373946aa1ba1d574
 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782
 F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43
 F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500
-F src/expr.c 7650672b74f1a5e944f93a47b2d21bef23cc2331103ffbf4bcdaa13624354f38
+F src/expr.c 18a23aeeb4f0f1999163c273a823e7812a179de110025d07f6db58cfd9d3ddf0
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c a7fcbf7e66d14dbb73cf49f31489ebf66d0e6006c62b95246924a3bae9f37b36
 F src/func.c e8d7b3587a225f4f1116f720b72090511fe9feb936e960bd26a053cea6a17a63
@@ -2133,8 +2133,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 2875dcb1ac86db2704ad377d719f308c8837e196b49c98b20ceda1324f2d27ea
-R 45852c93d35e0d900ce3d50d808ec604
+P d2c6b82c346dbf39e07f09d187e4a8216a56caa7df3dcfafc82e32f676a1db8a
+R 9da72bfce06dbb3400677ef0c3b1a035
 U drh
-Z 4a6691c4f5ab92ae34d088813bdd99dd
+Z c6070fdc6625bfd39e8b2f9924ac4aea
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 95865b7d3213b089ae8c39a8a7f42018adf7fedd..002a508a441a92ff4e61b635b18b7a15dcad9a3c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d2c6b82c346dbf39e07f09d187e4a8216a56caa7df3dcfafc82e32f676a1db8a
\ No newline at end of file
+f371e4c0f8ea73aee9ea0645f396e3da20f1eb97be34c83de9d94c9cbb959934
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index cc0b0dacc09fd5687ca15552202ffbba314f14d0..2dcba6e5240b4914d28c067b9ff80e2b6ba7afc4 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1572,7 +1572,7 @@ static Expr *exprDup(sqlite3 *db, const Expr *p, int dupFlags, u8 **pzBuffer){
     staticFlag = EP_Static;
     assert( zAlloc!=0 );
   }else{
-    zAlloc = sqlite3DbMallocRawNN(db, dupedExprSize(p, dupFlags));
+    zAlloc = sqlite3DbMallocRawNN(db, dupedExprSize(p, dupFlags)*5);
     staticFlag = 0;
   }
   pNew = (Expr *)zAlloc;
@@ -1622,7 +1622,8 @@ static Expr *exprDup(sqlite3 *db, const Expr *p, int dupFlags, u8 **pzBuffer){
       if( ExprUseXSelect(p) ){
         pNew->x.pSelect = sqlite3SelectDup(db, p->x.pSelect, dupFlags);
       }else{
-        pNew->x.pList = sqlite3ExprListDup(db, p->x.pList, dupFlags);
+        pNew->x.pList = sqlite3ExprListDup(db, p->x.pList,
+                           p->op!=TK_ORDER ? dupFlags : 0);
       }
     }