| Revision | 2d5b8cdad8ba623b3313b23a0b45712438ff68d8 (tree) |
|---|---|
| Time | 2022-03-09 12:18:04 |
| Author | Kyotaro Horiguchi <horikyota.ntt@gmai...> |
| Commiter | Kyotaro Horiguchi |
Ignore non-existent prepared statement in get_query_string.
CREATE FUNCTION of SQL function uses post_parse_analyze_hook during
validation. If the function contained EXECUTE <prepared statement>,
not only that statement may be nonexistent, but also there's no need
of the query string at that point.
Since execution of nonexistent prepared statement ends with failure
sooner or later, we can safely ignore that.
Backpatch to pg_hint_plan10 that are before the core's EOL.
expected/pg_hint_plan.out (diff)
pg_hint_plan.c (diff) sql/pg_hint_plan.sql (diff)| @@ -8388,6 +8388,12 @@ SELECT relname, seq_scan, idx_scan FROM pg_stat_user_tables WHERE schemaname = ' | ||
| 8388 | 8388 | p1_c2 | 0 | 2 |
| 8389 | 8389 | (2 rows) |
| 8390 | 8390 | |
| 8391 | +-- Make sure the reference to validly non-existent prepared statement | |
| 8392 | +-- doesn't harm | |
| 8393 | +CREATE FUNCTION ppf() RETURNS void AS $$ | |
| 8394 | +PREPARE pp1 AS SELECT 1; | |
| 8395 | +EXECUTE pp1; | |
| 8396 | +$$ LANGUAGE sql; | |
| 8391 | 8397 | -- Subqueries on inheritance tables under UNION |
| 8392 | 8398 | EXPLAIN (COSTS off) SELECT val FROM p1 WHERE val < 1000 |
| 8393 | 8399 | UNION ALL |
| @@ -1890,9 +1890,14 @@ get_query_string(ParseState *pstate, Query *query, Query **jumblequery) | ||
| 1890 | 1890 | ExecuteStmt *stmt = (ExecuteStmt *)target_query; |
| 1891 | 1891 | PreparedStatement *entry; |
| 1892 | 1892 | |
| 1893 | - entry = FetchPreparedStatement(stmt->name, true); | |
| 1893 | + /* | |
| 1894 | + * Silently ignore nonexistent prepared statements. This may happen | |
| 1895 | + * for EXECUTE within a function definition. Otherwise the | |
| 1896 | + * execution will fail anyway. | |
| 1897 | + */ | |
| 1898 | + entry = FetchPreparedStatement(stmt->name, false); | |
| 1894 | 1899 | |
| 1895 | - if (entry->plansource->is_valid) | |
| 1900 | + if (entry && entry->plansource->is_valid) | |
| 1896 | 1901 | { |
| 1897 | 1902 | p = entry->plansource->query_string; |
| 1898 | 1903 | target_query = (Query *) linitial (entry->plansource->query_list); |
| @@ -1012,6 +1012,13 @@ SELECT pg_sleep(1); | ||
| 1012 | 1012 | -- the index scan happened while planning. |
| 1013 | 1013 | SELECT relname, seq_scan, idx_scan FROM pg_stat_user_tables WHERE schemaname = 'public' AND (relname = 'p1_c1' OR relname = 'p1_c2'); |
| 1014 | 1014 | |
| 1015 | +-- Make sure the reference to validly non-existent prepared statement | |
| 1016 | +-- doesn't harm | |
| 1017 | +CREATE FUNCTION ppf() RETURNS void AS $$ | |
| 1018 | +PREPARE pp1 AS SELECT 1; | |
| 1019 | +EXECUTE pp1; | |
| 1020 | +$$ LANGUAGE sql; | |
| 1021 | + | |
| 1015 | 1022 | -- Subqueries on inheritance tables under UNION |
| 1016 | 1023 | EXPLAIN (COSTS off) SELECT val FROM p1 WHERE val < 1000 |
| 1017 | 1024 | UNION ALL |
Fork