Remove obsolete bits from the bitvector that defines disabled optimizations

in the SQLITE_TESTCTRL_OPTIMIZATIONS verb of sqlite3_test_control().

FossilOrigin-Name: 4c21ee2d26466f83dec525153e2b1506bd956701

diff --git a/manifest b/manifest
index 92fce0dba098a20808d1e663ce1e5b33e0d5c777..423fd99e018ef66bc685f419f51cb18cf4268dc4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sunnecessary\sparameter\sfrom\ssqlite3Utf8Read()\sresulting\sin\sa\sslight\nperformance\sincrease.
-D 2012-09-17T18:56:32.167
+C Remove\sobsolete\sbits\sfrom\sthe\sbitvector\sthat\sdefines\sdisabled\soptimizations\nin\sthe\sSQLITE_TESTCTRL_OPTIMIZATIONS\sverb\sof\ssqlite3_test_control().
+D 2012-09-17T19:12:39.992
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -179,12 +179,12 @@ F src/shell.c 87953c5d9c73d9494db97d1607e2e2280418f261
 F src/sqlite.h.in d1071b0fc6de9a0d11392bc01305803122c3ec61
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h 6904f4aadf976f95241311fbffb00823075d9477
-F src/sqliteInt.h 3f2ed42529ad54561e6c8d565afbfc9bca27da9d
+F src/sqliteInt.h 1228a3d21694dc08e019735b1a5634e5764d11ea
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 35939e7e03abf1b7577ce311f48f682c40de3208
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 F src/tclsqlite.c e4de2458b3ef38fdd0498bc4e5ea5367a241b0f3
-F src/test1.c 3d70f7c5987f186884cfebbfa7151a7d3d67d86e
+F src/test1.c 1ad391d930ff94404768f0ca3c08936f74544fa2
 F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf
 F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d
 F src/test4.c bf9fa9bece01de08e6f5e02314e4af5c13590dfa
@@ -1013,7 +1013,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 45793f0b844fee7445bc9269b403f89a58f77150
-R 8cd942fbb7e8235e37ae22bd18b6fe8b
+P 8b962c94a2f829f71efdd0ca770469b02feea3e1
+R 67168a23b15c492a24fe7dbe4ad81c6a
 U drh
-Z af8c124e8114c6e290ead5d3153e615a
+Z 95f03cf63c4263171e5518be35ff05c6

diff --git a/manifest.uuid b/manifest.uuid
index 0019e1e8233d595461dc2cc58e024ff3d94646b5..d1f3d5acfc01262530523344107b95d944e52511 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8b962c94a2f829f71efdd0ca770469b02feea3e1
\ No newline at end of file
+4c21ee2d26466f83dec525153e2b1506bd956701
\ No newline at end of file

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index ccd12451ed8e573a2290a2128a6379a4229bc290..b0135f44c9ac4c77331964fd013d9747f80ae20f 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -962,16 +962,13 @@ struct sqlite3 {
 ** sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS,...) interface.
 ** These must be the low-order bits of the flags field.
 */
-#define SQLITE_QueryFlattener 0x01        /* Disable query flattening */
-#define SQLITE_ColumnCache    0x02        /* Disable the column cache */
-#define SQLITE_IndexSort      0x04        /* Disable indexes for sorting */
-#define SQLITE_IndexSearch    0x08        /* Disable indexes for searching */
-#define SQLITE_IndexCover     0x10        /* Disable index covering table */
-#define SQLITE_GroupByOrder   0x20        /* Disable GROUPBY cover of ORDERBY */
-#define SQLITE_FactorOutConst 0x40        /* Disable factoring out constants */
-#define SQLITE_IdxRealAsInt   0x80        /* Store REAL as INT in indices */
-#define SQLITE_DistinctOpt    0x80        /* DISTINCT using indexes */
-#define SQLITE_OptMask        0xff        /* Mask of all disablable opts */
+#define SQLITE_QueryFlattener 0x01   /* Disable query flattening */
+#define SQLITE_ColumnCache    0x02   /* Disable the column cache */
+#define SQLITE_GroupByOrder   0x04   /* Disable GROUPBY cover of ORDERBY */
+#define SQLITE_FactorOutConst 0x08   /* Disable factoring out constants */
+#define SQLITE_IdxRealAsInt   0x10   /* Store REAL as INT in indices */
+#define SQLITE_DistinctOpt    0x20   /* DISTINCT using indexes */
+#define SQLITE_OptMask        0xff   /* Mask of all disablable opts */
 
 /*
 ** Possible values for the sqlite.magic field.

diff --git a/src/test1.c b/src/test1.c
index c3dac062123dad3658a4d5f6589996e6879e6d7e..55e2df5534a0b589216b35a9e1f634dc3f627c22 100644 (file)
--- a/src/test1.c
+++ b/src/test1.c
@@ -5936,12 +5936,10 @@ static int optimization_control(
     { "all",              SQLITE_OptMask        },
     { "query-flattener",  SQLITE_QueryFlattener },
     { "column-cache",     SQLITE_ColumnCache    },
-    { "index-sort",       SQLITE_IndexSort      },
-    { "index-search",     SQLITE_IndexSearch    },
-    { "index-cover",      SQLITE_IndexCover     },
     { "groupby-order",    SQLITE_GroupByOrder   },
     { "factor-constants", SQLITE_FactorOutConst },
     { "real-as-int",      SQLITE_IdxRealAsInt   },
+    { "distinct-opt",     SQLITE_DistinctOpt    },
   };
 
   if( objc!=4 ){