Another simplification of the PRAGMA optimize logic for improved coverage.

FossilOrigin-Name: 6c5a0c85454e3c658e51fab611c169c034447174022eebc52fd8619b528a4765

diff --git a/manifest b/manifest
index 007c09ab9bb35864ee16ba7a53fa30cb1213d709..e83a2aea801a845f1bcc9d915763243bd156c267 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\sfixes.
-D 2024-02-19T23:58:26.332
+C Another\ssimplification\sof\sthe\sPRAGMA\soptimize\slogic\sfor\simproved\scoverage.
+D 2024-02-20T12:14:07.075
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -732,7 +732,7 @@ F src/parse.y bfd6da46fc895cd8237400ff485d04ab0b32e47eb56de20982bb7f53e56c1f42
 F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
-F src/pragma.c 613d27816d26e9db585fd4a34a627cfb436dc5b63edd73546b0fdaacdfa33772
+F src/pragma.c cc9ccfde12caf4db782332dc7edd6c0aaf0bfa9bb8c0bff86a3f138521f11b27
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
 F src/printf.c d3392b2a20ee314ddeef34fb43c904bf4619eb20ff9a9e07e3950a7e4dcd6912
@@ -2162,8 +2162,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 91302d9b2720d6b5184e1c24db55d351544adfde4b3d2ddcdc1561f79f11985a
-R f5703f8a3a60803127fbc9cadd6a43fe
+P ed5afebc410e3d430e2428d35f027bffb218e5f11036a42f97b080153e89016e
+R 1d7e6aefb784a3b060fc17ebc00f9588
 U drh
-Z 926161dae17b79fd58ce2e39147c492e
+Z 39fd458c30bb322f77d1633b20055bca
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 51dda072149562ab57f1ce1fb1a7a4c7322348a8..a30b6b20819cb9839d25febd050b88284455df33 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ed5afebc410e3d430e2428d35f027bffb218e5f11036a42f97b080153e89016e
\ No newline at end of file
+6c5a0c85454e3c658e51fab611c169c034447174022eebc52fd8619b528a4765
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index ca34e80af0a1c113a535459532266072475385e5..877fb3f72155d03111519357e463c13e3c6d0b10 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -2557,16 +2557,15 @@ void sqlite3Pragma(
         /* Reanalyze if the table is 10 times larger or smaller than
         ** the last analysis.  Unconditional reanalysis if there are
         ** unanalyzed indexes. */
+        sqlite3OpenTable(pParse, iTabCur, iDb, pTab, OP_OpenRead);
         if( szThreshold>=0 ){
           const LogEst iRange = 33;   /* 10x size change */
-          sqlite3OpenTable(pParse, iTabCur, iDb, pTab, OP_OpenRead);
           sqlite3VdbeAddOp4Int(v, OP_IfSizeBetween, iTabCur,
                          sqlite3VdbeCurrentAddr(v)+2+(opMask&1),
                          szThreshold>=iRange ? szThreshold-iRange : -1,
                          szThreshold+iRange);
           VdbeCoverage(v);
-        }else if( !hasStat1 ){
-          sqlite3OpenTable(pParse, iTabCur, iDb, pTab, OP_OpenRead);
+        }else{
           sqlite3VdbeAddOp2(v, OP_Rewind, iTabCur,
                          sqlite3VdbeCurrentAddr(v)+2+(opMask&1));
           VdbeCoverage(v);