Query planner identifies loops where it might be advantageous to check

the number of matching rows and fall back to a full table scan if the
number of matching rows is large.

FossilOrigin-Name: 87fd19925752b52c767e1202f297a8ec24a6a9ab3d741b6af216b6ad5abd59d5

diff --git a/manifest b/manifest
index cf6ef0c7b8feba855300a8afde640ddac2f82168..78dd8ffed1703661059e270b0ca6c8d4867899df 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sunnecessary\swhitespace\sand\sotherwise\simprove\scomments\sin\sthe\nwherecode.c\smodule.\s\sNo\scoding\schanges.
-D 2025-06-06T23:10:18.761
+C Query\splanner\sidentifies\sloops\swhere\sit\smight\sbe\sadvantageous\sto\scheck\nthe\snumber\sof\smatching\srows\sand\sfall\sback\sto\sa\sfull\stable\sscan\sif\sthe\nnumber\sof\smatching\srows\sis\slarge.
+D 2025-06-07T16:45:05.884
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -867,9 +867,9 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b0f848cfba8dd057f77073493cdd542f9125b4cf87941f53e9d0db21604155c8
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
-F src/where.c 45a3b496248a0b36d91ce34da3278d54f8fa20e9d3fbd36d45a42051d1118137
-F src/whereInt.h ecdbfb5551cf394f04ec7f0bc7ad963146d80eee3071405ac29aa84950128b8e
-F src/wherecode.c 9710e62379c000189476404f923d4d1b192d0def222fdd287b820cc085a0d555
+F src/where.c e20d6cf7de2be13fa9f41ba5e499e183319e4cc56202999146085303a5c4eb63
+F src/whereInt.h b0c5487551dc7821426cac213fd5c194a558cab9dfd4e130d71f7afa6416463c
+F src/wherecode.c b608a9e2e71893bfd2617f354fda0201be521844a0330a53fdc0c490cd80c3a6
 F src/whereexpr.c 2415c8eee5ff89a8b709d7d83d71c1ff986cd720d0520057e1d8a5371339012a
 F src/window.c d01227141f622f24fbe36ca105fbe6ef023f9fd98f1ccd65da95f88886565db5
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -2208,8 +2208,11 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P aba5c3135edf7de2798ad808fa0ff176fdba3f4a9b101f1f4210b441cba8e75d
-R ac8b37a15d3a3e6abc2fa2a5739fae73
+P 2eb4e9bf0f2df50324a62fb272a92bbd931b8b4e4b35bac0c05b676c97b61339
+R 16380748532d26bf641e586e366b9cf8
+T *branch * flex-search
+T *sym-flex-search *
+T -sym-trunk *
 U drh
-Z 4dedbf1c2e3e515d1e9ff6981d7bf8bf
+Z f1c85fb7c5dc19e9a0264b78dab792cf
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 8a1704eb92ffc8364414bd66cfa8b81f80f0474e..5b00ba6a7f7681d9790e716713b99106a7da4a56 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2eb4e9bf0f2df50324a62fb272a92bbd931b8b4e4b35bac0c05b676c97b61339
+87fd19925752b52c767e1202f297a8ec24a6a9ab3d741b6af216b6ad5abd59d5

diff --git a/src/where.c b/src/where.c
index 9561a75eadb1638db183f3cc8011520c983031fc..647486ac5481071f41e9832e507b9532f392ef08 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -7158,6 +7158,8 @@ WhereInfo *sqlite3WhereBegin(
           wherePartIdxExpr(
               pParse, pIx, pIx->pPartIdxWhere, 0, iIndexCur, pTabItem
           );
+        }else if( pIx->aiRowLogEst[pLoop->u.btree.nEq]>65 ){
+          pLoop->wsFlags |= WHERE_FLEX_SEARCH;
         }
       }
       pLevel->iIdxCur = iIndexCur;

diff --git a/src/whereInt.h b/src/whereInt.h
index 40a720ab9e8129d577c8155b1f0605502ecc39db..1799a2757b3ee5b0fd89258920e227b5d3e61a97 100644 (file)
--- a/src/whereInt.h
+++ b/src/whereInt.h
@@ -660,5 +660,6 @@ void sqlite3WhereTabFuncArgs(Parse*, SrcItem*, WhereClause*);
 #define WHERE_COROUTINE    0x02000000  /* Implemented by co-routine.
                                        ** NB: False-negatives are possible */
 #define WHERE_EXPRIDX      0x04000000  /* Uses an index-on-expressions */
+#define WHERE_FLEX_SEARCH  0x08000000  /* Maybe decide to SCAN at runtime */
 
 #endif /* !defined(SQLITE_WHEREINT_H) */

diff --git a/src/wherecode.c b/src/wherecode.c
index 9581ac389145875125550fa24f15289980ca8026..a59712077619f81a4d6eb0b7f76f953ec5644574 100644 (file)
--- a/src/wherecode.c
+++ b/src/wherecode.c
@@ -149,7 +149,14 @@ void sqlite3WhereAddExplainText(
 
     sqlite3StrAccumInit(&str, db, zBuf, sizeof(zBuf), SQLITE_MAX_LENGTH);
     str.printfFlags = SQLITE_PRINTF_INTERNAL;
-    sqlite3_str_appendf(&str, "%s %S", isSearch ? "SEARCH" : "SCAN", pItem);
+#if 0
+    if( (flags & WHERE_FLEX_SEARCH)!=0 && isSearch ){
+      sqlite3_str_appendf(&str, "FLEX-SEARCH %S", pItem);
+    }else
+#endif
+    {
+      sqlite3_str_appendf(&str, "%s %S", isSearch ? "SEARCH" : "SCAN", pItem);
+    }
     if( (flags & (WHERE_IPK|WHERE_VIRTUALTABLE))==0 ){
       const char *zFmt = 0;
       Index *pIdx;