From: drh Date: Thu, 15 Dec 2016 21:33:55 +0000 (+0000) Subject: Fix the cost estimation in the BestIndex method of the eponymous pragma X-Git-Tag: version-3.16.0~36^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae7045cd538586d6e6d09ff60390d9211fa13a8c;p=thirdparty%2Fsqlite.git Fix the cost estimation in the BestIndex method of the eponymous pragma virtual table implementation. FossilOrigin-Name: 7126807a186746a8663fbaa267d63214d06476e4 --- diff --git a/manifest b/manifest index 9557ff3947..2b64aeeef2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\spragma\sas\seponymous\svirtual\stable\smechanism\snow\sappears\sto\swork. -D 2016-12-15T21:11:15.541 +C Fix\sthe\scost\sestimation\sin\sthe\sBestIndex\smethod\sof\sthe\seponymous\spragma\nvirtual\stable\simplementation. +D 2016-12-15T21:33:55.724 F Makefile.in c194b58fe00c370a48ac6ae6945e92a7781db1c8 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -381,7 +381,7 @@ F src/parse.y 29153738a7322054359320eb00b5a4cd44389f20 F src/pcache.c 51070ec9b8251bbf9c6ea3d35fd96a458752929e F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490 F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953 -F src/pragma.c db1d2ae01ad327b2c1d348924cdb11bbe1a54dcf +F src/pragma.c 41f18267db44df49756c3c3cdc695e701e169a63 F src/pragma.h f9b221b2c8949ea941dbee49934299e4ed5af41c F src/prepare.c b1140c3d0cf59bc85ace00ce363153041b424b7a F src/printf.c f94da4935d1dd25420ac50c6745db1deb35e07c1 @@ -1536,7 +1536,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 988a61e8b03f302c69d11898d1ea95f002cba1a5 -R fc9b9c22fa99573809efcbc3a3ada70d +P 2c274a1a7b57ef1208901fbc1d96d39c0d492652 +R 443faf38855e36ce9518a22aacd4e206 U drh -Z 6fcba4a1d98b45e26069fbc257e90ccd +Z cec7546529435a8d9c60da5648254c3a diff --git a/manifest.uuid b/manifest.uuid index b606d7a8f8..0e05c05ce7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2c274a1a7b57ef1208901fbc1d96d39c0d492652 \ No newline at end of file +7126807a186746a8663fbaa267d63214d06476e4 \ No newline at end of file diff --git a/src/pragma.c b/src/pragma.c index 7cf0c61c09..6b3b84b4a4 100644 --- a/src/pragma.c +++ b/src/pragma.c @@ -2056,6 +2056,7 @@ static int pragmaVtabBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){ int i, j; int seen[2]; + pIdxInfo->estimatedCost = (double)1; if( pTab->nHidden==0 ){ return SQLITE_OK; } pConstraint = pIdxInfo->aConstraint; seen[0] = 0;