Add the "noquery" argument as an option for the stat column of

sqlite_stat1.  If set, then the index will not be used to optimize a query.
Enhance ANALYZE to set that argument on very low selectivity indexes.

FossilOrigin-Name: e514d3fa83662aa19abefebdda5652e6adb0f0b5a75ad7ee9dd3d2d2c87e03c5

diff --git a/manifest b/manifest
index c875ee5dda2a18bc1d37925d8010ec464f77d1a0..c8a5a8a8203bb93cde8386a1a99bdaaf0a969d7b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Attempt\sto\simprove\sthe\sANALYZE\scommand\sso\sthat\sit\sdoes\sa\sbetter\sjob\sof\ndetecting\slopsided\sindexes\sand\smakes\sappropriate\schanges\sto\sthe\ssqlite_stat1\ntable.
-D 2023-12-29T19:03:01.857
+C Add\sthe\s"noquery"\sargument\sas\san\soption\sfor\sthe\sstat\scolumn\sof\nsqlite_stat1.\s\sIf\sset,\sthen\sthe\sindex\swill\snot\sbe\sused\sto\soptimize\sa\squery.\nEnhance\sANALYZE\sto\sset\sthat\sargument\son\svery\slow\sselectivity\sindexes.
+D 2023-12-29T20:08:43.320
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -670,7 +670,7 @@ F sqlite3.1 acdff36db796e2d00225b911d3047d580cd136547298435426ce9d40347973cc
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F sqlite_cfg.h.in baf2e409c63d4e7a765e17769b6ff17c5a82bbd9cbf1e284fd2e4cefaff3fcf2
 F src/alter.c 30c2333b8bb3af71e4eb9adeadee8aa20edb15917ed44b8422e5cd15f3dfcddc
-F src/analyze.c dd9f25aa96ab1ca1a52743a433fbc53888f41059d909a4360382835414733f82
+F src/analyze.c 803996cd8cb6f030b214b0519b36d0bff8ba21bc85b1127a9d5e7d4f32abee79
 F src/attach.c cc9d00d30da916ff656038211410ccf04ed784b7564639b9b61d1839ed69fd39
 F src/auth.c 19b7ccacae3dfba23fc6f1d0af68134fa216e9040e53b0681b4715445ea030b4
 F src/backup.c 5c97e8023aab1ce14a42387eb3ae00ba5a0644569e3476f38661fa6f824c3523
@@ -2156,11 +2156,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 8d2120c35425081e2158d6a8a6b083c4adf8d694046b2d98f5fd235520920432
-R b58bf97977b7e8d817610de3abc3e459
-T *branch * enhanced-stat1
-T *sym-enhanced-stat1 *
-T -sym-trunk *
+P 4b70b94616ef37bac969051eee3ea6913a28f30520cdd4fc3a19e848f2cf12b7
+R 75c6f66e060d333b8c7cb6dfdfaf830a
 U drh
-Z 87510e89218beaa47ade1953d2d2ed80
+Z f8fd342d34818ee6053befc6b4bca435
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 7b89cb32bf35ee8377f6ab91112c3d70c8be89f2..8c9b3a056afad7127cd8aefdd6ffb01515538ed5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4b70b94616ef37bac969051eee3ea6913a28f30520cdd4fc3a19e848f2cf12b7
\ No newline at end of file
+e514d3fa83662aa19abefebdda5652e6adb0f0b5a75ad7ee9dd3d2d2c87e03c5
\ No newline at end of file

diff --git a/src/analyze.c b/src/analyze.c
index 2c1fbdaac634baebdc657f8dd39913fc0cf3b1b2..fd5eb763064c9ebe4b111db4a98280f90e0450a5 100644 (file)
--- a/src/analyze.c
+++ b/src/analyze.c
@@ -865,12 +865,13 @@ static void statGet(
     */
     sqlite3_str sStat;   /* Text of the constructed "stat" line */
     int i;               /* Loop counter */
+    u64 nRow, iVal = 0;
 
     sqlite3StrAccumInit(&sStat, 0, 0, 0, (p->nKeyCol+1)*100);
-    sqlite3_str_appendf(&sStat, "%llu", 
-        p->nSkipAhead ? (u64)p->nEst : (u64)p->nRow);
+    nRow = p->nSkipAhead ? p->nEst : p->nRow;
+    sqlite3_str_appendf(&sStat, "%llu", nRow);
     for(i=0; i<p->nKeyCol; i++){
-      u64 nDistinct, iVal, mx;
+      u64 nDistinct, mx;
       nDistinct = p->current.anDLt[i] + 1;
       iVal = (p->nRow + nDistinct - 1) / nDistinct;
       mx = p->current.amxEq[i];
@@ -890,6 +891,9 @@ static void statGet(
       sqlite3_str_appendf(&sStat, " %llu", iVal);
       assert( p->current.anEq[i] );
     }
+    if( iVal>=1000 && iVal*10>=1000 ){
+      sqlite3_str_appendf(&sStat, " noquery");
+    }
     sqlite3ResultStrAccum(context, &sStat);
   }
 #ifdef SQLITE_ENABLE_STAT4
@@ -1568,6 +1572,8 @@ static void decodeIntArray(
         pIndex->szIdxRow = sqlite3LogEst(sz);
       }else if( sqlite3_strglob("noskipscan*", z)==0 ){
         pIndex->noSkipScan = 1;
+      }else if( sqlite3_strglob("noquery*", z)==0 ){
+        pIndex->bNoQuery = 1;
       }
 #ifdef SQLITE_ENABLE_COSTMULT
       else if( sqlite3_strglob("costmult=[0-9]*",z)==0 ){