Better estimatedCost in the xBestIndex method of the generate_series vtab.

FossilOrigin-Name: f2c16094a536e7ef62444d0fe38cbee2a4999426

diff --git a/ext/misc/series.c b/ext/misc/series.c
index 2ae312effa338560fae1f2218896e304c5194dc6..4e6341c33b8fc4ed570982e5ead5f439f6f22b00 100644 (file)
--- a/ext/misc/series.c
+++ b/ext/misc/series.c
@@ -337,7 +337,7 @@ static int seriesBestIndex(
   if( (idxNum & 3)==3 ){
     /* Both start= and stop= boundaries are available.  This is the 
     ** the preferred case */
-    pIdxInfo->estimatedCost = (double)1;
+    pIdxInfo->estimatedCost = (double)(2 - ((idxNum&4)!=0));
     pIdxInfo->estimatedRows = 1000;
     if( pIdxInfo->nOrderBy==1 ){
       if( pIdxInfo->aOrderBy[0].desc ) idxNum |= 8;

diff --git a/manifest b/manifest
index bacddf080cf561dc339bab6bca6e7444a7f21fd0..3cdd9396b7b78d5a090218e3b70ef86a3e281adb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\sfts5\swhere\sa\scorrupt\sdb\scould\slead\sto\sa\s(huge)\sbuffer\soverread.
-D 2016-02-29T17:34:16.069
+C Better\sestimatedCost\sin\sthe\sxBestIndex\smethod\sof\sthe\sgenerate_series\svtab.
+D 2016-03-01T02:11:50.810
 F Makefile.in 4e90dc1521879022aa9479268a4cd141d1771142
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 4f319afb7c049d40aff7af6e8c4e7cc2ba18e079
@@ -212,7 +212,7 @@ F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
 F ext/misc/rot13.c 1ac6f95f99b575907b9b09c81a349114cf9be45a
-F ext/misc/series.c b8fb7befd85b3a9b4a10e701b30b2b79ca92b6d4
+F ext/misc/series.c 235d6281397003ad5226582de216507642aa0095
 F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
 F ext/misc/spellfix.c 525190484b7a9dbc6be646c4842274fff4f27d53
 F ext/misc/totype.c 4a167594e791abeed95e0a8db028822b5e8fe512
@@ -1451,7 +1451,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 251d6473f7c9ad95adbdcc49cb8eaf7c0956764b
-R 1a43d3061a1f154a38fc05ffa17e1f4a
-U dan
-Z 0ef60cd2035dd9bea82e9df13f5bcf57
+P c9a30e117f2c6c9ef0cc0c6ca5227d2961715b8f
+R 78072d3e9e5d5130b27dfb7458df9d26
+U drh
+Z 00eb8a065721ce5867f81f8e93fd77c0

diff --git a/manifest.uuid b/manifest.uuid
index 2a4a25da5e8ff4680a636bde71ca60bc46aef60f..ead2aaed5ef1d73655d554a43cebc4e64b8183bd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c9a30e117f2c6c9ef0cc0c6ca5227d2961715b8f
\ No newline at end of file
+f2c16094a536e7ef62444d0fe38cbee2a4999426
\ No newline at end of file