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

When converting an aggregate expression to AGG_COLUMN, be sure to remove
the EP_Unlikely flag if it is present.

FossilOrigin-Name: 20c8a9247be2f0c1606e2c79910f28593898054b99adf505b32ac6352ce8e89e
---

diff --git a/manifest b/manifest
index 71de64ad8b..f8bd3be40e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Extend\sdetection\sof\sthe\sINSERT...RETURNING\slocking\scase\sto\sthe\sDB.selectValue(s)/selectArray/selectObject()\sfamily\sof\sfunctions.\sAdd\stests\sfor\sINSERT/UPDATE...RETURNING\swith\sthose\sfunctions.
-D 2023-05-19T18:26:47.289
+C When\sconverting\san\saggregate\sexpression\sto\sAGG_COLUMN,\sbe\ssure\sto\sremove\nthe\sEP_Unlikely\sflag\sif\sit\sis\spresent.
+D 2023-05-23T15:22:25.893
 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 738c3a3d6929f8be66c319bad17f6b297bd60a4eb14006075c48a28487dc7786
+F src/select.c acb558bb719fc141532ece116fecefeb896e5f4986ed70fbbe1acda4294a4c5f
 F src/shell.c.in 2c8cc2a0b01daf00767b53bb073324e2a0ce50df6c01dc751389403100b9ef1d
 F src/sqlite.h.in c14a4471fcd897a03631ac7ad3d05505e895e7b6419ec5b96cae9bc4df7a9fc6
 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,9 +2070,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 15f105c78268fb68a4713da444452f5d7b038019b21024302beebb6b26ff2244
-Q +3181c50540df0eff6cb5db79bb477c469bb7b73b0692260ba600db200fcef4ac
-R 255aefb056e6f5fa89c80babe2fa8ea0
-U stephan
-Z 16b2d82f739f5c9e4447cdf3cf087aaf
+P 58be212d56d7601e270eb11c77c8371db7507a0a19d4febf1d6c0cd87c0b1016
+Q +48e65f18b2ebbe786e84e208f2c6c68de6067ba86912fea5a120fd41d0af2184
+R f8324fc1c3fcdd275515625c63a3c22f
+U drh
+Z 62a0520fbc54cb1aaf9c7a227e350b92
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index dd39de0c78..887a43f8b3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-58be212d56d7601e270eb11c77c8371db7507a0a19d4febf1d6c0cd87c0b1016
\ No newline at end of file
+20c8a9247be2f0c1606e2c79910f28593898054b99adf505b32ac6352ce8e89e
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index f32db2c2a0..5176d59615 100644
--- a/src/select.c
+++ b/src/select.c
@@ -6534,7 +6534,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