Add the SQLITE_DEFAULT_ROWEST compile-time option for changing the estimated

number of rows in tables that lack sqlite_stat1 entries.

FossilOrigin-Name: 802b82f342328762e3995825aed1b22e61361ef24b673cd5d66b55756ce2a461

diff --git a/manifest b/manifest
index 20d99a946429c574fd105db56663b8d66854a3c2..bec6e52361f82377412b12c808036a69f7c360e7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\sSTAT4\sequality\sestimation\sfor\smulti-column\sindexes\nintroduced\sby\scheck-in\s[3e0590dee0e68cc1599].
-D 2017-05-24T04:32:09.002
+C Add\sthe\sSQLITE_DEFAULT_ROWEST\scompile-time\soption\sfor\schanging\sthe\sestimated\nnumber\sof\srows\sin\stables\sthat\slack\ssqlite_stat1\sentries.
+D 2017-06-06T18:22:05.443
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -176,7 +176,7 @@ F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79
 F src/btree.c 2caf598165f3608fde8abac2b243826616ce54b7
 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h 973a22a6fd61350b454ad614832b1f0a5e25a1e4
-F src/build.c 0419bba592c22f6d00e6d57a2ca7136720d02c1a
+F src/build.c 3d1abf90ecf488d49eb0c0a673a9b1f22b3ef4e81b1bffa6cf3dfdb832125d3c
 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
 F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
 F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
@@ -1250,8 +1250,8 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 962531e7c1f3ff604271ddf9f47b6234dfd47702ccf24849f55b80814e7be267
-Q +cfb0d9e0207128b1c2b48689288a849b19dbc00a22cfaca26eec4bfc773629f8
-R c9188aceef445e879bb3dddeb4f04ce6
+P 19dad0a720c41d1d111f42cb2cb1f291c559957e76e3f88dc6cfc065e4845e77
+Q +234ede26e30f20e6c33002739ed8be35dbfb5c77700bd857ff31072b9b7df347
+R 0abd2b13af71300bd2b7a8ab9ad2e7ec
 U drh
-Z 7f2d1982b25e32d3d73ef1fd9b977c9b
+Z c7d056a26cdd67a2c8fba47da44b2255

diff --git a/manifest.uuid b/manifest.uuid
index 004e164398387b2022b6946498518e0125065967..5c6ecff1596e4f706d41238b81f09742b5b22aa5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-19dad0a720c41d1d111f42cb2cb1f291c559957e76e3f88dc6cfc065e4845e77
\ No newline at end of file
+802b82f342328762e3995825aed1b22e61361ef24b673cd5d66b55756ce2a461
\ No newline at end of file

diff --git a/src/build.c b/src/build.c
index fcf96bd42c120a2fc59f27001b6ea3c7d84af41e..014109deacd336bf69242540dabed0d0c63bc331 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -949,7 +949,11 @@ void sqlite3StartTable(
   pTable->iPKey = -1;
   pTable->pSchema = db->aDb[iDb].pSchema;
   pTable->nRef = 1;
+#ifdef SQLITE_DEFAULT_ROWEST
+  pTable->nRowLogEst = sqlite3LogEst(SQLITE_DEFAULT_ROWEST);
+#else
   pTable->nRowLogEst = 200; assert( 200==sqlite3LogEst(1048576) );
+#endif
   assert( pParse->pNewTable==0 );
   pParse->pNewTable = pTable;