Ignore non-existent prepared statement in get_query_string.

[pghintplan/pg_hint_plan.git] / pg_hint_plan.c

diff --git a/pg_hint_plan.c b/pg_hint_plan.c
index 9fe17db..e3c03ff 100644 (file)
--- a/pg_hint_plan.c
+++ b/pg_hint_plan.c
@@ -1885,9 +1885,14 @@ get_query_string(ParseState *pstate, Query *query, Query **jumblequery)
                        ExecuteStmt *stmt = (ExecuteStmt *)target_query;
                        PreparedStatement  *entry;
 
-                       entry = FetchPreparedStatement(stmt->name, true);
+                       /*
+                        * Silently ignore nonexistent prepared statements. This may happen
+                        * for EXECUTE within a function definition.  Otherwise the
+                        * execution will fail anyway.
+                        */
+                       entry = FetchPreparedStatement(stmt->name, false);
 
-                       if (entry->plansource->is_valid)
+                       if (entry && entry->plansource->is_valid)
                        {
                                p = entry->plansource->query_string;
                                target_query = (Query *) linitial (entry->plansource->query_list);
@@ -2770,6 +2775,25 @@ set_join_config_options(unsigned char enforce_mask, GucContext context)
        SET_CONFIG_OPTION("enable_nestloop", ENABLE_NESTLOOP);
        SET_CONFIG_OPTION("enable_mergejoin", ENABLE_MERGEJOIN);
        SET_CONFIG_OPTION("enable_hashjoin", ENABLE_HASHJOIN);
+
+       /*
+        * Hash join may be rejected for the reason of estimated memory usage. Try
+        * getting rid of that limitation. This change on work_mem is reverted just
+        * after searching join path so no suginificant side-effects are expected.
+        */
+       if (enforce_mask == ENABLE_HASHJOIN)
+       {
+               char                    buf[32];
+
+               /* See final_cost_hashjoin(). */
+               if (work_mem < MAX_KILOBYTES)
+               {
+                       snprintf(buf, sizeof(buf), UINT64_FORMAT, (uint64)MAX_KILOBYTES);
+                       set_config_option_noerror("work_mem", buf,
+                                                                         context, PGC_S_SESSION, GUC_ACTION_SAVE,
+                                                                         true, ERROR);
+               }
+       }
 }
 
 /*