From: mistachkin <mistachkin@noemail.net>
Date: Mon, 3 Jun 2019 13:53:29 +0000 (+0000)
Subject: Fix the count-of-view optimization so that it is (correctly) disabled for a query... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4c1a518e5676f3401e7fec3a727d10a66fdc364;p=thirdparty%2Fsqlite.git

Fix the count-of-view optimization so that it is (correctly) disabled for a query that includes a WHERE clause or a GROUP BY clause.  Cherrypick of [05897ca48a40c6771].

FossilOrigin-Name: 583e5a0ab6bdf3ce3d76852089160a8d11df4c3dd151050a70997b3720c3d538
---

diff --git a/manifest b/manifest
index b62db98ca1..b45d78948b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\ssimplification\sof\sNULL\svalue\shandling\sfor\sSTAT4.\s\sCherrypick\sof\s[69bad9257f8db6a2]\sfrom\strunk.
-D 2019-04-23T15:21:00.287
+C Fix\sthe\scount-of-view\soptimization\sso\sthat\sit\sis\s(correctly)\sdisabled\sfor\sa\squery\sthat\sincludes\sa\sWHERE\sclause\sor\sa\sGROUP\sBY\sclause.\s\sCherrypick\sof\s[05897ca48a40c6771].
+D 2019-06-03T13:53:29.317
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -518,7 +518,7 @@ F src/printf.c 67f79227273a9009d86a017619717c3f554f50b371294526da59faa6014ed2cd
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 567888ee3faec14dae06519b4306201771058364a37560186a3e0e755ebc4cb8
 F src/rowset.c d977b011993aaea002cab3e0bb2ce50cf346000dff94e944d547b989f4b1fe93
-F src/select.c 9263f5c30dd44c7ac2eb29f40a7ec64322a96885b71c00de6bc30b756c2e1c49
+F src/select.c d9a1a0b21a85fdcc2000a38381ac551abe810f2409352c60bad6e7e122a91372
 F src/shell.c.in c1986496062f9dba4ed5b70db06b5e0f32e1954cdcfab0b30372c6c186796810
 F src/sqlite.h.in 38390767acc1914d58930e03149595ee4710afa4e3c43ab6c3a8aea3f1a6b8cd
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
@@ -765,7 +765,7 @@ F test/corruptK.test 5b4212fe346699831c5ad559a62c54e11c0611bdde1ea8423a091f9c01a
 F test/corruptL.test a569f3cece872a1f21568bd5378f55ce5c365c50845a06fae65a2721cce62264
 F test/cost.test 51f4fcaae6e78ad5a57096831259ed6c760e2ac6876836e91c00030fad385b34
 F test/count.test cb2e0f934c6eb33670044520748d2ecccd46259c
-F test/countofview.test e3d4cd6900e4e4f074968ab24b8b87d3671cd624961bef40fd3a6b8f574343cf
+F test/countofview.test e17d6e6688cf74f22783c9ec6e788c0790ee4fbbaee713affd00b1ac0bb39b86
 F test/coveridxscan.test 5ec98719a2e2914e8908dc75f7247d9b54a26df04625f846ac7900d5483f7296
 F test/crash.test fb9dc4a02dcba30d4aa5c2c226f98b220b2b959f
 F test/crash2.test 5b14d4eb58b880e231361d3b609b216acda86651
@@ -1818,11 +1818,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 884b4b7e502b4e991677b53971277adfaf0a04a284f8e483e2553d0f83156b50
-Q +69bad9257f8db6a2a761bdd298d972eb48d4f845ec11dedc802ba3bafb979915
-R 2de37cd24f2ad3bf37b8e18909c02d08
-T *branch * branch-3.28
-T *sym-branch-3.28 *
-T -sym-trunk *
+P 442c177dc444d614e8a665cfb62c4576cbf1002ed147dc272cea4e80cd9b92b4
+Q +05897ca48a40c6771ff83ba8ecc3a5c60dafddf58651c222dd8cf89b9fc7b077
+R 35cd636938ff9dc80d52e6019e14c325
 U mistachkin
-Z 1aa7165f44d1a77e48593cc1ad610fa8
+Z cc5bdb18bd081d93fb6e2947dcf93916
diff --git a/manifest.uuid b/manifest.uuid
index 34135badf9..8ce7952fec 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-442c177dc444d614e8a665cfb62c4576cbf1002ed147dc272cea4e80cd9b92b4
\ No newline at end of file
+583e5a0ab6bdf3ce3d76852089160a8d11df4c3dd151050a70997b3720c3d538
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 7d8a425416..dff2b2b72d 100644
--- a/src/select.c
+++ b/src/select.c
@@ -5506,7 +5506,8 @@ static struct SrcList_item *isSelfJoinView(
 **   *  The subquery is a UNION ALL of two or more terms
 **   *  The subquery does not have a LIMIT clause
 **   *  There is no WHERE or GROUP BY or HAVING clauses on the subqueries
-**   *  The outer query is a simple count(*)
+**   *  The outer query is a simple count(*) with no WHERE clause or other
+**      extraneous syntax.
 **
 ** Return TRUE if the optimization is undertaken.
 */
@@ -5517,6 +5518,8 @@ static int countOfViewOptimization(Parse *pParse, Select *p){
   sqlite3 *db;
   if( (p->selFlags & SF_Aggregate)==0 ) return 0;   /* This is an aggregate */
   if( p->pEList->nExpr!=1 ) return 0;               /* Single result column */
+  if( p->pWhere ) return 0;
+  if( p->pGroupBy ) return 0;
   pExpr = p->pEList->a[0].pExpr;
   if( pExpr->op!=TK_AGG_FUNCTION ) return 0;        /* Result is an aggregate */
   if( sqlite3_stricmp(pExpr->u.zToken,"count") ) return 0;  /* Is count() */
diff --git a/test/countofview.test b/test/countofview.test
index 5f892ee274..0ee511ff34 100644
--- a/test/countofview.test
+++ b/test/countofview.test
@@ -40,4 +40,17 @@ do_execsql_test 1.3 {
   )
 } {3}
 
+# 2019-05-15
+do_execsql_test 2.0 {
+  CREATE TABLE t1(x);
+  INSERT INTO t1 VALUES(1),(99),('abc');
+  CREATE VIEW v1(x,y) AS SELECT x,1 FROM t1 UNION ALL SELECT x,2 FROM t1;
+  SELECT count(*) FROM v1 WHERE x<>1;
+} {4}
+do_execsql_test 2.1 {
+  SELECT count(*) FROM v1 GROUP BY y;
+} {3 3}
+
+
+
 finish_test