From: drh <>
Date: Tue, 23 May 2023 15:16:20 +0000 (+0000)
Subject: When converting an aggregate expression to AGG_COLUMN, be sure to remove
X-Git-Tag: version-3.43.0~249
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ddf6b27579ee485cfd1bab7208d7a99c4a03aa90;p=thirdparty%2Fsqlite.git

When converting an aggregate expression to AGG_COLUMN, be sure to remove
the EP_Unlikely flag if it is present.
[forum:/info/fbfe330a2009d036|Forum post fbfe330a2009d036].

FossilOrigin-Name: 48e65f18b2ebbe786e84e208f2c6c68de6067ba86912fea5a120fd41d0af2184
---

diff --git a/manifest b/manifest
index d6f82fdd0f..3ddd1f31b5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sbuffer\soverread\sin\sthe\srecovery\sextension\sthat\smight\soccur\son\s32-bit\splatforms.
-D 2023-05-23T14:05:02.575
+C When\sconverting\san\saggregate\sexpression\sto\sAGG_COLUMN,\sbe\ssure\sto\sremove\nthe\sEP_Unlikely\sflag\sif\sit\sis\spresent.\n[forum:/info/fbfe330a2009d036|Forum\spost\sfbfe330a2009d036].
+D 2023-05-23T15:16:20.507
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -636,7 +636,7 @@ F src/printf.c b9320cdbeca0b336c3f139fd36dd121e4167dd62b35fbe9ccaa9bab44c0af38d
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 0937f89a8a020833eaca73a8c9e7661bfbf9b52905520a77993b9ce683dfbccb
+F src/select.c 899d5313955e7d187bbc01e32c1ba81d145f48e4e24d0f161d63af8c243b1511
 F src/shell.c.in 29357bf9001c4dd977c2ce6cf55dcedd82f539c17654d15cd779fe429ceb169d
 F src/sqlite.h.in 8e0265e42d7695d86a0b8c7de9979e6c29edc2c616fa5eea11b682a6af838c7c
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -1920,7 +1920,7 @@ F test/win32heap.test 10fd891266bd00af68671e702317726375e5407561d859be1aa04696f2
 F test/win32lock.test e0924eb8daac02bf80e9da88930747bd44dd9b230b7759fed927b1655b467c9c
 F test/win32longpath.test 4baffc3acb2e5188a5e3a895b2b543ed09e62f7c72d713c1feebf76222fe9976
 F test/win32nolock.test ac4f08811a562e45a5755e661f45ca85892bdbbc
-F test/window1.test 5ba48e9d33231e6ef16f21426bade9ccc52abf65a10587bff90a6c14fe174594
+F test/window1.test 1e7e13d36235b9a08fcb9790f2b05383f2f8c9538532b027f455766686926114
 F test/window2.tcl 492c125fa550cda1dd3555768a2303b3effbeceee215293adf8871efc25f1476
 F test/window2.test e466a88bd626d66edc3d352d7d7e1d5531e0079b549ba44efb029d1fbff9fd3c
 F test/window3.tcl acea6e86a4324a210fd608d06741010ca83ded9fde438341cb978c49928faf03
@@ -2070,8 +2070,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 cec49c7d93362f527f0b4744cd1ae95d44a79671d49d69baa77fda70be29f7e8
-R d92aff5b47c8b0d809c583bb2242a746
-U dan
-Z bbabe97c5c83c968f15d1eeeeb40b68e
+P ff4a9a2b59657116da99c748ada19dbc64b7d0fd4c920e1c517d8bda3466f06b
+R 1d36d6eb37720852889dc90f522b8c2a
+U drh
+Z d0738cc1991616acfbc67f71ce00ac8b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 659fc6c7ad..3c549a814a 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ff4a9a2b59657116da99c748ada19dbc64b7d0fd4c920e1c517d8bda3466f06b
\ No newline at end of file
+48e65f18b2ebbe786e84e208f2c6c68de6067ba86912fea5a120fd41d0af2184
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 3eeb53c075..755c317c95 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6537,7 +6537,7 @@ static int aggregateIdxEprRefToColCallback(Walker *pWalker, Expr *pExpr){
   pExpr->op = TK_AGG_COLUMN;
   pExpr->iTable = pCol->iTable;
   pExpr->iColumn = pCol->iColumn;
-  ExprClearProperty(pExpr, EP_Skip|EP_Collate);
+  ExprClearProperty(pExpr, EP_Skip|EP_Collate|EP_Unlikely);
   return WRC_Prune;
 }
 
diff --git a/test/window1.test b/test/window1.test
index 783a739e3f..37a5183f90 100644
--- a/test/window1.test
+++ b/test/window1.test
@@ -2363,4 +2363,17 @@ do_execsql_test 76.5 {
   SELECT (SELECT max(y)+sum(0) OVER ()) FROM t3 LEFT JOIN t4 ON x=y GROUP BY x;
 } {100 {} 400}
 
+# 2023-05-23 https://sqlite.org/forum/forumpost/fbfe330a20
+#
+reset_db
+do_execsql_test 77.1 {
+  CREATE TABLE t1(x INT);
+  CREATE INDEX t1x ON t1(likely(x));
+  INSERT INTO t1 VALUES(1),(2),(4),(8);
+}
+do_execsql_test 77.2 {
+  SELECT max(~likely(x)) FILTER (WHERE true) FROM t1 INDEXED BY t1x GROUP BY x;
+} {-2 -3 -5 -9}
+
+
 finish_test