Change the zipfile virtual table so that the xBestIndex method gives a

reasonable cost estimate even if no filename is specified.  The missing
filename error continues to be raised in the xFilter method.  Meanwhile,
the more reasonable cost estimate avoids unnecessary wierdness in the query
planner.

FossilOrigin-Name: 0e468aa6decc73be307596782a778a739ff1b5dc0eb10fc4bd6776e460f99f8b

diff --git a/ext/misc/zipfile.c b/ext/misc/zipfile.c
index 82e9ce06e9965080e7a1428ae2ca4c76b4c2f22d..a35a26f4d8e8afae271f6dc214a21799abd45093 100644 (file)
--- a/ext/misc/zipfile.c
+++ b/ext/misc/zipfile.c
@@ -1309,10 +1309,10 @@ static int zipfileBestIndex(
       idx = i;
     }
   }
+  pIdxInfo->estimatedCost = 1000.0;
   if( idx>=0 ){
     pIdxInfo->aConstraintUsage[idx].argvIndex = 1;
     pIdxInfo->aConstraintUsage[idx].omit = 1;
-    pIdxInfo->estimatedCost = 1000.0;
     pIdxInfo->idxNum = 1;
   }else if( unusable ){
     return SQLITE_CONSTRAINT;

diff --git a/manifest b/manifest
index e64e2455c2f31d82779ebbc62a95c191e2acfbf0..91f12c1e12ac1a09157a166464fe6eb43e9d7581 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sincorrect\sassert().\s\sFix\sfor\sticket\s[614b25314c766238]
-D 2020-01-12T22:20:07.875
+C Change\sthe\szipfile\svirtual\stable\sso\sthat\sthe\sxBestIndex\smethod\sgives\sa\nreasonable\scost\sestimate\seven\sif\sno\sfilename\sis\sspecified.\s\sThe\smissing\nfilename\serror\scontinues\sto\sbe\sraised\sin\sthe\sxFilter\smethod.\s\sMeanwhile,\nthe\smore\sreasonable\scost\sestimate\savoids\sunnecessary\swierdness\sin\sthe\squery\nplanner.
+D 2020-01-12T22:25:58.315
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -328,7 +328,7 @@ F ext/misc/vfsstat.c 77b5b4235c9f7f11eddf82487c0a422944ac2f132dafd5af3be7a68a057
 F ext/misc/vtablog.c 5538acd0c8ddaae372331bee11608d76973436b77d6a91e8635cfc9432fba5ae
 F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd
 F ext/misc/wholenumber.c 520f34c3099e5b7d546f13708607dc2fa173c46b68952eecf0d19cd675fec85e
-F ext/misc/zipfile.c b09f38ccd4b9666b8e152f71c33ee381c8c2d6939203ac896c174e4c6fc6bc4a
+F ext/misc/zipfile.c d1be54ea83ac9ad71b8b6ffc4b60db8946ce2ceacdf6bff063fcd9489f41bb49
 F ext/misc/zorder.c b0ff58fa643afa1d846786d51ea8d5c4b6b35aa0254ab5a82617db92f3adda64
 F ext/rbu/rbu.c 8681f6157db6adc82c34af24b14ea8a3be0146ad2a3b6c1d5da6cb8a5796c8ce
 F ext/rbu/rbu1.test 221d9c18a5e600ac9ac6b1810d99d9f99163a7909ba61597876ab6e4d4beb3d6
@@ -1857,7 +1857,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 fd7bcc53524096f5245e5ae04c12780d2c43b9b3af17ec529447aed21b82cc2b
-R a2b0a82d9cc6525c216005f05f5df763
+P 6a999c5aa0d1d5569a5bda50d27e3a15c13e93e69d00db97c5294901522064a3
+R 1a302def53bcc8a305d91bdb4d7b1aeb
 U drh
-Z edecc3b6733717f76464dac530e40e7c
+Z 5ff48559c68bb18b16bc5be830c2b338

diff --git a/manifest.uuid b/manifest.uuid
index a7046b7edc7d1292f72e896e51205648b1d9dafa..d7c4de0dcf992489c88a66469cf35618b0c898ed 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6a999c5aa0d1d5569a5bda50d27e3a15c13e93e69d00db97c5294901522064a3
\ No newline at end of file
+0e468aa6decc73be307596782a778a739ff1b5dc0eb10fc4bd6776e460f99f8b
\ No newline at end of file