Fix the xBestIndex method of the pragma virtual table so that it correctly

gives a higher cost to plans where the schema hidden parameter is
unconstrained.

FossilOrigin-Name: ec791413d55c8be881350efd0cd27a474e022c7115740bfe00914e61433977d3

diff --git a/manifest b/manifest
index 33455cf1a453a93fea91ee23804926aa385617a2..f3fd037c03e9b7587dceaca365cdf481461fb2d1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sSQLITE_ALLOW_ROWID_IN_VIEW\sbug-compatibility\soption\sso\sthat\sit\sworks\nagain.\sAdd\sthe\sSQLITE_CONFIG_ROWID_IN_VIEW\ssqlite3_config()\svalue\sto\noptionally\sdisable\sthe\sbug-compatibility\smode\sat\sstart-time.\nEnable\stesting\sof\sSQLITE_ALLOW_ROWID_IN_VIEW.
-D 2024-03-24T19:08:05.017
+C Fix\sthe\sxBestIndex\smethod\sof\sthe\spragma\svirtual\stable\sso\sthat\sit\scorrectly\ngives\sa\shigher\scost\sto\splans\swhere\sthe\sschema\shidden\sparameter\sis\nunconstrained.
+D 2024-03-24T21:18:03.419
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -731,7 +731,7 @@ F src/parse.y 020d80386eb216ec9520549106353c517d2bbc89be28752ffdca649a9eaf56ec
 F src/pcache.c 040b165f30622a21b7a9a77c6f2e4877a32fb7f22d4c7f0d2a6fa6833a156a75
 F src/pcache.h 1497ce1b823cf00094bb0cf3bac37b345937e6f910890c626b16512316d3abf5
 F src/pcache1.c 602acb23c471bb8d557a6f0083cc2be641d6cafcafa19e481eba7ef4c9ca0f00
-F src/pragma.c b61a1a1801befe6763e787b96988deb156a56e82a2b4dea004bc78e4551c9d5c
+F src/pragma.c a13593a09da0d27b44a57bf6b2b9f6d163ad78aef4ad1d64c6214897dbe0c9ba
 F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 371f6115cb69286ebc12c6f2d7511279c2e47d9f54f475d46a554d687a3b312c
 F src/printf.c d3392b2a20ee314ddeef34fb43c904bf4619eb20ff9a9e07e3950a7e4dcd6912
@@ -1483,7 +1483,7 @@ F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b76
 F test/pragma.test cddd4b534d7fb5cf113d1308dea4231f3548e8a7f3a65d7d1cf4810c87090b5a
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
 F test/pragma3.test 92a46bbea12322dd94a404f49edcfbfc913a2c98115f0d030a7459bb4712ef31
-F test/pragma4.test ca5e4dfc46adfe490f75d73734f70349d95a199e6510973899e502eef2c8b1f8
+F test/pragma4.test 0010fbd5a3ec84a8cd94ae859b5b5c9c6e608881c8397bba15a7dda059a25d6c
 F test/pragma5.test 7b33fc43e2e41abf17f35fb73f71b49671a380ea92a6c94b6ce530a25f8d9102
 F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
 F test/prefixes.test b524a1c44bffec225b9aec98bd728480352aa8532ac4c15771fb85e8beef65d9
@@ -2160,11 +2160,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 90537ce044c50ecca35920ecb27c7fb07d535be828ea943416c4633008d360b9
-Q +66c69e2f20f7692e0f34743ae97b09c4d8d11b874cdc5381795f2d1e0410f724
-Q +80c4223098c1827ff3a564f1f9a4203164a943e9a83eef99df68378fa3c4764b
-Q +b6802565df0f63286a7ef26c92d3ed817895f244920a24909cd855090fdfa08c
-R 0d09d8f09325e76c0e4cf2b8de81371b
+P 7a3d0027f81e8def49e2a665c9202b966c37f066b1298476e4d7d72e56323f85
+Q +bc516ff5202ee6e9834266bf755fe26e30ac557dcc7975ca7a06dfe33874fcd2
+R b4d957145d30a80bb1ee35337aac7f92
 U drh
-Z 7bf2d0ce1002104d5c73b77198b0a107
+Z 4b28a8f0941a075e2e35eecb5ef50c4c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index de5c1e42044afedfc0793f22b2bf7eb020ba5b73..03ca057b64a6e33aa52add8e6c5d9c2e28584da7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7a3d0027f81e8def49e2a665c9202b966c37f066b1298476e4d7d72e56323f85
\ No newline at end of file
+ec791413d55c8be881350efd0cd27a474e022c7115740bfe00914e61433977d3
\ No newline at end of file

diff --git a/src/pragma.c b/src/pragma.c
index a1243acc165f4cd08cca38558764b29eeb2ef04b..0a687320104bb4ab4b82a2e210410f45407fc59c 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -2756,7 +2756,11 @@ static int pragmaVtabBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
   j = seen[0]-1;
   pIdxInfo->aConstraintUsage[j].argvIndex = 1;
   pIdxInfo->aConstraintUsage[j].omit = 1;
-  if( seen[1]==0 ) return SQLITE_OK;
+  if( seen[1]==0 ){
+    pIdxInfo->estimatedCost = (double)1000;
+    pIdxInfo->estimatedRows = 1000;
+    return SQLITE_OK;
+  }
   pIdxInfo->estimatedCost = (double)20;
   pIdxInfo->estimatedRows = 20;
   j = seen[1]-1;

diff --git a/test/pragma4.test b/test/pragma4.test
index b82df81cbde0635e2f73b40bed7756a439f3d6c5..68a9cfb9ed1c67ac3c0c7c7fd7de84944be1bbf9 100644 (file)
--- a/test/pragma4.test
+++ b/test/pragma4.test
@@ -264,5 +264,17 @@ do_execsql_test 5.0 {
   0 a {} 0 'abc' 0 1 b {} 0 -1 0 2 c {} 0 +4.0 0
 }
 
+# 2024-03-24 https://sqlite.org/forum/forumpost/85b6a8b6705fb77a
+#
+reset_db
+do_execsql_test 6.0 {
+  CREATE TABLE t1(a INT PRIMARY KEY, b INT);
+  CREATE TABLE t2(c INT PRIMARY KEY, d INT REFERENCES t1);
+  SELECT t.name, f."table", f."from", i.name, i.pk
+    FROM pragma_table_list() AS t
+         JOIN pragma_foreign_key_list(t.name, t.schema) AS f
+         JOIN pragma_table_info(f."table", t.schema) AS i
+   WHERE i.pk;
+} {t2 t1 d a 1}
 
 finish_test