OSDN Git Service

Give correct query location to generate_normalized_query.
[pghintplan/pg_hint_plan.git] / pg_hint_plan.c
index c3988f9..2a4930f 100644 (file)
@@ -3,35 +3,45 @@
  * pg_hint_plan.c
  *               hinting on how to execute a query for PostgreSQL
  *
- * Copyright (c) 2012-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+ * Copyright (c) 2012-2019, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
  *
  *-------------------------------------------------------------------------
  */
 #include <string.h>
 
 #include "postgres.h"
+#include "access/genam.h"
+#include "access/heapam.h"
+#include "access/relation.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_index.h"
 #include "commands/prepare.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
 #include "nodes/nodeFuncs.h"
+#include "nodes/params.h"
+#include "optimizer/appendinfo.h"
 #include "optimizer/clauses.h"
 #include "optimizer/cost.h"
 #include "optimizer/geqo.h"
 #include "optimizer/joininfo.h"
+#include "optimizer/optimizer.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
 #include "optimizer/plancat.h"
 #include "optimizer/planner.h"
 #include "optimizer/prep.h"
 #include "optimizer/restrictinfo.h"
+#include "parser/analyze.h"
+#include "parser/parsetree.h"
 #include "parser/scansup.h"
+#include "partitioning/partbounds.h"
 #include "tcop/utility.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
+#include "utils/snapmgr.h"
 #include "utils/syscache.h"
 #include "utils/resowner.h"
 
@@ -86,11 +96,13 @@ PG_MODULE_MAGIC;
 
 #define HINT_ARRAY_DEFAULT_INITSIZE 8
 
-#define hint_ereport(str, detail) \
-       ereport(pg_hint_plan_message_level, \
-                       (errhidestmt(hidestmt), \
-                        errmsg("pg_hint_plan%s: hint syntax error at or near \"%s\"", qnostr, (str)), \
-                        errdetail detail))
+#define hint_ereport(str, detail) hint_parse_ereport(str, detail)
+#define hint_parse_ereport(str, detail) \
+       do { \
+               ereport(pg_hint_plan_parse_message_level,               \
+                       (errmsg("pg_hint_plan: hint syntax error at or near \"%s\"", (str)), \
+                        errdetail detail)); \
+       } while(0)
 
 #define skip_space(str) \
        while (isspace(*str)) \
@@ -184,6 +196,12 @@ typedef enum HintType
        HINT_TYPE_PARALLEL
 } HintType;
 
+typedef enum HintTypeBitmap
+{
+       HINT_BM_SCAN_METHOD = 1,
+       HINT_BM_PARALLEL = 2
+} HintTypeBitmap;
+
 static const char *HintTypeName[] = {
        "scan method",
        "join method",
@@ -207,7 +225,17 @@ typedef enum HintStatus
                                                                  (hint)->base.state == HINT_STATE_USED)
 
 static unsigned int qno = 0;
+static unsigned int msgqno = 0;
 static char qnostr[32];
+static const char *current_hint_str = NULL;
+
+/*
+ * However we usually take a hint stirng in post_parse_analyze_hook, we still
+ * need to do so in planner_hook when client starts query execution from the
+ * bind message on a prepared query. This variable prevent duplicate and
+ * sometimes harmful hint string retrieval.
+ */
+static bool current_hint_retrieved = false;
 
 /* common data for all hints. */
 struct Hint
@@ -331,10 +359,14 @@ struct HintState
        /* Initial values of parameters  */
        int                             init_scan_mask;         /* enable_* mask */
        int                             init_nworkers;          /* max_parallel_workers_per_gather */
-       int                             init_min_para_size;     /* min_parallel_relation_size*/
+       /* min_parallel_table_scan_size*/
+       int                             init_min_para_tablescan_size;
+       /* min_parallel_index_scan_size*/
+       int                             init_min_para_indexscan_size;
        int                             init_paratup_cost;      /* parallel_tuple_cost */
        int                             init_parasetup_cost;/* parallel_setup_cost */
 
+       PlannerInfo        *current_root;               /* PlannerInfo for the followings */
        Index                   parent_relid;           /* inherit parent of table relid */
        ScanMethodHint *parent_scan_hint;       /* scan hint for the parent */
        ParallelHint   *parent_parallel_hint; /* parallel hint for the parent */
@@ -367,11 +399,12 @@ void              _PG_fini(void);
 static void push_hint(HintState *hstate);
 static void pop_hint(void);
 
-static void pg_hint_plan_ProcessUtility(Node *parsetree,
-                                                       const char *queryString,
-                                                       ProcessUtilityContext context,
-                                                       ParamListInfo params,
-                                                       DestReceiver *dest, char *completionTag);
+static void pg_hint_plan_post_parse_analyze(ParseState *pstate, Query *query);
+static void pg_hint_plan_ProcessUtility(PlannedStmt *pstmt,
+                                       const char *queryString,
+                                       ProcessUtilityContext context,
+                                       ParamListInfo params, QueryEnvironment *queryEnv,
+                                       DestReceiver *dest, char *completionTag);
 static PlannedStmt *pg_hint_plan_planner(Query *parse, int cursorOptions,
                                                                                 ParamListInfo boundParams);
 static RelOptInfo *pg_hint_plan_join_search(PlannerInfo *root,
@@ -445,8 +478,6 @@ void pg_hint_plan_set_rel_pathlist(PlannerInfo * root, RelOptInfo *rel,
                                                                   Index rti, RangeTblEntry *rte);
 static void create_plain_partial_paths(PlannerInfo *root,
                                                                                                        RelOptInfo *rel);
-static int compute_parallel_worker(RelOptInfo *rel, BlockNumber pages);
-
 static void make_rels_by_clause_joins(PlannerInfo *root, RelOptInfo *old_rel,
                                                                          ListCell *other_rels);
 static void make_rels_by_clauseless_joins(PlannerInfo *root,
@@ -457,13 +488,6 @@ static void set_plain_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
                                                                   RangeTblEntry *rte);
 static void set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
                                                                        Index rti, RangeTblEntry *rte);
-static void generate_mergeappend_paths(PlannerInfo *root, RelOptInfo *rel,
-                                                  List *live_childrels,
-                                                  List *all_child_pathkeys);
-static Path *get_cheapest_parameterized_child_path(PlannerInfo *root,
-                                                                         RelOptInfo *rel,
-                                                                         Relids required_outer);
-static List *accumulate_append_subpath(List *subpaths, Path *path);
 RelOptInfo *pg_hint_plan_make_join_rel(PlannerInfo *root, RelOptInfo *rel1,
                                                                           RelOptInfo *rel2);
 
@@ -486,14 +510,13 @@ static int set_config_int32_option(const char *name, int32 value,
 /* GUC variables */
 static bool    pg_hint_plan_enable_hint = true;
 static int debug_level = 0;
-static int     pg_hint_plan_message_level = INFO;
+static int     pg_hint_plan_parse_message_level = INFO;
+static int     pg_hint_plan_debug_message_level = LOG;
 /* Default is off, to keep backward compatibility. */
 static bool    pg_hint_plan_enable_hint_table = false;
 
-/* Internal static variables. */
-static bool    hidestmt = false;                               /* Allow or inhibit STATEMENT: output */
-
 static int plpgsql_recurse_level = 0;          /* PLpgSQL recursion level            */
+static int recurse_level = 0;          /* recursion level incl. direct SPI calls */
 static int hint_inhibit_level = 0;                     /* Inhibit hinting if this is above 0 */
                                                                                        /* (This could not be above 1)        */
 static int max_hint_nworkers = -1;             /* Maximum nworkers of Workers hints */
@@ -534,10 +557,11 @@ static const struct config_enum_entry parse_debug_level_options[] = {
 };
 
 /* Saved hook values in case of unload */
-static ProcessUtility_hook_type prev_ProcessUtility = NULL;
+static post_parse_analyze_hook_type prev_post_parse_analyze_hook = NULL;
 static planner_hook_type prev_planner = NULL;
 static join_search_hook_type prev_join_search = NULL;
 static set_rel_pathlist_hook_type prev_set_rel_pathlist = NULL;
+static ProcessUtility_hook_type prev_ProcessUtility_hook = NULL;
 
 /* Hold reference to currently active hint */
 static HintState *current_hint_state = NULL;
@@ -549,12 +573,6 @@ static HintState *current_hint_state = NULL;
  */
 static List *HintStateStack = NIL;
 
-/*
- * Holds statement name during executing EXECUTE command.  NULL for other
- * statements.
- */
-static char       *stmt_name = NULL;
-
 static const HintParser parsers[] = {
        {HINT_SEQSCAN, ScanMethodHintCreate, HINT_KEYWORD_SEQSCAN},
        {HINT_INDEXSCAN, ScanMethodHintCreate, HINT_KEYWORD_INDEXSCAN},
@@ -632,7 +650,7 @@ _PG_init(void)
        DefineCustomEnumVariable("pg_hint_plan.parse_messages",
                                                         "Message level of parse errors.",
                                                         NULL,
-                                                        &pg_hint_plan_message_level,
+                                                        &pg_hint_plan_parse_message_level,
                                                         INFO,
                                                         parse_messages_level_options,
                                                         PGC_USERSET,
@@ -644,8 +662,8 @@ _PG_init(void)
        DefineCustomEnumVariable("pg_hint_plan.message_level",
                                                         "Message level of debug messages.",
                                                         NULL,
-                                                        &pg_hint_plan_message_level,
-                                                        INFO,
+                                                        &pg_hint_plan_debug_message_level,
+                                                        LOG,
                                                         parse_messages_level_options,
                                                         PGC_USERSET,
                                                         0,
@@ -665,14 +683,16 @@ _PG_init(void)
                                                         NULL);
 
        /* Install hooks. */
-       prev_ProcessUtility = ProcessUtility_hook;
-       ProcessUtility_hook = pg_hint_plan_ProcessUtility;
+       prev_post_parse_analyze_hook = post_parse_analyze_hook;
+       post_parse_analyze_hook = pg_hint_plan_post_parse_analyze;
        prev_planner = planner_hook;
        planner_hook = pg_hint_plan_planner;
        prev_join_search = join_search_hook;
        join_search_hook = pg_hint_plan_join_search;
        prev_set_rel_pathlist = set_rel_pathlist_hook;
        set_rel_pathlist_hook = pg_hint_plan_set_rel_pathlist;
+       prev_ProcessUtility_hook = ProcessUtility_hook;
+       ProcessUtility_hook = pg_hint_plan_ProcessUtility;
 
        /* setup PL/pgSQL plugin hook */
        var_ptr = (PLpgSQL_plugin **) find_rendezvous_variable("PLpgSQL_plugin");
@@ -691,10 +711,11 @@ _PG_fini(void)
        PLpgSQL_plugin  **var_ptr;
 
        /* Uninstall hooks. */
-       ProcessUtility_hook = prev_ProcessUtility;
+       post_parse_analyze_hook = prev_post_parse_analyze_hook;
        planner_hook = prev_planner;
        join_search_hook = prev_join_search;
        set_rel_pathlist_hook = prev_set_rel_pathlist;
+       ProcessUtility_hook = prev_ProcessUtility_hook;
 
        /* uninstall PL/pgSQL plugin hook */
        var_ptr = (PLpgSQL_plugin **) find_rendezvous_variable("PLpgSQL_plugin");
@@ -913,7 +934,7 @@ ParallelHintCreate(const char *hint_str, const char *keyword,
 {
        ParallelHint *hint;
 
-       hint = palloc(sizeof(ScanMethodHint));
+       hint = palloc(sizeof(ParallelHint));
        hint->base.hint_str = hint_str;
        hint->base.keyword = keyword;
        hint->base.hint_keyword = hint_keyword;
@@ -956,9 +977,11 @@ HintStateCreate(void)
        hstate->scan_hints = NULL;
        hstate->init_scan_mask = 0;
        hstate->init_nworkers = 0;
-       hstate->init_min_para_size = 0;
+       hstate->init_min_para_tablescan_size = 0;
+       hstate->init_min_para_indexscan_size = 0;
        hstate->init_paratup_cost = 0;
        hstate->init_parasetup_cost = 0;
+       hstate->current_root = NULL;
        hstate->parent_relid = 0;
        hstate->parent_scan_hint = NULL;
        hstate->parent_parallel_hint = NULL;
@@ -1222,7 +1245,7 @@ HintStateDump(HintState *hstate)
 
        if (!hstate)
        {
-               elog(LOG, "pg_hint_plan:\nno hint");
+               elog(pg_hint_plan_debug_message_level, "pg_hint_plan:\nno hint");
                return;
        }
 
@@ -1234,7 +1257,8 @@ HintStateDump(HintState *hstate)
        desc_hint_in_state(hstate, &buf, "duplication hint", HINT_STATE_DUPLICATION, false);
        desc_hint_in_state(hstate, &buf, "error hint", HINT_STATE_ERROR, false);
 
-       elog(LOG, "%s", buf.data);
+       ereport(pg_hint_plan_debug_message_level,
+                       (errmsg ("%s", buf.data)));
 
        pfree(buf.data);
 }
@@ -1246,7 +1270,7 @@ HintStateDump2(HintState *hstate)
 
        if (!hstate)
        {
-               elog(pg_hint_plan_message_level,
+               elog(pg_hint_plan_debug_message_level,
                         "pg_hint_plan%s: HintStateDump: no hint", qnostr);
                return;
        }
@@ -1259,9 +1283,10 @@ HintStateDump2(HintState *hstate)
        desc_hint_in_state(hstate, &buf, "}, {error hints", HINT_STATE_ERROR, true);
        appendStringInfoChar(&buf, '}');
 
-       ereport(pg_hint_plan_message_level,
-                       (errhidestmt(true),
-                        errmsg("%s", buf.data)));
+       ereport(pg_hint_plan_debug_message_level,
+                       (errmsg("%s", buf.data),
+                        errhidestmt(true),
+                        errhidecontext(true)));
 
        pfree(buf.data);
 }
@@ -1641,7 +1666,7 @@ parse_hints(HintState *hstate, Query *parse, const char *str)
                        char   *keyword = parser->keyword;
                        Hint   *hint;
 
-                       if (strcasecmp(buf.data, keyword) != 0)
+                       if (pg_strcasecmp(buf.data, keyword) != 0)
                                continue;
 
                        hint = parser->create_func(head, keyword, parser->hint_keyword);
@@ -1710,13 +1735,21 @@ get_hints_from_table(const char *client_query, const char *client_application)
        char   *hints = NULL;
        Oid             argtypes[2] = { TEXTOID, TEXTOID };
        Datum   values[2];
-       bool    nulls[2] = { false, false };
+       char    nulls[2] = {' ', ' '};
        text   *qry;
        text   *app;
 
        PG_TRY();
        {
+               bool snapshot_set = false;
+
                hint_inhibit_level++;
+
+               if (!ActiveSnapshotSet())
+               {
+                       PushActiveSnapshot(GetTransactionSnapshot());
+                       snapshot_set = true;
+               }
        
                SPI_connect();
        
@@ -1753,7 +1786,10 @@ get_hints_from_table(const char *client_query, const char *client_application)
                }
        
                SPI_finish();
-       
+
+               if (snapshot_set)
+                       PopActiveSnapshot();
+
                hint_inhibit_level--;
        }
        PG_CATCH();
@@ -1767,30 +1803,120 @@ get_hints_from_table(const char *client_query, const char *client_application)
 }
 
 /*
- * Get client-supplied query string.
+ * Get client-supplied query string. Addtion to that the jumbled query is
+ * supplied if the caller requested. From the restriction of JumbleQuery, some
+ * kind of query needs special amendments. Reutrns NULL if this query doesn't
+ * change the current hint. This function returns NULL also when something
+ * wrong has happend and let the caller continue using the current hints.
  */
 static const char *
-get_query_string(void)
+get_query_string(ParseState *pstate, Query *query, Query **jumblequery)
 {
-       const char *p;
+       const char *p = debug_query_string;
+
+       /*
+        * If debug_query_string is set, it is the top level statement. But in some
+        * cases we reach here with debug_query_string set NULL for example in the
+        * case of DESCRIBE message handling or EXECUTE command. We may still see a
+        * candidate top-level query in pstate in the case.
+        */
+       if (pstate && pstate->p_sourcetext)
+               p = pstate->p_sourcetext;
 
-       if (plpgsql_recurse_level > 0)
+       /* We don't see a query string, return NULL */
+       if (!p)
+               return NULL;
+
+       if (jumblequery != NULL)
+               *jumblequery = query;
+
+       if (query->commandType == CMD_UTILITY)
        {
+               Query *target_query = (Query *)query->utilityStmt;
+
                /*
-                * This is quite ugly but this is the only point I could find where
-                * we can get the query string.
+                * Some CMD_UTILITY statements have a subquery that we can hint on.
+                * Since EXPLAIN can be placed before other kind of utility statements
+                * and EXECUTE can be contained other kind of utility statements, these
+                * conditions are not mutually exclusive and should be considered in
+                * this order.
                 */
-               p = (char*)error_context_stack->arg;
-       }
-       else if (stmt_name)
-       {
-               PreparedStatement  *entry;
+               if (IsA(target_query, ExplainStmt))
+               {
+                       ExplainStmt *stmt = (ExplainStmt *)target_query;
+                       
+                       Assert(IsA(stmt->query, Query));
+                       target_query = (Query *)stmt->query;
+
+                       /* strip out the top-level query for further processing */
+                       if (target_query->commandType == CMD_UTILITY &&
+                               target_query->utilityStmt != NULL)
+                               target_query = (Query *)target_query->utilityStmt;
+               }
+
+               if (IsA(target_query, DeclareCursorStmt))
+               {
+                       DeclareCursorStmt *stmt = (DeclareCursorStmt *)target_query;
+                       Query *query = (Query *)stmt->query;
+
+                       /* the target must be CMD_SELECT in this case */
+                       Assert(IsA(query, Query) && query->commandType == CMD_SELECT);
+                       target_query = query;
+               }
+
+               if (IsA(target_query, CreateTableAsStmt))
+               {
+                       CreateTableAsStmt  *stmt = (CreateTableAsStmt *) target_query;
+
+                       Assert(IsA(stmt->query, Query));
+                       target_query = (Query *) stmt->query;
+
+                       /* strip out the top-level query for further processing */
+                       if (target_query->commandType == CMD_UTILITY &&
+                               target_query->utilityStmt != NULL)
+                               target_query = (Query *)target_query->utilityStmt;
+               }
+
+               if (IsA(target_query, ExecuteStmt))
+               {
+                       /*
+                        * Use the prepared query for EXECUTE. The Query for jumble
+                        * also replaced with the corresponding one.
+                        */
+                       ExecuteStmt *stmt = (ExecuteStmt *)target_query;
+                       PreparedStatement  *entry;
+
+                       entry = FetchPreparedStatement(stmt->name, true);
 
-               entry = FetchPreparedStatement(stmt_name, true);
-               p = entry->plansource->query_string;
+                       if (entry->plansource->is_valid)
+                       {
+                               p = entry->plansource->query_string;
+                               target_query = (Query *) linitial (entry->plansource->query_list);
+                       }
+                       else
+                       {
+                               /* igonre the hint for EXECUTE if invalidated */
+                               p = NULL;
+                               target_query = NULL;
+                       }
+               }
+                       
+               /* JumbleQuery accespts only a non-utility Query */
+               if (target_query &&
+                       (!IsA(target_query, Query) ||
+                        target_query->utilityStmt != NULL))
+                       target_query = NULL;
+
+               if (jumblequery)
+                       *jumblequery = target_query;
        }
-       else
-               p = debug_query_string;
+       /*
+        * Return NULL if pstate is not of top-level query.  We don't need this
+        * when jumble info is not requested or cannot do this when pstate is NULL.
+        */
+       else if (!jumblequery && pstate && pstate->p_sourcetext != p &&
+                        strcmp(pstate->p_sourcetext, p) != 0)
+               p = NULL;
 
        return p;
 }
@@ -2367,38 +2493,37 @@ ParallelHintParse(ParallelHint *hint, HintState *hstate, Query *parse,
                        hint_ereport(hint->nworkers_str,
                                                 ("number of workers must be positive: %s",
                                                  hint->base.keyword));
-               if ( nworkers > max_worker_processes)
+               else if (nworkers > max_worker_processes)
                        hint_ereport(hint->nworkers_str,
                                                 ("number of workers = %d is larger than max_worker_processes(%d): %s",
                                                  nworkers, max_worker_processes, hint->base.keyword));
 
                hint->base.state = HINT_STATE_ERROR;
-               return str;
        }
 
        hint->nworkers = nworkers;
 
-       if (nworkers > max_hint_nworkers)
-               max_hint_nworkers = nworkers;
-
        /* optional third parameter is specified */
        if (length == 3)
        {
                const char *modeparam = (const char *)list_nth(name_list, 2);
-               if (strcasecmp(modeparam, "hard") == 0)
+               if (pg_strcasecmp(modeparam, "hard") == 0)
                        force_parallel = true;
-               else if (strcasecmp(modeparam, "soft") != 0)
+               else if (pg_strcasecmp(modeparam, "soft") != 0)
                {
                        hint_ereport(modeparam,
                                                 ("enforcement must be soft or hard: %s",
                                                         hint->base.keyword));
                        hint->base.state = HINT_STATE_ERROR;
-                       return str;
                }
        }
-       
+
        hint->force_parallel = force_parallel;
 
+       if (hint->base.state != HINT_STATE_ERROR &&
+               nworkers > max_hint_nworkers)
+               max_hint_nworkers = nworkers;
+
        return str;
 }
 
@@ -2468,10 +2593,10 @@ set_config_option_noerror(const char *name, const char *value,
 
                ereport(elevel,
                                (errcode(errdata->sqlerrcode),
-                                errhidestmt(hidestmt),
                                 errmsg("%s", errdata->message),
                                 errdata->detail ? errdetail("%s", errdata->detail) : 0,
                                 errdata->hint ? errhint("%s", errdata->hint) : 0));
+               msgqno = qno;
                FreeErrorData(errdata);
        }
        PG_END_TRY();
@@ -2490,16 +2615,15 @@ set_config_int32_option(const char *name, int32 value, GucContext context)
 
        if (snprintf(buf, 16, "%d", value) < 0)
        {
-               ereport(pg_hint_plan_message_level,
-                               (errmsg ("Cannot set integer value: %d: %s",
-                                                max_hint_nworkers, strerror(errno))));
+               ereport(pg_hint_plan_parse_message_level,
+                               (errmsg ("Failed to convert integer to string: %d", value)));
                return false;
        }
 
        return
                set_config_option_noerror(name, buf, context,
                                                                  PGC_S_SESSION, GUC_ACTION_SAVE, true,
-                                                                 pg_hint_plan_message_level);
+                                                                 pg_hint_plan_parse_message_level);
 }
 
 /* setup scan method enforcement according to given options */
@@ -2518,7 +2642,7 @@ setup_guc_enforcement(SetHint **options, int noptions, GucContext context)
 
                result = set_config_option_noerror(hint->name, hint->value, context,
                                                                                   PGC_S_SESSION, GUC_ACTION_SAVE, true,
-                                                                                  pg_hint_plan_message_level);
+                                                                                  pg_hint_plan_parse_message_level);
                if (result != 0)
                        hint->base.state = HINT_STATE_USED;
                else
@@ -2547,11 +2671,13 @@ setup_parallel_plan_enforcement(ParallelHint *hint, HintState *state)
                                                                state->init_nworkers, state->context);
 
        /* force means that enforce parallel as far as possible */
-       if (hint && hint->force_parallel)
+       if (hint && hint->force_parallel && hint->nworkers > 0)
        {
                set_config_int32_option("parallel_tuple_cost", 0, state->context);
                set_config_int32_option("parallel_setup_cost", 0, state->context);
-               set_config_int32_option("min_parallel_relation_size", 0,
+               set_config_int32_option("min_parallel_table_scan_size", 0,
+                                                               state->context);
+               set_config_int32_option("min_parallel_index_scan_size", 0,
                                                                state->context);
        }
        else
@@ -2560,8 +2686,12 @@ setup_parallel_plan_enforcement(ParallelHint *hint, HintState *state)
                                                                state->init_paratup_cost, state->context);
                set_config_int32_option("parallel_setup_cost",
                                                                state->init_parasetup_cost, state->context);
-               set_config_int32_option("min_parallel_relation_size",
-                                                               state->init_min_para_size, state->context);
+               set_config_int32_option("min_parallel_table_scan_size",
+                                                               state->init_min_para_tablescan_size,
+                                                               state->context);
+               set_config_int32_option("min_parallel_index_scan_size",
+                                                               state->init_min_para_indexscan_size,
+                                                               state->context);
        }
 }
 
@@ -2620,183 +2750,263 @@ set_join_config_options(unsigned char enforce_mask, GucContext context)
 }
 
 /*
- * pg_hint_plan hook functions
+ * Push a hint into hint stack which is implemented with List struct.  Head of
+ * list is top of stack.
  */
-
 static void
-pg_hint_plan_ProcessUtility(Node *parsetree, const char *queryString,
-                                                       ProcessUtilityContext context,
-                                                       ParamListInfo params,
-                                                       DestReceiver *dest, char *completionTag)
+push_hint(HintState *hstate)
 {
-       Node                               *node;
-
-       /* 
-        * Use standard planner if pg_hint_plan is disabled or current nesting 
-        * depth is nesting depth of SPI calls. 
-        */
-       if (!pg_hint_plan_enable_hint || hint_inhibit_level > 0)
-       {
-               if (debug_level > 1)
-                       ereport(pg_hint_plan_message_level,
-                                       (errmsg ("pg_hint_plan: ProcessUtility:"
-                                                        " pg_hint_plan.enable_hint = off")));
-               if (prev_ProcessUtility)
-                       (*prev_ProcessUtility) (parsetree, queryString,
-                                                                       context, params,
-                                                                       dest, completionTag);
-               else
-                       standard_ProcessUtility(parsetree, queryString,
-                                                                       context, params,
-                                                                       dest, completionTag);
-               return;
-       }
-
-       node = parsetree;
-       if (IsA(node, ExplainStmt))
-       {
-               /*
-                * Draw out parse tree of actual query from Query struct of EXPLAIN
-                * statement.
-                */
-               ExplainStmt        *stmt;
-               Query              *query;
-
-               stmt = (ExplainStmt *) node;
+       /* Prepend new hint to the list means pushing to stack. */
+       HintStateStack = lcons(hstate, HintStateStack);
 
-               Assert(IsA(stmt->query, Query));
-               query = (Query *) stmt->query;
+       /* Pushed hint is the one which should be used hereafter. */
+       current_hint_state = hstate;
+}
 
-               if (query->commandType == CMD_UTILITY && query->utilityStmt != NULL)
-                       node = query->utilityStmt;
-       }
+/* Pop a hint from hint stack.  Popped hint is automatically discarded. */
+static void
+pop_hint(void)
+{
+       /* Hint stack must not be empty. */
+       if(HintStateStack == NIL)
+               elog(ERROR, "hint stack is empty");
 
        /*
-        * If the query was a EXECUTE or CREATE TABLE AS EXECUTE, get query string
-        * specified to preceding PREPARE command to use it as source of hints.
+        * Take a hint at the head from the list, and free it.  Switch
+        * current_hint_state to point new head (NULL if the list is empty).
         */
-       if (IsA(node, ExecuteStmt))
-       {
-               ExecuteStmt        *stmt;
+       HintStateStack = list_delete_first(HintStateStack);
+       HintStateDelete(current_hint_state);
+       if(HintStateStack == NIL)
+               current_hint_state = NULL;
+       else
+               current_hint_state = (HintState *) lfirst(list_head(HintStateStack));
+}
 
-               stmt = (ExecuteStmt *) node;
-               stmt_name = stmt->name;
-       }
+/*
+ * Retrieve and store hint string from given query or from the hint table.
+ */
+static void
+get_current_hint_string(ParseState *pstate, Query *query)
+{
+       const char *query_str;
+       MemoryContext   oldcontext;
 
-       /*
-        * CREATE AS EXECUTE behavior has changed since 9.2, so we must handle it
-        * specially here.
-        */
-       if (IsA(node, CreateTableAsStmt))
-       {
-               CreateTableAsStmt          *stmt;
-               Query              *query;
+       /* do nothing under hint table search */
+       if (hint_inhibit_level > 0)
+               return;
+
+       /* We alredy have one, don't parse it again. */
+       if (current_hint_retrieved)
+               return;
 
-               stmt = (CreateTableAsStmt *) node;
-               Assert(IsA(stmt->query, Query));
-               query = (Query *) stmt->query;
+       /* Don't parse the current query hereafter */
+       current_hint_retrieved = true;
 
-               if (query->commandType == CMD_UTILITY &&
-                       IsA(query->utilityStmt, ExecuteStmt))
+       if (!pg_hint_plan_enable_hint)
+       {
+               if (current_hint_str)
                {
-                       ExecuteStmt *estmt = (ExecuteStmt *) query->utilityStmt;
-                       stmt_name = estmt->name;
+                       pfree((void *)current_hint_str);
+                       current_hint_str = NULL;
                }
+               return;
        }
 
-       if (stmt_name)
+       /* increment the query number */
+       qnostr[0] = 0;
+       if (debug_level > 1)
+               snprintf(qnostr, sizeof(qnostr), "[qno=0x%x]", qno++);
+       qno++;
+
+       /* search the hint table for a hint if requested */
+       if (pg_hint_plan_enable_hint_table)
        {
-               if (debug_level > 1)
-                       ereport(pg_hint_plan_message_level,
-                                       (errmsg ("pg_hint_plan: ProcessUtility:"
-                                                        " stmt_name = \"%s\", statement=\"%s\"",
-                                                        stmt_name, queryString)));
+               int                             query_len;
+               pgssJumbleState jstate;
+               Query              *jumblequery;
+               char               *normalized_query = NULL;
 
-               PG_TRY();
+               query_str = get_query_string(pstate, query, &jumblequery);
+
+               /* If this query is not for hint, just return */
+               if (!query_str)
+                       return;
+
+               /* clear the previous hint string */
+               if (current_hint_str)
                {
-                       if (prev_ProcessUtility)
-                               (*prev_ProcessUtility) (parsetree, queryString,
-                                                                               context, params,
-                                                                               dest, completionTag);
-                       else
-                               standard_ProcessUtility(parsetree, queryString,
-                                                                               context, params,
-                                                                               dest, completionTag);
+                       pfree((void *)current_hint_str);
+                       current_hint_str = NULL;
                }
-               PG_CATCH();
+               
+               if (jumblequery)
                {
-                       stmt_name = NULL;
-                       PG_RE_THROW();
+                       /*
+                        * XXX: normalization code is copied from pg_stat_statements.c.
+                        * Make sure to keep up-to-date with it.
+                        */
+                       jstate.jumble = (unsigned char *) palloc(JUMBLE_SIZE);
+                       jstate.jumble_len = 0;
+                       jstate.clocations_buf_size = 32;
+                       jstate.clocations = (pgssLocationLen *)
+                               palloc(jstate.clocations_buf_size * sizeof(pgssLocationLen));
+                       jstate.clocations_count = 0;
+
+                       JumbleQuery(&jstate, jumblequery);
+
+                       /*
+                        * Normalize the query string by replacing constants with '?'
+                        */
+                       /*
+                        * Search hint string which is stored keyed by query string
+                        * and application name.  The query string is normalized to allow
+                        * fuzzy matching.
+                        *
+                        * Adding 1 byte to query_len ensures that the returned string has
+                        * a terminating NULL.
+                        */
+                       query_len = strlen(query_str) + 1;
+                       normalized_query =
+                               generate_normalized_query(&jstate, query_str, 0, &query_len,
+                                                                                 GetDatabaseEncoding());
+
+                       /*
+                        * find a hint for the normalized query. the result should be in
+                        * TopMemoryContext
+                        */
+                       oldcontext = MemoryContextSwitchTo(TopMemoryContext);
+                       current_hint_str =
+                               get_hints_from_table(normalized_query, application_name);
+                       MemoryContextSwitchTo(oldcontext);
+
+                       if (debug_level > 1)
+                       {
+                               if (current_hint_str)
+                                       ereport(pg_hint_plan_debug_message_level,
+                                                       (errmsg("pg_hint_plan[qno=0x%x]: "
+                                                                       "post_parse_analyze_hook: "
+                                                                       "hints from table: \"%s\": "
+                                                                       "normalized_query=\"%s\", "
+                                                                       "application name =\"%s\"",
+                                                                       qno, current_hint_str,
+                                                                       normalized_query, application_name),
+                                                        errhidestmt(msgqno != qno),
+                                                        errhidecontext(msgqno != qno)));
+                               else
+                                       ereport(pg_hint_plan_debug_message_level,
+                                                       (errmsg("pg_hint_plan[qno=0x%x]: "
+                                                                       "no match found in table:  "
+                                                                       "application name = \"%s\", "
+                                                                       "normalized_query=\"%s\"",
+                                                                       qno, application_name,
+                                                                       normalized_query),
+                                                        errhidestmt(msgqno != qno),
+                                                        errhidecontext(msgqno != qno)));
+
+                               msgqno = qno;
+                       }
                }
-               PG_END_TRY();
 
-               stmt_name = NULL;
+               /* retrun if we have hint here */
+               if (current_hint_str)
+                       return;
+       }
+       else
+               query_str = get_query_string(pstate, query, NULL);
 
-               return;
+       if (query_str)
+       {
+               /*
+                * get hints from the comment. However we may have the same query
+                * string with the previous call, but the extra comparison seems no
+                * use..
+                */
+               if (current_hint_str)
+                       pfree((void *)current_hint_str);
+
+               oldcontext = MemoryContextSwitchTo(TopMemoryContext);
+               current_hint_str = get_hints_from_comment(query_str);
+               MemoryContextSwitchTo(oldcontext);
+       }
+       else
+       {
+               /*
+                * Failed to get query. We would be in fetching invalidated
+                * plancache. Try the next chance.
+                */
+               current_hint_retrieved = false;
        }
 
-       if (prev_ProcessUtility)
-                       (*prev_ProcessUtility) (parsetree, queryString,
-                                                                       context, params,
-                                                                       dest, completionTag);
+       if (debug_level > 1)
+       {
+               if (debug_level == 1 && query_str && debug_query_string &&
+                       strcmp(query_str, debug_query_string))
+                       ereport(pg_hint_plan_debug_message_level,
+                                       (errmsg("hints in comment=\"%s\"",
+                                                       current_hint_str ? current_hint_str : "(none)"),
+                                        errhidestmt(msgqno != qno),
+                                        errhidecontext(msgqno != qno)));
                else
-                       standard_ProcessUtility(parsetree, queryString,
-                                                                       context, params,
-                                                                       dest, completionTag);
+                       ereport(pg_hint_plan_debug_message_level,
+                                       (errmsg("hints in comment=\"%s\", query=\"%s\", debug_query_string=\"%s\"",
+                                                       current_hint_str ? current_hint_str : "(none)",
+                                                       query_str ? query_str : "(none)",
+                                                       debug_query_string ? debug_query_string : "(none)"),
+                                        errhidestmt(msgqno != qno),
+                                        errhidecontext(msgqno != qno)));
+               msgqno = qno;
+       }
 }
 
 /*
- * Push a hint into hint stack which is implemented with List struct.  Head of
- * list is top of stack.
+ * Retrieve hint string from the current query.
  */
 static void
-push_hint(HintState *hstate)
+pg_hint_plan_post_parse_analyze(ParseState *pstate, Query *query)
 {
-       /* Prepend new hint to the list means pushing to stack. */
-       HintStateStack = lcons(hstate, HintStateStack);
+       if (prev_post_parse_analyze_hook)
+               prev_post_parse_analyze_hook(pstate, query);
 
-       /* Pushed hint is the one which should be used hereafter. */
-       current_hint_state = hstate;
+       /* always retrieve hint from the top-level query string */
+       if (plpgsql_recurse_level == 0)
+               current_hint_retrieved = false;
+
+       get_current_hint_string(pstate, query);
 }
 
-/* Pop a hint from hint stack.  Popped hint is automatically discarded. */
+/*
+ * We need to reset current_hint_retrieved flag always when a command execution
+ * is finished. This is true even for a pure utility command that doesn't
+ * involve planning phase.
+ */
 static void
-pop_hint(void)
+pg_hint_plan_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
+                                       ProcessUtilityContext context,
+                                       ParamListInfo params, QueryEnvironment *queryEnv,
+                                       DestReceiver *dest, char *completionTag)
 {
-       /* Hint stack must not be empty. */
-       if(HintStateStack == NIL)
-               elog(ERROR, "hint stack is empty");
-
-       /*
-        * Take a hint at the head from the list, and free it.  Switch
-        * current_hint_state to point new head (NULL if the list is empty).
-        */
-       HintStateStack = list_delete_first(HintStateStack);
-       HintStateDelete(current_hint_state);
-       if(HintStateStack == NIL)
-               current_hint_state = NULL;
+       if (prev_ProcessUtility_hook)
+               prev_ProcessUtility_hook(pstmt, queryString, context, params, queryEnv,
+                                                                dest, completionTag);
        else
-               current_hint_state = (HintState *) lfirst(list_head(HintStateStack));
+               standard_ProcessUtility(pstmt, queryString, context, params, queryEnv,
+                                                                dest, completionTag);
+
+       if (plpgsql_recurse_level == 0)
+               current_hint_retrieved = false;
 }
 
+/*
+ * Read and set up hint information
+ */
 static PlannedStmt *
 pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 {
-       const char         *hints = NULL;
-       const char         *query;
-       char               *norm_query;
-       pgssJumbleState jstate;
-       int                             query_len;
        int                             save_nestlevel;
        PlannedStmt        *result;
        HintState          *hstate;
-       char                    msgstr[1024];
-
-       qnostr[0] = 0;
-       strcpy(msgstr, "");
-       if (debug_level > 1)
-               snprintf(qnostr, sizeof(qnostr), "[qno=0x%x]", qno++);
-       hidestmt = false;
+       const char         *prev_hint_str = NULL;
 
        /*
         * Use standard planner if pg_hint_plan is disabled or current nesting 
@@ -2806,103 +3016,50 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
        if (!pg_hint_plan_enable_hint || hint_inhibit_level > 0)
        {
                if (debug_level > 1)
-                       elog(pg_hint_plan_message_level,
-                                "pg_hint_plan%s: planner: enable_hint=%d,"
-                                " hint_inhibit_level=%d",
-                                qnostr, pg_hint_plan_enable_hint, hint_inhibit_level);
-               hidestmt = true;
+                       ereport(pg_hint_plan_debug_message_level,
+                                       (errmsg ("pg_hint_plan%s: planner: enable_hint=%d,"
+                                                        " hint_inhibit_level=%d",
+                                                        qnostr, pg_hint_plan_enable_hint,
+                                                        hint_inhibit_level),
+                                        errhidestmt(msgqno != qno)));
+               msgqno = qno;
 
                goto standard_planner_proc;
        }
 
-       /* Create hint struct from client-supplied query string. */
-       query = get_query_string();
-
        /*
-        * Create hintstate from hint specified for the query, if any.
-        *
-        * First we lookup hint in pg_hint.hints table by normalized query string,
-        * unless pg_hint_plan.enable_hint_table is OFF.
-        * This parameter provides option to avoid overhead of table lookup during
-        * planning.
-        *
-        * If no hint was found, then we try to get hint from special query comment.
+        * Support for nested plpgsql functions. This is quite ugly but this is the
+        * only point I could find where I can get the query string.
         */
-       if (pg_hint_plan_enable_hint_table)
+       if (plpgsql_recurse_level > 0 &&
+               error_context_stack && error_context_stack->arg)
        {
-               /*
-                * Search hint information which is stored for the query and the
-                * application.  Query string is normalized before using in condition
-                * in order to allow fuzzy matching.
-                *
-                * XXX: normalizing code is copied from pg_stat_statements.c, so be
-                * careful when supporting PostgreSQL's version up.
-                */
-               jstate.jumble = (unsigned char *) palloc(JUMBLE_SIZE);
-               jstate.jumble_len = 0;
-               jstate.clocations_buf_size = 32;
-               jstate.clocations = (pgssLocationLen *)
-                       palloc(jstate.clocations_buf_size * sizeof(pgssLocationLen));
-               jstate.clocations_count = 0;
-               JumbleQuery(&jstate, parse);
-               /*
-                * generate_normalized_query() copies exact given query_len bytes, so we
-                * add 1 byte for null-termination here.  As comments on
-                * generate_normalized_query says, generate_normalized_query doesn't
-                * take care of null-terminate, but additional 1 byte ensures that '\0'
-                * byte in the source buffer to be copied into norm_query.
-                */
-               query_len = strlen(query) + 1;
-               norm_query = generate_normalized_query(&jstate,
-                                                                                          query,
-                                                                                          &query_len,
-                                                                                          GetDatabaseEncoding());
-               hints = get_hints_from_table(norm_query, application_name);
-               if (debug_level > 1)
-               {
-                       if (hints)
-                               snprintf(msgstr, 1024, "hints from table: \"%s\":"
-                                                " normalzed_query=\"%s\", application name =\"%s\"",
-                                                hints, norm_query, application_name);
-                       else
-                       {
-                               ereport(pg_hint_plan_message_level,
-                                               (errhidestmt(hidestmt),
-                                                errmsg("pg_hint_plan%s:"
-                                                               " no match found in table:"
-                                                               "  application name = \"%s\","
-                                                               " normalzed_query=\"%s\"",
-                                                               qnostr, application_name, norm_query)));
-                               hidestmt = true;
-                       }
-               }
-       }
-       if (hints == NULL)
-       {
-               hints = get_hints_from_comment(query);
+               MemoryContext oldcontext;
 
-               if (debug_level > 1)
-               {
-                       snprintf(msgstr, 1024, "hints in comment=\"%s\"",
-                                        hints ? hints : "(none)");
-                       if (debug_level > 2 || 
-                               stmt_name || strcmp(query, debug_query_string))
-                               snprintf(msgstr + strlen(msgstr), 1024- strlen(msgstr), 
-                                        ", stmt=\"%s\", query=\"%s\", debug_query_string=\"%s\"",
-                                                stmt_name, query, debug_query_string);
-               }
+               oldcontext = MemoryContextSwitchTo(TopMemoryContext);
+               current_hint_str =
+                       get_hints_from_comment((char *)error_context_stack->arg);
+               MemoryContextSwitchTo(oldcontext);
        }
 
-       hstate = create_hintstate(parse, hints);
-
        /*
-        * Use standard planner if the statement has not valid hint.  Other hook
-        * functions try to change plan with current_hint_state if any, so set it
-        * to NULL.
+        * Query execution in extended protocol can be started without the analyze
+        * phase. In the case retrieve hint string here.
         */
-       if (!hstate)
+       if (!current_hint_str)
+               get_current_hint_string(NULL, parse);
+
+       /* No hint, go the normal way */
+       if (!current_hint_str)
                goto standard_planner_proc;
 
+       /* parse the hint into hint state struct */
+       hstate = create_hintstate(parse, pstrdup(current_hint_str));
+
+       /* run standard planner if the statement has not valid hint */
+       if (!hstate)
+               goto standard_planner_proc;
+       
        /*
         * Push new hint struct to the hint stack to disable previous hint context.
         */
@@ -2918,7 +3075,10 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
        
        current_hint_state->init_scan_mask = get_current_scan_mask();
        current_hint_state->init_join_mask = get_current_join_mask();
-       current_hint_state->init_min_para_size = min_parallel_relation_size;
+       current_hint_state->init_min_para_tablescan_size =
+               min_parallel_table_scan_size;
+       current_hint_state->init_min_para_indexscan_size =
+               min_parallel_index_scan_size;
        current_hint_state->init_paratup_cost = parallel_tuple_cost;
        current_hint_state->init_parasetup_cost = parallel_setup_cost;
 
@@ -2933,14 +3093,22 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 
        if (debug_level > 1)
        {
-               ereport(pg_hint_plan_message_level,
-                               (errhidestmt(hidestmt),
-                                errmsg("pg_hint_plan%s: planner: %s",
-                                               qnostr, msgstr))); 
-               hidestmt = true;
+               ereport(pg_hint_plan_debug_message_level,
+                               (errhidestmt(msgqno != qno),
+                                errmsg("pg_hint_plan%s: planner", qnostr))); 
+               msgqno = qno;
        }
 
        /*
+        * The planner call below may replace current_hint_str. Store and restore
+        * it so that the subsequent planning in the upper level doesn't get
+        * confused.
+        */
+       recurse_level++;
+       prev_hint_str = current_hint_str;
+       current_hint_str = NULL;
+       
+       /*
         * Use PG_TRY mechanism to recover GUC parameters and current_hint_state to
         * the state when this planner started when error occurred in planner.
         */
@@ -2950,6 +3118,9 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
                        result = (*prev_planner) (parse, cursorOptions, boundParams);
                else
                        result = standard_planner(parse, cursorOptions, boundParams);
+
+               current_hint_str = prev_hint_str;
+               recurse_level--;
        }
        PG_CATCH();
        {
@@ -2957,12 +3128,25 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
                 * Rollback changes of GUC parameters, and pop current hint context
                 * from hint stack to rewind the state.
                 */
+               current_hint_str = prev_hint_str;
+               recurse_level--;
                AtEOXact_GUC(true, save_nestlevel);
                pop_hint();
                PG_RE_THROW();
        }
        PG_END_TRY();
 
+
+       /*
+        * current_hint_str is useless after planning of the top-level query.
+        */
+       if (recurse_level < 1 && current_hint_str)
+       {
+               pfree((void *)current_hint_str);
+               current_hint_str = NULL;
+               current_hint_retrieved = false;
+       }
+
        /* Print hint in debug mode. */
        if (debug_level == 1)
                HintStateDump(current_hint_state);
@@ -2981,11 +3165,11 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 standard_planner_proc:
        if (debug_level > 1)
        {
-               ereport(pg_hint_plan_message_level,
-                               (errhidestmt(hidestmt),
-                                errmsg("pg_hint_plan%s: planner: no valid hint (%s)",
-                                               qnostr, msgstr)));
-               hidestmt = true;
+               ereport(pg_hint_plan_debug_message_level,
+                               (errhidestmt(msgqno != qno),
+                                errmsg("pg_hint_plan%s: planner: no valid hint",
+                                               qnostr)));
+               msgqno = qno;
        }
        current_hint_state = NULL;
        if (prev_planner)
@@ -2996,26 +3180,43 @@ standard_planner_proc:
 
 /*
  * Find scan method hint to be applied to the given relation
+ *
  */
 static ScanMethodHint *
-find_scan_hint(PlannerInfo *root, Index relid, RelOptInfo *rel)
+find_scan_hint(PlannerInfo *root, Index relid)
 {
+       RelOptInfo         *rel;
        RangeTblEntry  *rte;
+       ScanMethodHint  *real_name_hint = NULL;
+       ScanMethodHint  *alias_hint = NULL;
        int                             i;
 
+       /* This should not be a join rel */
+       Assert(relid > 0);
+       rel = root->simple_rel_array[relid];
+
        /*
-        * We don't apply scan method hint if the relation is:
-        *   - not a base relation
-        *   - not an ordinary relation (such as join and subquery)
+        * This function is called for any RelOptInfo or its inheritance parent if
+        * any. If we are called from inheritance planner, the RelOptInfo for the
+        * parent of target child relation is not set in the planner info.
+        *
+        * Otherwise we should check that the reloptinfo is base relation or
+        * inheritance children.
         */
-       if (rel && (rel->reloptkind != RELOPT_BASEREL ||
-                               rel->rtekind != RTE_RELATION))
+       if (rel &&
+               rel->reloptkind != RELOPT_BASEREL &&
+               rel->reloptkind != RELOPT_OTHER_MEMBER_REL)
                return NULL;
 
+       /*
+        * This is baserel or appendrel children. We can refer to RangeTblEntry.
+        */
        rte = root->simple_rte_array[relid];
+       Assert(rte);
 
-       /* We don't force scan method of foreign tables */
-       if (rte->relkind == RELKIND_FOREIGN_TABLE)
+       /* We don't hint on other than relation and foreign tables */
+       if (rte->rtekind != RTE_RELATION ||
+               rte->relkind == RELKIND_FOREIGN_TABLE)
                return NULL;
 
        /* Find scan method hint, which matches given names, from the list. */
@@ -3027,36 +3228,66 @@ find_scan_hint(PlannerInfo *root, Index relid, RelOptInfo *rel)
                if (!hint_state_enabled(hint))
                        continue;
 
-               if (RelnameCmp(&rte->eref->aliasname, &hint->relname) == 0)
-                       return hint;
+               if (!alias_hint &&
+                       RelnameCmp(&rte->eref->aliasname, &hint->relname) == 0)
+                       alias_hint = hint;
+
+               /* check the real name for appendrel children */
+               if (!real_name_hint &&
+                       rel && rel->reloptkind == RELOPT_OTHER_MEMBER_REL)
+               {
+                       char *realname = get_rel_name(rte->relid);
+
+                       if (realname && RelnameCmp(&realname, &hint->relname) == 0)
+                               real_name_hint = hint;
+               }
+
+               /* No more match expected, break  */
+               if(alias_hint && real_name_hint)
+                       break;
        }
 
-       return NULL;
+       /* real name match precedes alias match */
+       if (real_name_hint)
+               return real_name_hint;
+
+       return alias_hint;
 }
 
 static ParallelHint *
-find_parallel_hint(PlannerInfo *root, Index relid, RelOptInfo *rel)
+find_parallel_hint(PlannerInfo *root, Index relid)
 {
+       RelOptInfo         *rel;
        RangeTblEntry  *rte;
+       ParallelHint    *real_name_hint = NULL;
+       ParallelHint    *alias_hint = NULL;
        int                             i;
 
+       /* This should not be a join rel */
+       Assert(relid > 0);
+       rel = root->simple_rel_array[relid];
+
        /*
-        * We don't apply scan method hint if the relation is:
-        *   - not a base relation and inheritance children
-        *   - not an ordinary relation (such as join and subquery)
+        * Parallel planning is appliable only on base relation, which has
+        * RelOptInfo. 
         */
-       if (!rel || rel->rtekind != RTE_RELATION ||
-               (rel->reloptkind != RELOPT_BASEREL &&
-                rel->reloptkind != RELOPT_OTHER_MEMBER_REL))
+       if (!rel)
                return NULL;
 
-       rte = root->simple_rte_array[relid];
-
-       /* We can't force scan method of foreign tables */
-       if (rte->relkind == RELKIND_FOREIGN_TABLE)
+       /*
+        * We have set root->glob->parallelModeOK if needed. What we should do here
+        * is just following the decision of planner.
+        */
+       if (!rel->consider_parallel)
                return NULL;
 
-       /* Find scan method hint, which matches given names, from the list. */
+       /*
+        * This is baserel or appendrel children. We can refer to RangeTblEntry.
+        */
+       rte = root->simple_rte_array[relid];
+       Assert(rte);
+
+       /* Find parallel method hint, which matches given names, from the list. */
        for (i = 0; i < current_hint_state->num_hints[HINT_TYPE_PARALLEL]; i++)
        {
                ParallelHint *hint = current_hint_state->parallel_hints[i];
@@ -3065,11 +3296,30 @@ find_parallel_hint(PlannerInfo *root, Index relid, RelOptInfo *rel)
                if (!hint_state_enabled(hint))
                        continue;
 
-               if (RelnameCmp(&rte->eref->aliasname, &hint->relname) == 0)
-                       return hint;
+               if (!alias_hint &&
+                       RelnameCmp(&rte->eref->aliasname, &hint->relname) == 0)
+                       alias_hint = hint;
+
+               /* check the real name for appendrel children */
+               if (!real_name_hint &&
+                       rel && rel->reloptkind == RELOPT_OTHER_MEMBER_REL)
+               {
+                       char *realname = get_rel_name(rte->relid);
+
+                       if (realname && RelnameCmp(&realname, &hint->relname) == 0)
+                               real_name_hint = hint;
+               }
+
+               /* No more match expected, break  */
+               if(alias_hint && real_name_hint)
+                       break;
        }
 
-       return NULL;
+       /* real name match precedes alias match */
+       if (real_name_hint)
+               return real_name_hint;
+
+       return alias_hint;
 }
 
 /*
@@ -3214,7 +3464,7 @@ restrict_indexes(PlannerInfo *root, ScanMethodHint *hint, RelOptInfo *rel,
                                                break;
 
                                        c_attname = get_attname(relationObjectId,
-                                                                                               info->indexkeys[i]);
+                                                                                       info->indexkeys[i], false);
 
                                        /* deny if any of column attributes don't match */
                                        if (strcmp(p_attname, c_attname) != 0 ||
@@ -3241,7 +3491,7 @@ restrict_indexes(PlannerInfo *root, ScanMethodHint *hint, RelOptInfo *rel,
 
                                        /* check expressions if both expressions are available */
                                        if (p_info->expression_str &&
-                                               !heap_attisnull(ht_idx, Anum_pg_index_indexprs))
+                                               !heap_attisnull(ht_idx, Anum_pg_index_indexprs, NULL))
                                        {
                                                Datum       exprsDatum;
                                                bool        isnull;
@@ -3272,7 +3522,7 @@ restrict_indexes(PlannerInfo *root, ScanMethodHint *hint, RelOptInfo *rel,
 
                                        /* compare index predicates  */
                                        if (p_info->indpred_str &&
-                                               !heap_attisnull(ht_idx, Anum_pg_index_indpred))
+                                               !heap_attisnull(ht_idx, Anum_pg_index_indpred, NULL))
                                        {
                                                Datum       predDatum;
                                                bool        isnull;
@@ -3343,7 +3593,7 @@ restrict_indexes(PlannerInfo *root, ScanMethodHint *hint, RelOptInfo *rel,
                initStringInfo(&rel_buf);
                quote_value(&rel_buf, disprelname);
 
-               ereport(LOG,
+               ereport(pg_hint_plan_debug_message_level,
                                (errmsg("available indexes for %s(%s):%s",
                                         hint->base.keyword,
                                         rel_buf.data,
@@ -3377,9 +3627,14 @@ get_parent_index_info(Oid indexoid, Oid relid)
        p_info->opclass = (Oid *) palloc(sizeof(Oid) * index->indnatts);
        p_info->indoption = (int16 *) palloc(sizeof(Oid) * index->indnatts);
 
+       /*
+        * Collect relation attribute names of index columns for index
+        * identification, not index attribute names. NULL means expression index
+        * columns.
+        */
        for (i = 0; i < index->indnatts; i++)
        {
-               attname = get_attname(relid, index->indkey.values[i]);
+               attname = get_attname(relid, index->indkey.values[i], true);
                p_info->column_names = lappend(p_info->column_names, attname);
 
                p_info->indcollation[i] = indexRelation->rd_indcollation[i];
@@ -3391,7 +3646,8 @@ get_parent_index_info(Oid indexoid, Oid relid)
         * to check to match the expression's parameter of index with child indexes
         */
        p_info->expression_str = NULL;
-       if(!heap_attisnull(indexRelation->rd_indextuple, Anum_pg_index_indexprs))
+       if(!heap_attisnull(indexRelation->rd_indextuple, Anum_pg_index_indexprs,
+                                          NULL))
        {
                Datum       exprsDatum;
                bool            isnull;
@@ -3411,7 +3667,8 @@ get_parent_index_info(Oid indexoid, Oid relid)
         * to check to match the predicate's parameter of index with child indexes
         */
        p_info->indpred_str = NULL;
-       if(!heap_attisnull(indexRelation->rd_indextuple, Anum_pg_index_indpred))
+       if(!heap_attisnull(indexRelation->rd_indextuple, Anum_pg_index_indpred,
+                                          NULL))
        {
                Datum       predDatum;
                bool            isnull;
@@ -3443,10 +3700,13 @@ reset_hint_enforcement()
 }
 
 /*
- * Set planner guc parameters according to corresponding scan hints.
+ * Set planner guc parameters according to corresponding scan hints.  Returns
+ * bitmap of HintTypeBitmap. If shint or phint is not NULL, set used hint
+ * there respectively.
  */
-static bool
-setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel)
+static int
+setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel,
+                                          ScanMethodHint **rshint, ParallelHint **rphint)
 {
        Index   new_parent_relid = 0;
        ListCell *l;
@@ -3454,6 +3714,11 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel)
        ParallelHint   *phint = NULL;
        bool                    inhparent = root->simple_rte_array[rel->relid]->inh;
        Oid             relationObjectId = root->simple_rte_array[rel->relid]->relid;
+       int                             ret = 0;
+
+       /* reset returns if requested  */
+       if (rshint != NULL) *rshint = NULL;
+       if (rphint != NULL) *rphint = NULL;
 
        /*
         * We could register the parent relation of the following children here
@@ -3464,8 +3729,18 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel)
         */
        if (inhparent)
        {
+               /* set up only parallel hints for parent relation */
+               phint = find_parallel_hint(root, rel->relid);
+               if (phint)
+               {
+                       setup_parallel_plan_enforcement(phint, current_hint_state);
+                       if (rphint) *rphint = phint;
+                       ret |= HINT_BM_PARALLEL;
+                       return ret;
+               }
+
                if (debug_level > 1)
-                       ereport(pg_hint_plan_message_level,
+                       ereport(pg_hint_plan_debug_message_level,
                                        (errhidestmt(true),
                                         errmsg ("pg_hint_plan%s: setup_hint_enforcement"
                                                         " skipping inh parent: relation=%u(%s), inhparent=%d,"
@@ -3473,45 +3748,70 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel)
                                                         qnostr, relationObjectId,
                                                         get_rel_name(relationObjectId),
                                                         inhparent, current_hint_state, hint_inhibit_level)));
-               return false;
+               return 0;
        }
 
-       /* Find the parent for this relation other than the registered parent */
-       foreach (l, root->append_rel_list)
+       /*
+        * Forget about the parent of another subquery, but don't forget if the
+        * inhTargetkind of the root is not INHKIND_NONE, which signals the root
+        * contains only appendrel members. See inheritance_planner for details.
+        *
+        * (PG12.0) 428b260f87 added one more planning cycle for updates on
+        * partitioned tables and hints set up in the cycle are overriden by the
+        * second cycle. Since I didn't find no apparent distinction between the
+        * PlannerRoot of the cycle and that of ordinary CMD_SELECT, pg_hint_plan
+        * accepts both cycles and the later one wins. In the second cycle root
+        * doesn't have inheritance information at all so use the parent_relid set
+        * in the first cycle.
+        */
+       if (root->inhTargetKind == INHKIND_NONE)
        {
-               AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l);
+               if (root != current_hint_state->current_root)
+                       current_hint_state->parent_relid = 0;
 
-               if (appinfo->child_relid == rel->relid)
+               /* Find the parent for this relation other than the registered parent */
+               foreach (l, root->append_rel_list)
                {
-                       if (current_hint_state->parent_relid != appinfo->parent_relid)
-                               new_parent_relid = appinfo->parent_relid;
-                       break;
+                       AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l);
+
+                       if (appinfo->child_relid == rel->relid)
+                       {
+                               if (current_hint_state->parent_relid != appinfo->parent_relid)
+                               {
+                                       new_parent_relid = appinfo->parent_relid;
+                                       current_hint_state->current_root = root;
+                               }
+                               break;
+                       }
                }
-       }
 
-       if (!l)
-       {
-               /* This relation doesn't have a parent. Cancel current_hint_state. */
-               current_hint_state->parent_relid = 0;
-               current_hint_state->parent_scan_hint = NULL;
-               current_hint_state->parent_parallel_hint = NULL;
+               if (!l)
+               {
+                       /*
+                        * This relation doesn't have a parent. Cancel
+                        * current_hint_state.
+                        */
+                       current_hint_state->parent_relid = 0;
+                       current_hint_state->parent_scan_hint = NULL;
+                       current_hint_state->parent_parallel_hint = NULL;
+               }
        }
 
        if (new_parent_relid > 0)
        {
                /*
                 * Here we found a new parent for the current relation. Scan continues
-                * hint to other childrens of this parent so remember it to avoid
-                * hinthintredundant setup cost.
+                * hint to other childrens of this parent so remember it to avoid
+                * redundant setup cost.
                 */
                current_hint_state->parent_relid = new_parent_relid;
                                
                /* Find hints for the parent */
                current_hint_state->parent_scan_hint =
-                       find_scan_hint(root, current_hint_state->parent_relid, NULL);
+                       find_scan_hint(root, current_hint_state->parent_relid);
 
                current_hint_state->parent_parallel_hint =
-                       find_parallel_hint(root, current_hint_state->parent_relid, NULL);
+                       find_parallel_hint(root, current_hint_state->parent_relid);
 
                /*
                 * If hint is found for the parent, apply it for this child instead
@@ -3560,16 +3860,17 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel)
                }
        }
 
-       if (current_hint_state->parent_scan_hint)
+       shint = find_scan_hint(root, rel->relid);
+       if (!shint)
                shint = current_hint_state->parent_scan_hint;
-       else
-               shint = find_scan_hint(root, rel->relid, rel);
 
        if (shint)
        {
                bool using_parent_hint =
                        (shint == current_hint_state->parent_scan_hint);
 
+               ret |= HINT_BM_SCAN_METHOD;
+
                /* Setup scan enforcement environment */
                setup_scan_method_enforcement(shint, current_hint_state);
 
@@ -3583,7 +3884,7 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel)
                        if (shint == current_hint_state->parent_scan_hint)
                                additional_message = " by parent hint";
 
-                       ereport(pg_hint_plan_message_level,
+                       ereport(pg_hint_plan_debug_message_level,
                                        (errhidestmt(true),
                                         errmsg ("pg_hint_plan%s: setup_hint_enforcement"
                                                         " index deletion%s:"
@@ -3600,20 +3901,22 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel)
        }
 
        /* Do the same for parallel plan enforcement */
-       if (current_hint_state->parent_parallel_hint)
+       phint = find_parallel_hint(root, rel->relid);
+       if (!phint)
                phint = current_hint_state->parent_parallel_hint;
-       else
-               phint = find_parallel_hint(root, rel->relid, rel);
 
        setup_parallel_plan_enforcement(phint, current_hint_state);
 
+       if (phint)
+               ret |= HINT_BM_PARALLEL;
+
        /* Nothing to apply. Reset the scan mask to intial state */
        if (!shint && ! phint)
        {
                if (debug_level > 1)
-                       ereport(pg_hint_plan_message_level,
+                       ereport(pg_hint_plan_debug_message_level,
                                        (errhidestmt (true),
-                                        errmsg ("pg_hint_plan%s: get_relation_info"
+                                        errmsg ("pg_hint_plan%s: setup_hint_enforcement"
                                                         " no hint applied:"
                                                         " relation=%u(%s), inhparent=%d, current_hint=%p,"
                                                         " hint_inhibit_level=%d, scanmask=0x%x",
@@ -3624,10 +3927,13 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel)
 
                setup_scan_method_enforcement(NULL,     current_hint_state);
 
-               return false;
+               return ret;
        }
 
-       return true;
+       if (rshint != NULL) *rshint = shint;
+       if (rphint != NULL) *rphint = phint;
+
+       return ret;
 }
 
 /*
@@ -4126,14 +4432,10 @@ add_paths_to_joinrel_wrapper(PlannerInfo *root,
                                                         SpecialJoinInfo *sjinfo,
                                                         List *restrictlist)
 {
-       ScanMethodHint *scan_hint = NULL;
        Relids                  joinrelids;
        JoinMethodHint *join_hint;
        int                             save_nestlevel;
 
-       if ((scan_hint = find_scan_hint(root, innerrel->relid, innerrel)) != NULL)
-               setup_scan_method_enforcement(scan_hint, current_hint_state);
-
        joinrelids = bms_union(outerrel->relids, innerrel->relids);
        join_hint = find_join_hint(joinrelids);
        bms_free(joinrelids);
@@ -4168,10 +4470,6 @@ add_paths_to_joinrel_wrapper(PlannerInfo *root,
        else
                add_paths_to_joinrel(root, joinrel, outerrel, innerrel, jointype,
                                                         sjinfo, restrictlist);
-
-       /* Reset the environment if changed */
-       if (scan_hint != NULL)
-               setup_scan_method_enforcement(NULL, current_hint_state);
 }
 
 static int
@@ -4241,6 +4539,38 @@ pg_hint_plan_join_search(PlannerInfo *root, int levels_needed,
 
        rel = pg_hint_plan_standard_join_search(root, levels_needed, initial_rels);
 
+       /*
+        * Adjust number of parallel workers of the result rel to the largest
+        * number of the component paths.
+        */
+       if (current_hint_state->num_hints[HINT_TYPE_PARALLEL] > 0)
+       {
+               ListCell   *lc;
+               int             nworkers = 0;
+       
+               foreach (lc, initial_rels)
+               {
+                       ListCell *lcp;
+                       RelOptInfo *rel = (RelOptInfo *) lfirst(lc);
+
+                       foreach (lcp, rel->partial_pathlist)
+                       {
+                               Path *path = (Path *) lfirst(lcp);
+
+                               if (nworkers < path-> parallel_workers)
+                                       nworkers = path-> parallel_workers;
+                       }
+               }
+
+               foreach (lc, rel->partial_pathlist)
+               {
+                       Path *path = (Path *) lfirst(lc);
+
+                       if (path->parallel_safe && path->parallel_workers < nworkers)
+                               path->parallel_workers = nworkers;
+               }
+       }
+
        for (i = 2; i <= nbaserel; i++)
        {
                list_free(current_hint_state->join_hint_level[i]);
@@ -4269,90 +4599,185 @@ pg_hint_plan_set_rel_pathlist(PlannerInfo * root, RelOptInfo *rel,
 {
        ParallelHint   *phint;
        ListCell           *l;
+       int                             found_hints;
 
        /* call the previous hook */
        if (prev_set_rel_pathlist)
                prev_set_rel_pathlist(root, rel, rti, rte);
 
-       /* Nothing to do when hint has not been parsed yet */
+       /* Nothing to do if no hint available */
        if (current_hint_state == NULL)
                return;
 
-       /* Don't touch dummy rel */
+       /* Don't touch dummy rels. */
        if (IS_DUMMY_REL(rel))
                return;
 
-       /* We cannot handle if this requires an outer */
-       if (rel->lateral_relids)
+       /*
+        * We can accept only plain relations, foreign tables and table saples are
+        * also unacceptable. See set_rel_pathlist.
+        */
+       if ((rel->rtekind != RTE_RELATION &&
+                rel->rtekind != RTE_SUBQUERY)||
+               rte->relkind == RELKIND_FOREIGN_TABLE ||
+               rte->tablesample != NULL)
                return;
 
-       if (!setup_hint_enforcement(root, rel))
+       /*
+        * Even though UNION ALL node doesn't have particular name so usually it is
+        * unhintable, turn on parallel when it contains parallel nodes.
+        */
+       if (rel->rtekind == RTE_SUBQUERY)
        {
-               /*
-                * No enforcement requested, but we might have to generate gather
-                * path on this relation
-                */
+               ListCell *lc;
+               bool    inhibit_nonparallel = false;
 
-               /* If no need of a gather path, just return */
-               if (rel->reloptkind != RELOPT_BASEREL || max_hint_nworkers < 1 ||
-                       rel->partial_pathlist == NIL)
+               if (rel->partial_pathlist == NIL)
                        return;
 
-               /* Lower the priorities of existing paths, then add a new path */
-               foreach (l, rel->pathlist)
+               foreach(lc, rel->partial_pathlist)
                {
-                       Path *path = (Path *) lfirst(l);
+                       ListCell *lcp;
+                       AppendPath *apath = (AppendPath *) lfirst(lc);
+                       int             parallel_workers = 0;
 
-                       if (path->startup_cost < disable_cost)
+                       if (!IsA(apath, AppendPath))
+                               continue;
+
+                       foreach (lcp, apath->subpaths)
                        {
-                               path->startup_cost += disable_cost;
-                               path->total_cost += disable_cost;
+                               Path *spath = (Path *) lfirst(lcp);
+
+                               if (spath->parallel_aware &&
+                                       parallel_workers < spath->parallel_workers)
+                                       parallel_workers = spath->parallel_workers;
+                       }
+
+                       apath->path.parallel_workers = parallel_workers;
+                       inhibit_nonparallel = true;
+               }
+
+               if (inhibit_nonparallel)
+               {
+                       ListCell *lc;
+
+                       foreach(lc, rel->pathlist)
+                       {
+                               Path *path = (Path *) lfirst(lc);
+
+                               if (path->startup_cost < disable_cost)
+                               {
+                                       path->startup_cost += disable_cost;
+                                       path->total_cost += disable_cost;
+                               }
                        }
                }
 
-               generate_gather_paths(root, rel);
                return;
        }
 
-       /* Here, we regenerate paths with the current hint restriction */
+       /* We cannot handle if this requires an outer */
+       if (rel->lateral_relids)
+               return;
 
-       /* Remove prviously paths except dummy rels */
-       list_free_deep(rel->pathlist);
-       rel->pathlist = NIL;
+       /* Return if this relation gets no enfocement */
+       if ((found_hints = setup_hint_enforcement(root, rel, NULL, &phint)) == 0)
+               return;
 
-       /* Rebuild access paths */
-       set_plain_rel_pathlist(root, rel, rte);
+       /* Here, we regenerate paths with the current hint restriction */
+       if (found_hints & HINT_BM_SCAN_METHOD || found_hints & HINT_BM_PARALLEL)
+       {
+               /*
+                * When hint is specified on non-parent relations, discard existing
+                * paths and regenerate based on the hint considered. Otherwise we
+                * already have hinted childx paths then just adjust the number of
+                * planned number of workers.
+                */
+               if (root->simple_rte_array[rel->relid]->inh)
+               {
+                       /* enforce number of workers if requested */
+                       if (phint && phint->force_parallel)
+                       {
+                               if (phint->nworkers == 0)
+                               {
+                                       list_free_deep(rel->partial_pathlist);
+                                       rel->partial_pathlist = NIL;
+                               }
+                               else
+                               {
+                                       /* prioritize partial paths */
+                                       foreach (l, rel->partial_pathlist)
+                                       {
+                                               Path *ppath = (Path *) lfirst(l);
 
-       /*
-        * create_plain_partial_paths creates partial paths with reasonably
-        * estimated number of workers. Force the requested number of workers if
-        * hard mode.
-        */
-       phint = find_parallel_hint(root, rel->relid, rel);
+                                               if (ppath->parallel_safe)
+                                               {
+                                                       ppath->parallel_workers = phint->nworkers;
+                                                       ppath->startup_cost = 0;
+                                                       ppath->total_cost = 0;
+                                               }
+                                       }
 
-       if (phint)
-       {
-               /* if inhibiting parallel, remove existing partial paths  */
-               if (phint->nworkers == 0 && rel->partial_pathlist)
+                                       /* disable non-partial paths */
+                                       foreach (l, rel->pathlist)
+                                       {
+                                               Path *ppath = (Path *) lfirst(l);
+
+                                               if (ppath->startup_cost < disable_cost)
+                                               {
+                                                       ppath->startup_cost += disable_cost;
+                                                       ppath->total_cost += disable_cost;
+                                               }
+                                       }
+                               }
+                       }
+               }
+               else
                {
+                       /* Just discard all the paths considered so far */
+                       list_free_deep(rel->pathlist);
+                       rel->pathlist = NIL;
                        list_free_deep(rel->partial_pathlist);
                        rel->partial_pathlist = NIL;
-               }
 
-               /* enforce number of workers if requested */
-               if (rel->partial_pathlist && phint->force_parallel)
-               {
-                       foreach (l, rel->partial_pathlist)
+                       /* Regenerate paths with the current enforcement */
+                       set_plain_rel_pathlist(root, rel, rte);
+
+                       /* Additional work to enforce parallel query execution */
+                       if (phint && phint->nworkers > 0)
                        {
-                               Path *ppath = (Path *) lfirst(l);
+                               /*
+                                * For Parallel Append to be planned properly, we shouldn't set
+                                * the costs of non-partial paths to disable-value.  Lower the
+                                * priority of non-parallel paths by setting partial path costs
+                                * to 0 instead.
+                                */
+                               foreach (l, rel->partial_pathlist)
+                               {
+                                       Path *path = (Path *) lfirst(l);
+
+                                       path->startup_cost = 0;
+                                       path->total_cost = 0;
+                               }
+
+                               /* enforce number of workers if requested */
+                               if (phint->force_parallel)
+                               {
+                                       foreach (l, rel->partial_pathlist)
+                                       {
+                                               Path *ppath = (Path *) lfirst(l);
+
+                                               if (ppath->parallel_safe)
+                                                       ppath->parallel_workers = phint->nworkers;
+                                       }
+                               }
 
-                               ppath->parallel_workers = phint->nworkers;
+                               /* Generate gather paths */
+                               if (rel->reloptkind == RELOPT_BASEREL &&
+                                       bms_membership(root->all_baserels) != BMS_SINGLETON)
+                                       generate_gather_paths(root, rel, false);
                        }
                }
-
-               /* Generate gather paths for base rels */
-               if (rel->reloptkind == RELOPT_BASEREL)
-                       generate_gather_paths(root, rel);
        }
 
        reset_hint_enforcement();
@@ -4440,7 +4865,7 @@ void plpgsql_query_erase_callback(ResourceReleasePhase phase,
                                                                  bool isTopLevel,
                                                                  void *arg)
 {
-       if (phase != RESOURCE_RELEASE_AFTER_LOCKS)
+       if (!isTopLevel || phase != RESOURCE_RELEASE_AFTER_LOCKS)
                return;
        /* Cancel plpgsql nest level*/
        plpgsql_recurse_level = 0;