Disable the [d1ba200234f40b84|count-of-view optimization] if any subquery

is DISTINCT, as the optimization does not work in that case.

FossilOrigin-Name: bae270b988139e070ac52fe8e12ddb946ae9c3be6d4229dfb3169ddc6ed6b121

diff --git a/manifest b/manifest
index 12e8953a9a77ce1741c559b09883dd03a10e0b96..a5d32e5c14f75f91ed9313ea9885b2a087122e47 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sbuild\sby\srerunning\stest/mkpragmatab.tcl.
-D 2025-03-10T10:36:50.186
+C Disable\sthe\s[d1ba200234f40b84|count-of-view\soptimization]\sif\sany\ssubquery\nis\sDISTINCT,\sas\sthe\soptimization\sdoes\snot\swork\sin\sthat\scase.
+D 2025-03-10T10:39:52.802
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -780,7 +780,7 @@ F src/printf.c 96f7f8baeedc7639da94e4e7a4a2c200e2537c4eec9e5e1c2ffc821f40eb3105
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c c8a5372b97b2a2e972a280676f06ddb5b74e885d3b1f5ce383f839907b57ef68
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
-F src/select.c 83e88fbb36f89b6703b348777491619554f0fd6f917c9fdf51e4c2e9cda6c04e
+F src/select.c cf91234ef909e0f9550a7ce649ec1d6dccdd6f680468eb8cc08eb4719bcf1200
 F src/shell.c.in b377a59822f207106424f08aead37e78b609222e98f86f04cc8a03563ccf3237
 F src/sqlite.h.in d2902f13ace94d3d3609646bd6d12a2d7a4f6cbdf6a5a4097580ac305f54c3f0
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -2209,8 +2209,9 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 47fe1c59787ffbd1558f7663fd65976b57c2f7c91df8b578d504e980f3a12380
-R c0e8461bc1d49f0c66deb3a43d2c46be
+P 167d6314c5125c79a9f147b36de2d1c65f99ec5462c90742c436e872f3ac8fdf
+Q +d7013b63932b2f5750572ae6bdd259a2b6e6548c20fb9a5559edd22d2f2fc6cb
+R b4d41f32d749d9481bd68c2f8af0de8a
 U drh
-Z 8d88d9b32dad8a74c69ad24d18cb19a6
+Z 111e7e39dc2c6504be378be8bf3293e0
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f00f5a5650393368f135a5eda1a2e81753c91150..df39d046a3564b7f5f95f929508c6a9b7de4587f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-167d6314c5125c79a9f147b36de2d1c65f99ec5462c90742c436e872f3ac8fdf
+bae270b988139e070ac52fe8e12ddb946ae9c3be6d4229dfb3169ddc6ed6b121

diff --git a/src/select.c b/src/select.c
index cf25c8e678e7b82777e4f613b3e6da930a0f6bf9..e2bf4ded085413e6a9fa17843032e0e7e7cb112d 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -7178,6 +7178,7 @@ static void agginfoFree(sqlite3 *db, void *pArg){
 **   *  There is no WHERE or GROUP BY or HAVING clauses on the subqueries
 **   *  The outer query is a simple count(*) with no WHERE clause or other
 **      extraneous syntax.
+**   *  None of the subqueries are DISTINCT (forumpost/a860f5fb2e 2025-03-10)
 **
 ** Return TRUE if the optimization is undertaken.
 */
@@ -7210,7 +7211,11 @@ static int countOfViewOptimization(Parse *pParse, Select *p){
     if( pSub->op!=TK_ALL && pSub->pPrior ) return 0;  /* Must be UNION ALL */
     if( pSub->pWhere ) return 0;                      /* No WHERE clause */
     if( pSub->pLimit ) return 0;                      /* No LIMIT clause */
-    if( pSub->selFlags & SF_Aggregate ) return 0;     /* Not an aggregate */
+    if( pSub->selFlags & (SF_Aggregate|SF_Distinct) ){
+       testcase( pSub->selFlags & SF_Aggregate );
+       testcase( pSub->selFlags & SF_Distinct );
+       return 0;     /* Not an aggregate nor DISTINCT */
+    }
     assert( pSub->pHaving==0 );  /* Due to the previous */
     pSub = pSub->pPrior;                              /* Repeat over compound */
   }while( pSub );