Add the ability to disable the Flex-Search optimization using

SQLITE_TESTCTRL_OPTIMIZATION.

FossilOrigin-Name: 5319a55ab2351288261ebf650bca5f18afbfd5a789f01b8976f8f6a1a7b299c0

diff --git a/manifest b/manifest
index 762bfe822517f06e3b15c77f45ea67934bf3edb6..896ace2ea8cf3f249aa9de4125ed97a693236c14 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Generates\scode\sto\simplement\seither\san\sindex\ssearch\sor\sa\stable\sscan,\naccording\sto\sthe\sresults\sof\sthe\sOP_IfUseIndex\sopcode.\s\sBut\sdoes\snot\nalways\swork.\s\sAnd\sthe\sOP_IfUseIndex\sopcode\sis\scurrently\san\sunconditional\n"yes".
-D 2025-06-14T09:54:54.112
+C Add\sthe\sability\sto\sdisable\sthe\sFlex-Search\soptimization\susing\nSQLITE_TESTCTRL_OPTIMIZATION.
+D 2025-06-14T13:18:58.423
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -786,11 +786,11 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c d40fe18d7c2fd0339f5846ffcf7d6809866e380acdf14c76fb2af87e9fe13f64
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 882d739e0d5e6c7a8b46a3cca3ada37fe1a56301f1360d6b141312c666bbe482
-F src/shell.c.in 4ae9ff8e8b23d9a309e50d5b5ef2768b9bb18f748ece2acc2641a3c23b71e2b9
+F src/shell.c.in 51341dda27332052ed6c777994933f0d11ba53e550ac3cfd8768344621765722
 F src/sqlite.h.in 22882ddd3a70751aa8864c81993ee4562ed54c2c508b6270f75e223ffee38e1b
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 0bfd049bb2088cc44c2ad54f2079d1c6e43091a4e1ce8868779b75f6c1484f1e
-F src/sqliteInt.h b3338c0ced9fa0191f849cb81384965e724bd9c850777d2bd3e47d5fb8d7b012
+F src/sqliteInt.h c6e4eb12ecde8bb7b0efdfd30223d8d3bd716f6854d8f5c021f3b921e9c0ba14
 F src/sqliteLimit.h 6d817c28a8f19af95e6f4921933b7fbbca48a962bce0eb0ec81e8bb3ef38e68b
 F src/status.c 0e72e4f6be6ccfde2488eb63210297e75f569f3ce9920f6c3d77590ec6ce5ffd
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
@@ -867,7 +867,7 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c b0f848cfba8dd057f77073493cdd542f9125b4cf87941f53e9d0db21604155c8
 F src/wal.h ba252daaa94f889f4b2c17c027e823d9be47ce39da1d3799886bbd51f0490452
 F src/walker.c d5006d6b005e4ea7302ad390957a8d41ed83faa177e412f89bc5600a7462a014
-F src/where.c d5d828bb94ed9ab45c7223757589e5c6774f253171b599b0e90c124abc99b33d
+F src/where.c 8007b70ca328df72237577503eed9006a24368ff9b1a718ababacb4a2363f01a
 F src/whereInt.h b0c5487551dc7821426cac213fd5c194a558cab9dfd4e130d71f7afa6416463c
 F src/wherecode.c 45adf7743c305a89647f8278a71f3eba27e1d1f002c99cc3685254d7ae9e958f
 F src/whereexpr.c 2415c8eee5ff89a8b709d7d83d71c1ff986cd720d0520057e1d8a5371339012a
@@ -2208,8 +2208,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 40a83da50303fa0dd3fae16f35054ef73e41bd2bb170e8c0558aa6d1143aad8c
-R 4303ee2e6ef511e58293ca96ed66126e
+P 9872df2b85cc19b2993fbe5d1303d902dea6ed825f7f775232ac32bfc4880824
+R abfd8b416c42c89f5fd0df000e3d5ae3
 U drh
-Z 661d2c4124bd4b02a2a7e3ff0595fe13
+Z 369712ad44288b8eff0e585206731d0c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 44061c916af97ed45c501892d10194eecf2f35a0..1e5bbc152d335bb1cdb1814fecbf9afd56654441 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9872df2b85cc19b2993fbe5d1303d902dea6ed825f7f775232ac32bfc4880824
+5319a55ab2351288261ebf650bca5f18afbfd5a789f01b8976f8f6a1a7b299c0

diff --git a/src/shell.c.in b/src/shell.c.in
index f39823b96f95fa4bf7f4045856423a2e563ba7ee..47a80521a92c304b801ca0be5a1036a52f882b06 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -11709,6 +11709,7 @@ static int do_meta_command(char *zLine, ShellState *p){
             { 0x08000000, 1, "OnePass" },
             { 0x10000000, 1, "OrderBySubq" },
             { 0x20000000, 1, "StarQuery" },
+            { 0x40000000, 1, "FlexSearch" },
             { 0xffffffff, 0, "All" },
           };
           unsigned int curOpt;

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 4ca3af8d82eeeb565e0c04749e8fb0e58e5f81e1..7dbffb2f20aee09857591a6f97e2879b8620a645 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1924,6 +1924,7 @@ struct sqlite3 {
 #define SQLITE_OnePass        0x08000000 /* Single-pass DELETE and UPDATE */
 #define SQLITE_OrderBySubq    0x10000000 /* ORDER BY in subquery helps outer */
 #define SQLITE_StarQuery      0x20000000 /* Heurists for star queries */
+#define SQLITE_FlexSearch     0x40000000 /* Maybe scan instead of use index */
 #define SQLITE_AllOpts        0xffffffff /* All optimizations */
 
 /*

diff --git a/src/where.c b/src/where.c
index 337fd41d1d178dcb399903e97420a84a75d2ad88..e02b0e4fa49b9b14dc791bd2b3f7807cb4a1d92d 100644 (file)
--- a/src/where.c
+++ b/src/where.c
@@ -7163,6 +7163,7 @@ WhereInfo *sqlite3WhereBegin(
                                        |WHERE_IDX_ONLY
                                        |WHERE_EXPRIDX))
                && 0!=(pLoop->wsFlags & (WHERE_BOTH_LIMIT|WHERE_CONSTRAINT))
+               && OptimizationEnabled(db, SQLITE_FlexSearch)
         ){
           pLoop->wsFlags |= WHERE_FLEX_SEARCH;
         }