If there is no mention of a table in sqlite_stat1, use OP_Rewind to see if

the table is empty prior to invoking ANALYZE.

FossilOrigin-Name: 0cc93b19de597866292e0696f89fbd0e22a6cbb374678f5cc096fb889210fe3c

diff --git a/manifest b/manifest
index aef3dc3eee0e18d5c93c99f92c70b208ec4cbfaa..0449436b9dec0df2d593d117c14c272562b41ad5 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sPRAGMA\soptimize,\sscale\sback\sthe\sanalysis_limit\swhen\smany\sdifferent\stables\nand\sindexes\smust\sbe\sscanned.
-D 2024-02-19T19:56:40.420
+C If\sthere\sis\sno\smention\sof\sa\stable\sin\ssqlite_stat1,\suse\sOP_Rewind\sto\ssee\sif\nthe\stable\sis\sempty\sprior\sto\sinvoking\sANALYZE.
+D 2024-02-19T20:12:30.657
 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 c72ba9c8b300d713a318e7d199bc1d3f717f961c75de403f8db291841f2f58aa
+F src/pragma.c 280945eb4a7b78c82cd1b4d0bdefbb69af685a654f8fbfeb3bfd7dc8fede5fda
 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 2cf78a5b5fce7f2d49ce185d27f50722c91a1d6c91bbcecebd4bb5244a76769f
-R c2c83408fc346dde3baee32faaf6bad7
+P 636615358aebfef80a657d09f15f608df9e64882b2aaa5574ce31a4f1c71fd70
+R 98db8daafbcb183bee3a0d5c6d6f3dec
 U drh
-Z ec6824937a1b6fb54f3b9fdcf77219f7
+Z 53d562a05375d893c6e8245ccbe9b40a
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index aa9236de910f9a99f46f1bbfec4c7b14ef8cdf18..b4d235c325d67d811c7af7984f3140d21d4874ff 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-636615358aebfef80a657d09f15f608df9e64882b2aaa5574ce31a4f1c71fd70
\ No newline at end of file
+0cc93b19de597866292e0696f89fbd0e22a6cbb374678f5cc096fb889210fe3c
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index 18fc88aceb5db6e714278def1e565df6c193632f..e65233389ed2b1c15bd26b89fc4c7bab849a1caf 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -2486,6 +2486,7 @@ void sqlite3Pragma(
     int nCheck = 0;        /* Number of tables to be optimized */
     int nBtree = 0;        /* Number of btrees to scan */
     int nIndex;            /* Number of indexes on the current table */
+    int hasStat1;          /* True if any STAT1 info available for the table */
 
     if( zRight ){
       opMask = (u32)sqlite3Atoi(zRight);
@@ -2520,10 +2521,13 @@ void sqlite3Pragma(
         ** indicate a new, unanalyzed index
         */
         szThreshold = pTab->nRowLogEst;
+        hasStat1 = (pTab->tabFlags & TF_HasStat1)!=0;
         nIndex = 0;
         for(pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext){
           nIndex++;
-          if( !pIdx->hasStat1 ){
+          if( pIdx->hasStat1 ){
+            hasStat1 = 1;
+          }else{
             szThreshold = -1; /* Always analyze if any index lacks statistics */
             break;
           }
@@ -2555,14 +2559,17 @@ void sqlite3Pragma(
         ** the last analysis.  Unconditional reanalysis if there are
         ** unanalyzed indexes. */
         if( szThreshold>=0 ){
-          LogEst iRange = 33;   /* 10x size change */
+          const LogEst iRange = 33;   /* 10x size change */
           sqlite3OpenTable(pParse, iTabCur, iDb, pTab, OP_OpenRead);
           sqlite3VdbeAddOp4Int(v, OP_IfSizeBetween, iTabCur,
-                         sqlite3VdbeCurrentAddr(v)+3+(opMask&1),
+                         sqlite3VdbeCurrentAddr(v)+2+(opMask&1),
                          szThreshold>=iRange ? szThreshold-iRange : -1,
                          szThreshold+iRange);
-          sqlite3VdbeAddOp1(v, OP_Close, iTabCur);
           VdbeCoverage(v);
+        }else if( !hasStat1 ){
+          sqlite3OpenTable(pParse, iTabCur, iDb, pTab, OP_OpenRead);
+          sqlite3VdbeAddOp2(v, OP_Rewind, iTabCur,
+                         sqlite3VdbeCurrentAddr(v)+2+(opMask&1));
         }
         zSubSql = sqlite3MPrintf(db, "ANALYZE \"%w\".\"%w\"",
                                  db->aDb[iDb].zDbSName, pTab->zName);