X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=pg_hint_plan.c;h=4e2f5e592eae0ec79413d29a9e831841a325a460;hb=8241ef0732b65ff8635eb5cc56860b2e9db40ab7;hp=6b747c8c712891a570272458dba56adba27dae44;hpb=c43304db0df8b36ebf1ad205697789d1ff6c36ff;p=pghintplan%2Fpg_hint_plan.git diff --git a/pg_hint_plan.c b/pg_hint_plan.c index 6b747c8..4e2f5e5 100644 --- a/pg_hint_plan.c +++ b/pg_hint_plan.c @@ -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 #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)) \ @@ -213,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 @@ -337,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 */ @@ -373,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, @@ -451,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, @@ -463,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); @@ -492,13 +510,11 @@ 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 hint_inhibit_level = 0; /* Inhibit hinting if this is above 0 */ /* (This could not be above 1) */ @@ -540,10 +556,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; @@ -555,12 +572,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}, @@ -638,7 +649,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, @@ -650,8 +661,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, @@ -671,14 +682,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"); @@ -697,10 +710,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"); @@ -962,9 +976,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; @@ -1228,7 +1244,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; } @@ -1240,7 +1256,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); } @@ -1252,7 +1269,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; } @@ -1265,9 +1282,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); } @@ -1647,7 +1665,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); @@ -1716,13 +1734,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(); @@ -1759,7 +1785,10 @@ get_hints_from_table(const char *client_query, const char *client_application) } SPI_finish(); - + + if (snapshot_set) + PopActiveSnapshot(); + hint_inhibit_level--; } PG_CATCH(); @@ -1773,30 +1802,109 @@ 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 (plpgsql_recurse_level > 0) + /* + * 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 (!p && pstate) + p = pstate->p_sourcetext; + + /* 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); + p = entry->plansource->query_string; + target_query = (Query *) linitial (entry->plansource->query_list); + } + + /* JumbleQuery accespts only a non-utility Query */ + if (!IsA(target_query, Query) || + target_query->utilityStmt != NULL) + target_query = NULL; - entry = FetchPreparedStatement(stmt_name, true); - p = entry->plansource->query_string; + 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; } @@ -2387,9 +2495,9 @@ ParallelHintParse(ParallelHint *hint, HintState *hstate, Query *parse, 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", @@ -2473,10 +2581,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(); @@ -2495,16 +2603,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 */ @@ -2523,7 +2630,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 @@ -2552,11 +2659,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 @@ -2565,8 +2674,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); } } @@ -2625,183 +2738,256 @@ 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; - stmt = (CreateTableAsStmt *) node; - Assert(IsA(stmt->query, Query)); - query = (Query *) stmt->query; + /* We alredy have one, don't parse it again. */ + if (current_hint_retrieved) + return; - if (query->commandType == CMD_UTILITY && - IsA(query->utilityStmt, ExecuteStmt)) + /* Don't parse the current query hereafter */ + current_hint_retrieved = true; + + 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; + + query_str = get_query_string(pstate, query, &jumblequery); - PG_TRY(); + /* 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, + query->stmt_location, + &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); } - 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; /* * Use standard planner if pg_hint_plan is disabled or current nesting @@ -2811,103 +2997,52 @@ 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) - { - /* - * 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) + if (plpgsql_recurse_level > 0) { - 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); - } - } + if (current_hint_str) + pfree((void *)current_hint_str); - hstate = create_hintstate(parse, hints); + oldcontext = MemoryContextSwitchTo(TopMemoryContext); + current_hint_str = + get_hints_from_comment((char *)error_context_stack->arg); + MemoryContextSwitchTo(oldcontext); + } /* - * 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. */ @@ -2923,7 +3058,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; @@ -2938,11 +3076,10 @@ 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; } /* @@ -2968,6 +3105,17 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams) } PG_END_TRY(); + + /* + * current_hint_str is useless after planning of the top-level query. + */ + if (plpgsql_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); @@ -2986,11 +3134,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) @@ -3089,16 +3237,17 @@ find_parallel_hint(PlannerInfo *root, Index relid) rel = root->simple_rel_array[relid]; /* - * 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. + * Parallel planning is appliable only on base relation, which has + * RelOptInfo. */ - if (rel && - rel->reloptkind != RELOPT_BASEREL && - rel->reloptkind != RELOPT_OTHER_MEMBER_REL) + if (!rel) + return NULL; + + /* + * 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; /* @@ -3107,11 +3256,6 @@ find_parallel_hint(PlannerInfo *root, Index relid) rte = root->simple_rte_array[relid]; Assert(rte); - /* We don't hint on other than relation and foreign tables */ - if (rte->rtekind != RTE_RELATION || - rte->relkind == RELKIND_FOREIGN_TABLE) - return NULL; - /* Find parallel method hint, which matches given names, from the list. */ for (i = 0; i < current_hint_state->num_hints[HINT_TYPE_PARALLEL]; i++) { @@ -3289,7 +3433,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 || @@ -3316,7 +3460,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; @@ -3347,7 +3491,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; @@ -3418,7 +3562,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, @@ -3452,9 +3596,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]; @@ -3466,7 +3615,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; @@ -3486,7 +3636,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; @@ -3522,7 +3673,7 @@ reset_hint_enforcement() * bitmap of HintTypeBitmap. If shint or phint is not NULL, set used hint * there respectively. */ -static bool +static int setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel, ScanMethodHint **rshint, ParallelHint **rphint) { @@ -3547,8 +3698,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," @@ -3559,6 +3720,10 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel, return 0; } + /* Forget about the parent of another subquery */ + if (root != current_hint_state->current_root) + current_hint_state->parent_relid = 0; + /* Find the parent for this relation other than the registered parent */ foreach (l, root->append_rel_list) { @@ -3567,7 +3732,10 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel, 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; } } @@ -3584,8 +3752,8 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel, { /* * 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; @@ -3667,7 +3835,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:" @@ -3697,7 +3865,7 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel, 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: setup_hint_enforcement" " no hint applied:" @@ -4322,6 +4490,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]); @@ -4368,68 +4568,53 @@ pg_hint_plan_set_rel_pathlist(PlannerInfo * root, RelOptInfo *rel, * We can accept only plain relations, foreign tables and table saples are * also unacceptable. See set_rel_pathlist. */ - if (rel->rtekind != RTE_RELATION || + if ((rel->rtekind != RTE_RELATION && + rel->rtekind != RTE_SUBQUERY)|| rte->relkind == RELKIND_FOREIGN_TABLE || rte->tablesample != NULL) return; - /* We cannot handle if this requires an outer */ - if (rel->lateral_relids) - return; - - /* Return if this relation gets no enfocement */ - if ((found_hints = setup_hint_enforcement(root, rel, NULL, &phint)) == 0) - return; - - /* Here, we regenerate paths with the current hint restriction */ - - if (found_hints & HINT_BM_SCAN_METHOD) + /* + * 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) { - /* - * With scan hints, we regenerate paths for this relation from the - * first under the restricion. - */ - list_free_deep(rel->pathlist); - rel->pathlist = NIL; + ListCell *lc; + bool inhibit_nonparallel = false; - set_plain_rel_pathlist(root, rel, rte); - } - - if (found_hints & HINT_BM_PARALLEL) - { - Assert (phint); + if (rel->partial_pathlist == NIL) + return; - /* the partial_pathlist may be for different parameters, discard it */ - if (rel->partial_pathlist) + foreach(lc, rel->partial_pathlist) { - list_free_deep(rel->partial_pathlist); - rel->partial_pathlist = NIL; - } + ListCell *lcp; + AppendPath *apath = (AppendPath *) lfirst(lc); + int parallel_workers = 0; - /* also remove gather path */ - if (rel->pathlist) - { - ListCell *cell, *prev = NULL; + if (!IsA(apath, AppendPath)) + continue; - foreach (cell, rel->pathlist) + foreach (lcp, apath->subpaths) { - Path *path = (Path *) lfirst(cell); - - if (IsA(path, GatherPath)) - rel->pathlist = list_delete_cell(rel->pathlist, - cell, prev); - else - prev = cell; + 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; } - /* then generate new paths if needed */ - if (phint->nworkers > 0) + if (inhibit_nonparallel) { - /* Lower the priorities of non-parallel paths */ - foreach (l, rel->pathlist) + ListCell *lc; + + foreach(lc, rel->pathlist) { - Path *path = (Path *) lfirst(l); + Path *path = (Path *) lfirst(lc); if (path->startup_cost < disable_cost) { @@ -4437,30 +4622,112 @@ pg_hint_plan_set_rel_pathlist(PlannerInfo * root, RelOptInfo *rel, path->total_cost += disable_cost; } } + } - /* - * generate partial paths with enforcement, this is affected by - * scan method enforcement. Specifically, the cost of this partial - * seqscan path will be disabled_cost if seqscan is inhibited by - * hint or GUC parameters. - */ - Assert (rel->partial_pathlist == NIL); - create_plain_partial_paths(root, rel); + return; + } + + /* We cannot handle if this requires an outer */ + if (rel->lateral_relids) + return; + /* Return if this relation gets no enfocement */ + if ((found_hints = setup_hint_enforcement(root, rel, NULL, &phint)) == 0) + return; + + /* 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->force_parallel) + if (phint && phint->force_parallel) { - foreach (l, rel->partial_pathlist) + if (phint->nworkers == 0) { - Path *ppath = (Path *) lfirst(l); + list_free_deep(rel->partial_pathlist); + rel->partial_pathlist = NIL; + } + else + { + /* prioritize partial paths */ + foreach (l, rel->partial_pathlist) + { + Path *ppath = (Path *) lfirst(l); - ppath->parallel_workers = phint->nworkers; + if (ppath->parallel_safe) + { + ppath->parallel_workers = phint->nworkers; + ppath->startup_cost = 0; + ppath->total_cost = 0; + } + } + + /* 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; - /* Generate gather paths for base rels */ - if (rel->reloptkind == RELOPT_BASEREL) - generate_gather_paths(root, rel); + /* 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) + { + /* + * 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; + } + } + + /* Generate gather paths */ + if (rel->reloptkind == RELOPT_BASEREL && + bms_membership(root->all_baserels) != BMS_SINGLETON) + generate_gather_paths(root, rel, false); + } } } @@ -4549,7 +4816,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;