X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=pg_hint_plan.c;h=3afa34c0951ab6a2bf8d48d00b2dcf7b522e2b0b;hb=b6ebe309a92328110bc66786476b29879ee1272f;hp=f13c6c79c0a7f7d76493e7bd10cff52549989a9e;hpb=be1a756dc318ac8f39f67716c0be3a765834bdb3;p=pghintplan%2Fpg_hint_plan.git diff --git a/pg_hint_plan.c b/pg_hint_plan.c index f13c6c7..3afa34c 100644 --- a/pg_hint_plan.c +++ b/pg_hint_plan.c @@ -1,13 +1,14 @@ /*------------------------------------------------------------------------- * * pg_hint_plan.c - * do instructions or hints to the planner using C-style block comments - * of the SQL. + * hinting on how to execute a query for PostgreSQL * - * Copyright (c) 2012-2016, NIPPON TELEGRAPH AND TELEPHONE CORPORATION + * Copyright (c) 2012-2018, NIPPON TELEGRAPH AND TELEPHONE CORPORATION * *------------------------------------------------------------------------- */ +#include + #include "postgres.h" #include "catalog/pg_collation.h" #include "catalog/pg_index.h" @@ -15,6 +16,8 @@ #include "mb/pg_wchar.h" #include "miscadmin.h" #include "nodes/nodeFuncs.h" +#include "nodes/params.h" +#include "nodes/relation.h" #include "optimizer/clauses.h" #include "optimizer/cost.h" #include "optimizer/geqo.h" @@ -25,12 +28,16 @@ #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" @@ -71,6 +78,8 @@ PG_MODULE_MAGIC; #define HINT_INDEXONLYSCAN "IndexOnlyScan" #define HINT_INDEXONLYSCANREGEXP "IndexOnlyScanRegexp" #define HINT_NOINDEXONLYSCAN "NoIndexOnlyScan" +#define HINT_PARALLEL "Parallel" + #define HINT_NESTLOOP "NestLoop" #define HINT_MERGEJOIN "MergeJoin" #define HINT_HASHJOIN "HashJoin" @@ -83,11 +92,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)) \ @@ -132,18 +143,31 @@ typedef enum HintKeyword HINT_KEYWORD_INDEXONLYSCAN, HINT_KEYWORD_INDEXONLYSCANREGEXP, HINT_KEYWORD_NOINDEXONLYSCAN, + HINT_KEYWORD_NESTLOOP, HINT_KEYWORD_MERGEJOIN, HINT_KEYWORD_HASHJOIN, HINT_KEYWORD_NONESTLOOP, HINT_KEYWORD_NOMERGEJOIN, HINT_KEYWORD_NOHASHJOIN, + HINT_KEYWORD_LEADING, HINT_KEYWORD_SET, HINT_KEYWORD_ROWS, + HINT_KEYWORD_PARALLEL, + HINT_KEYWORD_UNRECOGNIZED } HintKeyword; +#define SCAN_HINT_ACCEPTS_INDEX_NAMES(kw) \ + (kw == HINT_KEYWORD_INDEXSCAN || \ + kw == HINT_KEYWORD_INDEXSCANREGEXP || \ + kw == HINT_KEYWORD_INDEXONLYSCAN || \ + kw == HINT_KEYWORD_INDEXONLYSCANREGEXP || \ + kw == HINT_KEYWORD_BITMAPSCAN || \ + kw == HINT_KEYWORD_BITMAPSCANREGEXP) + + typedef struct Hint Hint; typedef struct HintState HintState; @@ -157,22 +181,30 @@ typedef const char *(*HintParseFunction) (Hint *hint, HintState *hstate, Query *parse, const char *str); /* hint types */ -#define NUM_HINT_TYPE 5 +#define NUM_HINT_TYPE 6 typedef enum HintType { HINT_TYPE_SCAN_METHOD, HINT_TYPE_JOIN_METHOD, HINT_TYPE_LEADING, HINT_TYPE_SET, - HINT_TYPE_ROWS + HINT_TYPE_ROWS, + 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", "leading", "set", - "rows" + "rows", + "parallel" }; /* hint status */ @@ -189,7 +221,9 @@ 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; /* common data for all hints. */ struct Hint @@ -282,6 +316,16 @@ typedef struct RowsHint double rows; } RowsHint; +/* parallel hints */ +typedef struct ParallelHint +{ + Hint base; + char *relname; + char *nworkers_str; /* original string of nworkers */ + int nworkers; /* num of workers specified by Worker */ + bool force_parallel; /* force parallel scan */ +} ParallelHint; + /* * Describes a context of hint processing. */ @@ -299,25 +343,30 @@ struct HintState /* for scan method hints */ ScanMethodHint **scan_hints; /* parsed scan hints */ - int init_scan_mask; /* initial value of scan parameter */ + + /* Initial values of parameters */ + int init_scan_mask; /* enable_* mask */ + int init_nworkers; /* max_parallel_workers_per_gather */ + /* 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 */ + Index parent_relid; /* inherit parent of table relid */ - ScanMethodHint *parent_hint; /* inherit parent of table scan hint */ + ScanMethodHint *parent_scan_hint; /* scan hint for the parent */ + ParallelHint *parent_parallel_hint; /* parallel hint for the parent */ List *parent_index_infos; /* list of parent table's index */ - /* for join method hints */ JoinMethodHint **join_hints; /* parsed join hints */ int init_join_mask; /* initial value join parameter */ List **join_hint_level; - - /* for Leading hint */ LeadingHint **leading_hint; /* parsed Leading hints */ - - /* for Set hints */ SetHint **set_hints; /* parsed Set hints */ GucContext context; /* which GUC parameters can we set? */ - - /* for Rows hints */ RowsHint **rows_hints; /* parsed Rows hints */ + ParallelHint **parallel_hints; /* parsed Parallel hints */ }; /* @@ -337,16 +386,9 @@ 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 PlannedStmt *pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams); -static void pg_hint_plan_get_relation_info(PlannerInfo *root, - Oid relationObjectId, - bool inhparent, RelOptInfo *rel); static RelOptInfo *pg_hint_plan_join_search(PlannerInfo *root, int levels_needed, List *initial_rels); @@ -396,6 +438,15 @@ static int RowsHintCmp(const RowsHint *a, const RowsHint *b); static const char *RowsHintParse(RowsHint *hint, HintState *hstate, Query *parse, const char *str); +/* Parallel hint callbacks */ +static Hint *ParallelHintCreate(const char *hint_str, const char *keyword, + HintKeyword hint_keyword); +static void ParallelHintDelete(ParallelHint *hint); +static void ParallelHintDesc(ParallelHint *hint, StringInfo buf, bool nolf); +static int ParallelHintCmp(const ParallelHint *a, const ParallelHint *b); +static const char *ParallelHintParse(ParallelHint *hint, HintState *hstate, + Query *parse, const char *str); + static void quote_value(StringInfo buf, const char *value); static const char *parse_quoted_value(const char *str, char **word, @@ -405,21 +456,20 @@ RelOptInfo *pg_hint_plan_standard_join_search(PlannerInfo *root, int levels_needed, List *initial_rels); void pg_hint_plan_join_search_one_level(PlannerInfo *root, int level); +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 void make_rels_by_clause_joins(PlannerInfo *root, RelOptInfo *old_rel, ListCell *other_rels); static void make_rels_by_clauseless_joins(PlannerInfo *root, RelOptInfo *old_rel, ListCell *other_rels); static bool has_join_restriction(PlannerInfo *root, RelOptInfo *rel); +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); @@ -431,20 +481,26 @@ static void plpgsql_query_erase_callback(ResourceReleasePhase phase, bool isCommit, bool isTopLevel, void *arg); +static int set_config_option_noerror(const char *name, const char *value, + GucContext context, GucSource source, + GucAction action, bool changeVal, int elevel); +static void setup_scan_method_enforcement(ScanMethodHint *scanhint, + HintState *state); +static int set_config_int32_option(const char *name, int32 value, + GucContext context); /* 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) */ +static int max_hint_nworkers = -1; /* Maximum nworkers of Workers hints */ static const struct config_enum_entry parse_messages_level_options[] = { {"debug", DEBUG2, true}, @@ -482,10 +538,10 @@ 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 get_relation_info_hook_type prev_get_relation_info = NULL; static join_search_hook_type prev_join_search = NULL; +static set_rel_pathlist_hook_type prev_set_rel_pathlist = NULL; /* Hold reference to currently active hint */ static HintState *current_hint_state = NULL; @@ -519,15 +575,19 @@ static const HintParser parsers[] = { {HINT_INDEXONLYSCANREGEXP, ScanMethodHintCreate, HINT_KEYWORD_INDEXONLYSCANREGEXP}, {HINT_NOINDEXONLYSCAN, ScanMethodHintCreate, HINT_KEYWORD_NOINDEXONLYSCAN}, + {HINT_NESTLOOP, JoinMethodHintCreate, HINT_KEYWORD_NESTLOOP}, {HINT_MERGEJOIN, JoinMethodHintCreate, HINT_KEYWORD_MERGEJOIN}, {HINT_HASHJOIN, JoinMethodHintCreate, HINT_KEYWORD_HASHJOIN}, {HINT_NONESTLOOP, JoinMethodHintCreate, HINT_KEYWORD_NONESTLOOP}, {HINT_NOMERGEJOIN, JoinMethodHintCreate, HINT_KEYWORD_NOMERGEJOIN}, {HINT_NOHASHJOIN, JoinMethodHintCreate, HINT_KEYWORD_NOHASHJOIN}, + {HINT_LEADING, LeadingHintCreate, HINT_KEYWORD_LEADING}, {HINT_SET, SetHintCreate, HINT_KEYWORD_SET}, {HINT_ROWS, RowsHintCreate, HINT_KEYWORD_ROWS}, + {HINT_PARALLEL, ParallelHintCreate, HINT_KEYWORD_PARALLEL}, + {NULL, NULL, HINT_KEYWORD_UNRECOGNIZED} }; @@ -576,7 +636,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, @@ -588,8 +648,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, @@ -598,7 +658,7 @@ _PG_init(void) NULL); DefineCustomBoolVariable("pg_hint_plan.enable_hint_table", - "Force planner to not get hint by using table lookups.", + "Let pg_hint_plan look up the hint table.", NULL, &pg_hint_plan_enable_hint_table, false, @@ -609,14 +669,14 @@ _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_get_relation_info = get_relation_info_hook; - get_relation_info_hook = pg_hint_plan_get_relation_info; 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; /* setup PL/pgSQL plugin hook */ var_ptr = (PLpgSQL_plugin **) find_rendezvous_variable("PLpgSQL_plugin"); @@ -635,10 +695,10 @@ _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; - get_relation_info_hook = prev_get_relation_info; join_search_hook = prev_join_search; + set_rel_pathlist_hook = prev_set_rel_pathlist; /* uninstall PL/pgSQL plugin hook */ var_ptr = (PLpgSQL_plugin **) find_rendezvous_variable("PLpgSQL_plugin"); @@ -851,6 +911,41 @@ RowsHintDelete(RowsHint *hint) pfree(hint); } +static Hint * +ParallelHintCreate(const char *hint_str, const char *keyword, + HintKeyword hint_keyword) +{ + ParallelHint *hint; + + hint = palloc(sizeof(ScanMethodHint)); + hint->base.hint_str = hint_str; + hint->base.keyword = keyword; + hint->base.hint_keyword = hint_keyword; + hint->base.type = HINT_TYPE_PARALLEL; + hint->base.state = HINT_STATE_NOTUSED; + hint->base.delete_func = (HintDeleteFunction) ParallelHintDelete; + hint->base.desc_func = (HintDescFunction) ParallelHintDesc; + hint->base.cmp_func = (HintCmpFunction) ParallelHintCmp; + hint->base.parse_func = (HintParseFunction) ParallelHintParse; + hint->relname = NULL; + hint->nworkers = 0; + hint->nworkers_str = "0"; + + return (Hint *) hint; +} + +static void +ParallelHintDelete(ParallelHint *hint) +{ + if (!hint) + return; + + if (hint->relname) + pfree(hint->relname); + pfree(hint); +} + + static HintState * HintStateCreate(void) { @@ -864,8 +959,14 @@ HintStateCreate(void) memset(hstate->num_hints, 0, sizeof(hstate->num_hints)); hstate->scan_hints = NULL; hstate->init_scan_mask = 0; + hstate->init_nworkers = 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->parent_relid = 0; - hstate->parent_hint = NULL; + hstate->parent_scan_hint = NULL; + hstate->parent_parallel_hint = NULL; hstate->parent_index_infos = NIL; hstate->join_hints = NULL; hstate->init_join_mask = 0; @@ -874,6 +975,7 @@ HintStateCreate(void) hstate->context = superuser() ? PGC_SUSET : PGC_USERSET; hstate->set_hints = NULL; hstate->rows_hints = NULL; + hstate->parallel_hints = NULL; return hstate; } @@ -1066,6 +1168,27 @@ RowsHintDesc(RowsHint *hint, StringInfo buf, bool nolf) appendStringInfoChar(buf, '\n'); } +static void +ParallelHintDesc(ParallelHint *hint, StringInfo buf, bool nolf) +{ + appendStringInfo(buf, "%s(", hint->base.keyword); + if (hint->relname != NULL) + { + quote_value(buf, hint->relname); + + /* number of workers */ + appendStringInfoCharMacro(buf, ' '); + quote_value(buf, hint->nworkers_str); + /* application mode of num of workers */ + appendStringInfoCharMacro(buf, ' '); + appendStringInfoString(buf, + (hint->force_parallel ? "hard" : "soft")); + } + appendStringInfoString(buf, ")"); + if (!nolf) + appendStringInfoChar(buf, '\n'); +} + /* * Append string which represents all hints in a given state to buf, with * preceding title with them. @@ -1104,7 +1227,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; } @@ -1116,7 +1239,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); } @@ -1128,7 +1252,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; } @@ -1141,9 +1265,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); } @@ -1216,6 +1341,12 @@ RowsHintCmp(const RowsHint *a, const RowsHint *b) } static int +ParallelHintCmp(const ParallelHint *a, const ParallelHint *b) +{ + return RelnameCmp(&a->relname, &b->relname); +} + +static int HintCmp(const void *a, const void *b) { const Hint *hinta = *((const Hint **) a); @@ -1517,7 +1648,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); @@ -1586,13 +1717,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(); @@ -1629,7 +1768,10 @@ get_hints_from_table(const char *client_query, const char *client_application) } SPI_finish(); - + + if (snapshot_set) + PopActiveSnapshot(); + hint_inhibit_level--; } PG_CATCH(); @@ -1643,30 +1785,107 @@ 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. We may still see a candidate + * top-level query in pstate in the case. + */ + if (!p) { - /* - * This is quite ugly but this is the only point I could find where - * we can get the query string. - */ - p = (char*)error_context_stack->arg; + /* We don't see a query string, return NULL */ + if (!pstate->p_sourcetext) + return NULL; + + p = pstate->p_sourcetext; } - else if (stmt_name) + + if (jumblequery != NULL) + *jumblequery = query; + + if (query->commandType == CMD_UTILITY) { - PreparedStatement *entry; + Query *target_query = (Query *)query->utilityStmt; + + /* + * 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. + */ + 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; + } - entry = FetchPreparedStatement(stmt_name, true); - p = entry->plansource->query_string; + 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; + + if (jumblequery) + *jumblequery = target_query; } - else - p = debug_query_string; + /* Return NULL if the pstate is not identical to the top-level query */ + else if (strcmp(pstate->p_sourcetext, p) != 0) + p = NULL; return p; } @@ -1755,6 +1974,9 @@ create_hintstate(Query *parse, const char *hints) if (hints == NULL) return NULL; + /* -1 means that no Parallel hint is specified. */ + max_hint_nworkers = -1; + p = hints; hstate = HintStateCreate(); hstate->hint_str = (char *) hints; @@ -1822,6 +2044,8 @@ create_hintstate(Query *parse, const char *hints) hstate->num_hints[HINT_TYPE_LEADING]); hstate->rows_hints = (RowsHint **) (hstate->set_hints + hstate->num_hints[HINT_TYPE_SET]); + hstate->parallel_hints = (ParallelHint **) (hstate->set_hints + + hstate->num_hints[HINT_TYPE_ROWS]); return hstate; } @@ -1843,31 +2067,24 @@ ScanMethodHintParse(ScanMethodHint *hint, HintState *hstate, Query *parse, /* Parse relation name and index name(s) if given hint accepts. */ length = list_length(name_list); - if (length > 0) + + /* at least twp parameters required */ + if (length < 1) { - hint->relname = linitial(name_list); - hint->indexnames = list_delete_first(name_list); - - /* check whether the hint accepts index name(s). */ - if (length != 1 && - hint_keyword != HINT_KEYWORD_INDEXSCAN && - hint_keyword != HINT_KEYWORD_INDEXSCANREGEXP && - hint_keyword != HINT_KEYWORD_INDEXONLYSCAN && - hint_keyword != HINT_KEYWORD_INDEXONLYSCANREGEXP && - hint_keyword != HINT_KEYWORD_BITMAPSCAN && - hint_keyword != HINT_KEYWORD_BITMAPSCANREGEXP) - { - hint_ereport(str, - ("%s hint accepts only one relation.", - hint->base.keyword)); - hint->base.state = HINT_STATE_ERROR; - return str; - } + hint_ereport(str, + ("%s hint requires a relation.", hint->base.keyword)); + hint->base.state = HINT_STATE_ERROR; + return str; } - else + + hint->relname = linitial(name_list); + hint->indexnames = list_delete_first(name_list); + + /* check whether the hint accepts index name(s) */ + if (length > 1 && !SCAN_HINT_ACCEPTS_INDEX_NAMES(hint_keyword)) { hint_ereport(str, - ("%s hint requires a relation.", + ("%s hint accepts only one relation.", hint->base.keyword)); hint->base.state = HINT_STATE_ERROR; return str; @@ -2204,12 +2421,125 @@ RowsHintParse(RowsHint *hint, HintState *hstate, Query *parse, return str; } +static const char * +ParallelHintParse(ParallelHint *hint, HintState *hstate, Query *parse, + const char *str) +{ + HintKeyword hint_keyword = hint->base.hint_keyword; + List *name_list = NIL; + int length; + char *end_ptr; + int nworkers; + bool force_parallel = false; + + if ((str = parse_parentheses(str, &name_list, hint_keyword)) == NULL) + return NULL; + + /* Parse relation name and index name(s) if given hint accepts. */ + length = list_length(name_list); + + if (length < 2 || length > 3) + { + hint_ereport(")", + ("wrong number of arguments (%d): %s", + length, hint->base.keyword)); + hint->base.state = HINT_STATE_ERROR; + return str; + } + + hint->relname = linitial(name_list); + + /* The second parameter is number of workers */ + hint->nworkers_str = list_nth(name_list, 1); + nworkers = strtod(hint->nworkers_str, &end_ptr); + if (*end_ptr || nworkers < 0 || nworkers > max_worker_processes) + { + if (*end_ptr) + hint_ereport(hint->nworkers_str, + ("number of workers must be a number: %s", + hint->base.keyword)); + else if (nworkers < 0) + hint_ereport(hint->nworkers_str, + ("number of workers must be positive: %s", + hint->base.keyword)); + 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; + } + + hint->nworkers = nworkers; + + /* optional third parameter is specified */ + if (length == 3) + { + const char *modeparam = (const char *)list_nth(name_list, 2); + if (pg_strcasecmp(modeparam, "hard") == 0) + force_parallel = true; + 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; + } + } + + hint->force_parallel = force_parallel; + + if (hint->base.state != HINT_STATE_ERROR && + nworkers > max_hint_nworkers) + max_hint_nworkers = nworkers; + + return str; +} + /* * set GUC parameter functions */ static int -set_config_option_wrapper(const char *name, const char *value, +get_current_scan_mask() +{ + int mask = 0; + + if (enable_seqscan) + mask |= ENABLE_SEQSCAN; + if (enable_indexscan) + mask |= ENABLE_INDEXSCAN; + if (enable_bitmapscan) + mask |= ENABLE_BITMAPSCAN; + if (enable_tidscan) + mask |= ENABLE_TIDSCAN; + if (enable_indexonlyscan) + mask |= ENABLE_INDEXONLYSCAN; + + return mask; +} + +static int +get_current_join_mask() +{ + int mask = 0; + + if (enable_nestloop) + mask |= ENABLE_NESTLOOP; + if (enable_mergejoin) + mask |= ENABLE_MERGEJOIN; + if (enable_hashjoin) + mask |= ENABLE_HASHJOIN; + + return mask; +} + +/* + * Sets GUC prameters without throwing exception. Reutrns false if something + * wrong. + */ +static int +set_config_option_noerror(const char *name, const char *value, GucContext context, GucSource source, GucAction action, bool changeVal, int elevel) { @@ -2232,10 +2562,10 @@ set_config_option_wrapper(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(); @@ -2243,13 +2573,33 @@ set_config_option_wrapper(const char *name, const char *value, return result; } +/* + * Sets GUC parameter of int32 type without throwing exceptions. Returns false + * if something wrong. + */ static int -set_config_options(SetHint **options, int noptions, GucContext context) +set_config_int32_option(const char *name, int32 value, GucContext context) { - int i; - int save_nestlevel; + char buf[16]; /* enough for int32 */ - save_nestlevel = NewGUCNestLevel(); + if (snprintf(buf, 16, "%d", value) < 0) + { + 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_parse_message_level); +} + +/* setup scan method enforcement according to given options */ +static void +setup_guc_enforcement(SetHint **options, int noptions, GucContext context) +{ + int i; for (i = 0; i < noptions; i++) { @@ -2259,28 +2609,84 @@ set_config_options(SetHint **options, int noptions, GucContext context) if (!hint_state_enabled(hint)) continue; - result = set_config_option_wrapper(hint->name, hint->value, 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 hint->base.state = HINT_STATE_ERROR; } - return save_nestlevel; + return; +} + +/* + * Setup parallel execution environment. + * + * If hint is not NULL, set up using it, elsewise reset to initial environment. + */ +static void +setup_parallel_plan_enforcement(ParallelHint *hint, HintState *state) +{ + if (hint) + { + hint->base.state = HINT_STATE_USED; + set_config_int32_option("max_parallel_workers_per_gather", + hint->nworkers, state->context); + } + else + set_config_int32_option("max_parallel_workers_per_gather", + state->init_nworkers, state->context); + + /* force means that enforce parallel as far as possible */ + 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_table_scan_size", 0, + state->context); + set_config_int32_option("min_parallel_index_scan_size", 0, + state->context); + } + else + { + set_config_int32_option("parallel_tuple_cost", + 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_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); + } } #define SET_CONFIG_OPTION(name, type_bits) \ - set_config_option_wrapper((name), \ + set_config_option_noerror((name), \ (mask & (type_bits)) ? "true" : "false", \ context, PGC_S_SESSION, GUC_ACTION_SAVE, true, ERROR) + +/* + * Setup GUC environment to enforce scan methods. If scanhint is NULL, reset + * GUCs to the saved state in state. + */ static void -set_scan_config_options(unsigned char enforce_mask, GucContext context) +setup_scan_method_enforcement(ScanMethodHint *scanhint, HintState *state) { + unsigned char enforce_mask = state->init_scan_mask; + GucContext context = state->context; unsigned char mask; + if (scanhint) + { + enforce_mask = scanhint->enforce_mask; + scanhint->base.state = HINT_STATE_USED; + } + if (enforce_mask == ENABLE_SEQSCAN || enforce_mask == ENABLE_INDEXSCAN || enforce_mask == ENABLE_BITMAPSCAN || enforce_mask == ENABLE_TIDSCAN || enforce_mask == (ENABLE_INDEXSCAN | ENABLE_INDEXONLYSCAN) @@ -2313,183 +2719,216 @@ 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 +push_hint(HintState *hstate) +{ + /* Prepend new hint to the list means pushing to stack. */ + HintStateStack = lcons(hstate, HintStateStack); + + /* Pushed hint is the one which should be used hereafter. */ + current_hint_state = hstate; +} +/* Pop a hint from hint stack. Popped hint is automatically discarded. */ static void -pg_hint_plan_ProcessUtility(Node *parsetree, const char *queryString, - ProcessUtilityContext context, - ParamListInfo params, - DestReceiver *dest, char *completionTag) +pop_hint(void) { - Node *node; + /* Hint stack must not be empty. */ + if(HintStateStack == NIL) + elog(ERROR, "hint stack is empty"); - /* - * Use standard planner if pg_hint_plan is disabled or current nesting - * depth is nesting depth of SPI calls. + /* + * 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 (!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; - } + 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)); +} - node = parsetree; - if (IsA(node, ExplainStmt)) - { - /* - * Draw out parse tree of actual query from Query struct of EXPLAIN - * statement. - */ - ExplainStmt *stmt; - Query *query; +/* + * Retrieve and store a hint string from given query or from the hint table. + * If we are using the hint table, the query string is needed to be normalized. + * However, ParseState, which is not available in planner_hook, is required to + * check if the query tree (Query) is surely corresponding to the target query. + */ +static void +pg_hint_plan_post_parse_analyze(ParseState *pstate, Query *query) +{ + const char *query_str; + MemoryContext oldcontext; - stmt = (ExplainStmt *) node; + if (prev_post_parse_analyze_hook) + prev_post_parse_analyze_hook(pstate, query); - Assert(IsA(stmt->query, Query)); - query = (Query *) stmt->query; - - if (query->commandType == CMD_UTILITY && query->utilityStmt != NULL) - node = query->utilityStmt; - } - - /* - * 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. - */ - if (IsA(node, ExecuteStmt)) - { - ExecuteStmt *stmt; - - stmt = (ExecuteStmt *) node; - stmt_name = stmt->name; - } + /* do nothing under hint table search */ + if (hint_inhibit_level > 0) + return; - /* - * CREATE AS EXECUTE behavior has changed since 9.2, so we must handle it - * specially here. - */ - if (IsA(node, CreateTableAsStmt)) + if (!pg_hint_plan_enable_hint) { - CreateTableAsStmt *stmt; - Query *query; - - stmt = (CreateTableAsStmt *) node; - Assert(IsA(stmt->query, Query)); - query = (Query *) stmt->query; - - if (query->commandType == CMD_UTILITY && - IsA(query->utilityStmt, ExecuteStmt)) + 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: normalizing code is copied from pg_stat_statements.c, so be + * careful to 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, 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 just retrieving hints is expected + * to be faster than checking for identicalness before retrieval. + */ + 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 && + (stmt_name || 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\", stmt=\"%s\", query=\"%s\", debug_query_string=\"%s\"", + current_hint_str ? current_hint_str : "(none)", + stmt_name, query_str, debug_query_string), + 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. + * Read and set up hint information */ -static void -push_hint(HintState *hstate) -{ - /* Prepend new hint to the list means pushing to stack. */ - HintStateStack = lcons(hstate, HintStateStack); - - /* Pushed hint is the one which should be used hereafter. */ - current_hint_state = hstate; -} - -/* 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"); - - /* - * 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; - else - current_hint_state = (HintState *) lfirst(list_head(HintStateStack)); -} - 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 @@ -2499,139 +2938,81 @@ 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); + + oldcontext = MemoryContextSwitchTo(TopMemoryContext); + current_hint_str = + get_hints_from_comment((char *)error_context_stack->arg); + MemoryContextSwitchTo(oldcontext); } - hstate = create_hintstate(parse, hints); + if (!current_hint_str) + goto standard_planner_proc; - /* - * 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. - */ + /* 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. */ push_hint(hstate); - /* Set GUC parameters which are specified with Set hint. */ - save_nestlevel = - set_config_options(current_hint_state->set_hints, + /* Set scan enforcement here. */ + save_nestlevel = NewGUCNestLevel(); + + /* Apply Set hints, then save it as the initial state */ + setup_guc_enforcement(current_hint_state->set_hints, current_hint_state->num_hints[HINT_TYPE_SET], current_hint_state->context); - /* save current status to current_hint_state */ - if (enable_seqscan) - current_hint_state->init_scan_mask |= ENABLE_SEQSCAN; - if (enable_indexscan) - current_hint_state->init_scan_mask |= ENABLE_INDEXSCAN; - if (enable_bitmapscan) - current_hint_state->init_scan_mask |= ENABLE_BITMAPSCAN; - if (enable_tidscan) - current_hint_state->init_scan_mask |= ENABLE_TIDSCAN; - if (enable_indexonlyscan) - current_hint_state->init_scan_mask |= ENABLE_INDEXONLYSCAN; - if (enable_nestloop) - current_hint_state->init_join_mask |= ENABLE_NESTLOOP; - if (enable_mergejoin) - current_hint_state->init_join_mask |= ENABLE_MERGEJOIN; - if (enable_hashjoin) - current_hint_state->init_join_mask |= ENABLE_HASHJOIN; + 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_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; + + /* + * max_parallel_workers_per_gather should be non-zero here if Workers hint + * is specified. + */ + if (max_hint_nworkers > 0 && max_parallel_workers_per_gather < 1) + set_config_int32_option("max_parallel_workers_per_gather", + 1, current_hint_state->context); + current_hint_state->init_nworkers = max_parallel_workers_per_gather; 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; } /* @@ -2675,11 +3056,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) @@ -2689,26 +3070,44 @@ standard_planner_proc: } /* - * Return scan method hint which matches given aliasname. + * 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 can'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 can'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. */ @@ -2720,11 +3119,98 @@ 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; + 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]; + + /* + * Parallel planning is appliable only on base relation, which has + * RelOptInfo. + */ + 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; + + /* + * 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]; + + /* We ignore disabled hints. */ + if (!hint_state_enabled(hint)) + continue; + + 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; + } + + /* real name match precedes alias match */ + if (real_name_hint) + return real_name_hint; + + return alias_hint; } /* @@ -2754,13 +3240,18 @@ regexpeq(const char *s1, const char *s2) return DatumGetBool(result); } + +/* Remove indexes instructed not to use by hint. */ static void -delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId) +restrict_indexes(PlannerInfo *root, ScanMethodHint *hint, RelOptInfo *rel, + bool using_parent_hint) { ListCell *cell; ListCell *prev; ListCell *next; StringInfoData buf; + RangeTblEntry *rte = root->simple_rte_array[rel->relid]; + Oid relationObjectId = rte->relid; /* * We delete all the IndexOptInfo list and prevent you from being usable by @@ -2823,10 +3314,11 @@ delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId) } /* - * to make the index a candidate when definition of this index is - * matched with the index's definition of current_hint_state. + * Apply index restriction of parent hint to children. Since index + * inheritance is not explicitly described we should search for an + * children's index with the same definition to that of the parent. */ - if (OidIsValid(relationObjectId) && !use_index) + if (using_parent_hint && !use_index) { foreach(l, current_hint_state->parent_index_infos) { @@ -2834,73 +3326,63 @@ delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId) HeapTuple ht_idx; ParentIndexInfo *p_info = (ParentIndexInfo *)lfirst(l); - /* check to match the parameter of unique */ - if (p_info->indisunique != info->unique) - continue; - - /* check to match the parameter of index's method */ - if (p_info->method != info->relam) - continue; - - /* to check to match the indexkey's configuration */ - if ((list_length(p_info->column_names)) != - info->ncolumns) + /* + * we check the 'same' index by comparing uniqueness, access + * method and index key columns. + */ + if (p_info->indisunique != info->unique || + p_info->method != info->relam || + list_length(p_info->column_names) != info->ncolumns) continue; - /* check to match the indexkey's configuration */ + /* Check if index key columns match */ for (i = 0; i < info->ncolumns; i++) { char *c_attname = NULL; char *p_attname = NULL; - p_attname = - list_nth(p_info->column_names, i); + p_attname = list_nth(p_info->column_names, i); - /* both are expressions */ + /* + * if both of the key of the same position are expressions, + * ignore them for now and check later. + */ if (info->indexkeys[i] == 0 && !p_attname) continue; - /* one's column is expression, the other is not */ + /* deny if one is expression while another is not */ if (info->indexkeys[i] == 0 || !p_attname) break; c_attname = get_attname(relationObjectId, - info->indexkeys[i]); - - if (strcmp(p_attname, c_attname) != 0) + info->indexkeys[i], false); + + /* deny if any of column attributes don't match */ + if (strcmp(p_attname, c_attname) != 0 || + p_info->indcollation[i] != info->indexcollations[i] || + p_info->opclass[i] != info->opcintype[i]|| + ((p_info->indoption[i] & INDOPTION_DESC) != 0) + != info->reverse_sort[i] || + ((p_info->indoption[i] & INDOPTION_NULLS_FIRST) != 0) + != info->nulls_first[i]) break; - - if (p_info->indcollation[i] != info->indexcollations[i]) - break; - - if (p_info->opclass[i] != info->opcintype[i]) - break; - - if (((p_info->indoption[i] & INDOPTION_DESC) != 0) != - info->reverse_sort[i]) - break; - - if (((p_info->indoption[i] & INDOPTION_NULLS_FIRST) != 0) != - info->nulls_first[i]) - break; - } + /* deny this if any difference found */ if (i != info->ncolumns) continue; + /* check on key expressions */ if ((p_info->expression_str && (info->indexprs != NIL)) || (p_info->indpred_str && (info->indpred != NIL))) { - /* - * Fetch the pg_index tuple by the Oid of the index - */ + /* fetch the index of this child */ ht_idx = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(info->indexoid)); - /* check to match the expression's parameter of index */ + /* 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; @@ -2919,28 +3401,24 @@ delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId) ObjectIdGetDatum( relationObjectId)); + /* deny if expressions don't match */ if (strcmp(p_info->expression_str, text_to_cstring(DatumGetTextP(result))) != 0) { /* Clean up */ ReleaseSysCache(ht_idx); - continue; } } - /* Check to match the predicate's parameter of index */ + /* 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; Datum result; - /* - * to change the predicate's parameter of child's - * index to strings - */ predDatum = SysCacheGetAttr(INDEXRELID, ht_idx, Anum_pg_index_indpred, &isnull); @@ -2955,7 +3433,6 @@ delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId) { /* Clean up */ ReleaseSysCache(ht_idx); - continue; } } @@ -2991,18 +3468,23 @@ delete_indexes(ScanMethodHint *hint, RelOptInfo *rel, Oid relationObjectId) if (debug_level == 1) { - char *relname; StringInfoData rel_buf; + char *disprelname = ""; - if (OidIsValid(relationObjectId)) - relname = get_rel_name(relationObjectId); + /* + * If this hint targetted the parent, use the real name of this + * child. Otherwise use hint specification. + */ + if (using_parent_hint) + disprelname = get_rel_name(rte->relid); else - relname = hint->relname; + disprelname = hint->relname; + initStringInfo(&rel_buf); - quote_value(&rel_buf, relname); + 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, @@ -3036,9 +3518,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]; @@ -3050,7 +3537,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; @@ -3070,7 +3558,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; @@ -3091,58 +3580,69 @@ get_parent_index_info(Oid indexoid, Oid relid) return p_info; } +/* + * cancel hint enforcement + */ static void -pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId, - bool inhparent, RelOptInfo *rel) +reset_hint_enforcement() { - ScanMethodHint *hint = NULL; - ListCell *l; - Index new_parent_relid = 0; + setup_scan_method_enforcement(NULL, current_hint_state); + setup_parallel_plan_enforcement(NULL, current_hint_state); +} - if (prev_get_relation_info) - (*prev_get_relation_info) (root, relationObjectId, inhparent, rel); +/* + * 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 int +setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel, + ScanMethodHint **rshint, ParallelHint **rphint) +{ + Index new_parent_relid = 0; + ListCell *l; + ScanMethodHint *shint = NULL; + ParallelHint *phint = NULL; + bool inhparent = root->simple_rte_array[rel->relid]->inh; + Oid relationObjectId = root->simple_rte_array[rel->relid]->relid; + int ret = 0; - /* - * Do nothing if we don't have a valid hint in this context or current - * nesting depth is at SPI calls. - */ - if (!current_hint_state || hint_inhibit_level > 0) - { - if (debug_level > 1) - ereport(pg_hint_plan_message_level, - (errhidestmt(true), - errmsg ("pg_hint_plan%s: get_relation_info" - " no hint to apply: relation=%u(%s), inhparent=%d," - " current_hint=%p, hint_inhibit_level=%d", - qnostr, relationObjectId, - get_rel_name(relationObjectId), - inhparent, current_hint_state, - hint_inhibit_level))); - return; - } + /* 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 - * when inhparent == true but inheritnce planner doesn't request - * information for inheritance parents. We also cannot distinguish the - * caller so we should always find the parents without this function being - * called for them. + * when inhparent == true but inheritnce planner doesn't call this function + * for parents. Since we cannot distinguish who called this function we + * cannot do other than always seeking the parent regardless of who called + * this function. */ 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: get_relation_info" + errmsg ("pg_hint_plan%s: setup_hint_enforcement" " skipping inh parent: relation=%u(%s), inhparent=%d," " current_hint_state=%p, hint_inhibit_level=%d", qnostr, relationObjectId, get_rel_name(relationObjectId), inhparent, current_hint_state, hint_inhibit_level))); - return; + return 0; } - /* Find the parent for this relation */ + /* Find the parent for this relation other than the registered parent */ foreach (l, root->append_rel_list) { AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l); @@ -3159,36 +3659,38 @@ pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId, { /* This relation doesn't have a parent. Cancel current_hint_state. */ current_hint_state->parent_relid = 0; - current_hint_state->parent_hint = NULL; + current_hint_state->parent_scan_hint = NULL; + current_hint_state->parent_parallel_hint = NULL; } if (new_parent_relid > 0) { /* - * Here we found a parent relation different from the remembered one. - * Remember it, apply the scan mask of it and then resolve the index - * restriction in order to be used by its children. + * Here we found a new parent for the current relation. Scan continues + * hint to other childrens of this parent so remember it to avoid + * redundant setup cost. */ - int scanmask = current_hint_state->init_scan_mask; - ScanMethodHint *parent_hint; - 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); + + current_hint_state->parent_parallel_hint = + find_parallel_hint(root, current_hint_state->parent_relid); + /* - * Get and apply the hint for the new parent relation. It should be an - * ordinary relation so calling find_scan_hint with rel == NULL is - * safe. + * If hint is found for the parent, apply it for this child instead + * of its own. */ - current_hint_state->parent_hint = parent_hint = - find_scan_hint(root, current_hint_state->parent_relid, NULL); - - if (parent_hint) + if (current_hint_state->parent_scan_hint) { - scanmask = current_hint_state->parent_hint->enforce_mask; - parent_hint->base.state = HINT_STATE_USED; + ScanMethodHint * pshint = current_hint_state->parent_scan_hint; - /* Resolve index name mask (if any) using the parent. */ - if (parent_hint->indexnames) + pshint->base.state = HINT_STATE_USED; + + /* Apply index mask in the same manner to the parent. */ + if (pshint->indexnames) { Oid parentrel_oid; Relation parent_rel; @@ -3205,7 +3707,7 @@ pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId, ListCell *lc; ParentIndexInfo *parent_index_info; - foreach(lc, parent_hint->indexnames) + foreach(lc, pshint->indexnames) { if (RelnameCmp(&indexname, &lfirst(lc)) == 0) break; @@ -3216,61 +3718,71 @@ pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId, parent_index_info = get_parent_index_info(indexoid, parentrel_oid); current_hint_state->parent_index_infos = - lappend(current_hint_state->parent_index_infos, parent_index_info); + lappend(current_hint_state->parent_index_infos, + parent_index_info); } heap_close(parent_rel, NoLock); } } - - set_scan_config_options(scanmask, current_hint_state->context); } - if (current_hint_state->parent_hint != 0) + shint = find_scan_hint(root, rel->relid); + if (!shint) + shint = current_hint_state->parent_scan_hint; + + if (shint) { - delete_indexes(current_hint_state->parent_hint, rel, - relationObjectId); + bool using_parent_hint = + (shint == current_hint_state->parent_scan_hint); - /* Scan fixation status is the same to the parent. */ - if (debug_level > 1) - ereport(pg_hint_plan_message_level, - (errhidestmt(true), - errmsg("pg_hint_plan%s: get_relation_info:" - " index deletion by parent hint: " - "relation=%u(%s), inhparent=%d, current_hint_state=%p," - " hint_inhibit_level=%d", - qnostr, relationObjectId, - get_rel_name(relationObjectId), - inhparent, current_hint_state, hint_inhibit_level))); - return; - } + ret |= HINT_BM_SCAN_METHOD; - /* This table doesn't have a parent hint. Apply its own hint if any. */ - if ((hint = find_scan_hint(root, rel->relid, rel)) != NULL) - { - set_scan_config_options(hint->enforce_mask, - current_hint_state->context); - hint->base.state = HINT_STATE_USED; + /* Setup scan enforcement environment */ + setup_scan_method_enforcement(shint, current_hint_state); - delete_indexes(hint, rel, InvalidOid); + /* restrict unwanted inexes */ + restrict_indexes(root, shint, rel, using_parent_hint); if (debug_level > 1) - ereport(pg_hint_plan_message_level, + { + char *additional_message = ""; + + if (shint == current_hint_state->parent_scan_hint) + additional_message = " by parent hint"; + + ereport(pg_hint_plan_debug_message_level, (errhidestmt(true), - errmsg ("pg_hint_plan%s: get_relation_info" - " index deletion:" - " relation=%u(%s), inhparent=%d, current_hint=%p," + errmsg ("pg_hint_plan%s: setup_hint_enforcement" + " index deletion%s:" + " relation=%u(%s), inhparent=%d, " + "current_hint_state=%p," " hint_inhibit_level=%d, scanmask=0x%x", - qnostr, relationObjectId, + qnostr, additional_message, + relationObjectId, get_rel_name(relationObjectId), - inhparent, current_hint_state, hint_inhibit_level, - hint->enforce_mask))); + inhparent, current_hint_state, + hint_inhibit_level, + shint->enforce_mask))); + } } - else + + /* Do the same for parallel plan enforcement */ + phint = find_parallel_hint(root, rel->relid); + if (!phint) + phint = current_hint_state->parent_parallel_hint; + + 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", @@ -3278,10 +3790,16 @@ pg_hint_plan_get_relation_info(PlannerInfo *root, Oid relationObjectId, get_rel_name(relationObjectId), inhparent, current_hint_state, hint_inhibit_level, current_hint_state->init_scan_mask))); - set_scan_config_options(current_hint_state->init_scan_mask, - current_hint_state->context); + + setup_scan_method_enforcement(NULL, current_hint_state); + + return ret; } - return; + + if (rshint != NULL) *rshint = shint; + if (rphint != NULL) *rphint = phint; + + return ret; } /* @@ -3727,98 +4245,6 @@ transform_join_hints(HintState *hstate, PlannerInfo *root, int nbaserel, } /* - * set_plain_rel_pathlist - * Build access paths for a plain relation (no subquery, no inheritance) - * - * This function was copied and edited from set_plain_rel_pathlist() in - * src/backend/optimizer/path/allpaths.c - * - * - removed parallel stuff. - */ -static void -set_plain_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte) -{ - Relids required_outer; - - /* - * We don't support pushing join clauses into the quals of a seqscan, but - * it could still have required parameterization due to LATERAL refs in - * its tlist. - */ - required_outer = rel->lateral_relids; - - /* Consider sequential scan */ - add_path(rel, create_seqscan_path(root, rel, required_outer, 0)); - - /* Consider index scans */ - create_index_paths(root, rel); - - /* Consider TID scans */ - create_tidscan_paths(root, rel); -} - -/* - * Clear exiting access paths and create new ones applying hints. - * This does the similar to set_rel_pathlist - */ -static void -rebuild_scan_path(HintState *hstate, PlannerInfo *root, int level, - List *initial_rels) -{ - ListCell *l; - - foreach(l, initial_rels) - { - RelOptInfo *rel = (RelOptInfo *) lfirst(l); - RangeTblEntry *rte; - ScanMethodHint *hint; - - /* Skip relations which we can't choose scan method. */ - if (rel->reloptkind != RELOPT_BASEREL || rel->rtekind != RTE_RELATION) - continue; - - rte = root->simple_rte_array[rel->relid]; - - /* We can't force scan method of foreign tables */ - if (rte->relkind == RELKIND_FOREIGN_TABLE) - continue; - - /* - * Create scan paths with GUC parameters which are at the beginning of - * planner if scan method hint is not specified, otherwise use - * specified hints and mark the hint as used. - */ - if ((hint = find_scan_hint(root, rel->relid, rel)) == NULL) - set_scan_config_options(hstate->init_scan_mask, - hstate->context); - else - { - set_scan_config_options(hint->enforce_mask, hstate->context); - hint->base.state = HINT_STATE_USED; - } - - list_free_deep(rel->pathlist); - rel->pathlist = NIL; - if (rte->inh) - { - /* It's an "append relation", process accordingly */ - set_append_rel_pathlist(root, rel, rel->relid, rte); - } - else - { - set_plain_rel_pathlist(root, rel, rte); - } - - set_cheapest(rel); - } - - /* - * Restore the GUC variables we set above. - */ - set_scan_config_options(hstate->init_scan_mask, hstate->context); -} - -/* * wrapper of make_join_rel() * * call make_join_rel() after changing enable_* parameters according to given @@ -3872,18 +4298,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) - { - set_scan_config_options(scan_hint->enforce_mask, - current_hint_state->context); - scan_hint->base.state = HINT_STATE_USED; - } - joinrelids = bms_union(outerrel->relids, innerrel->relids); join_hint = find_join_hint(joinrelids); bms_free(joinrelids); @@ -3918,10 +4336,6 @@ add_paths_to_joinrel_wrapper(PlannerInfo *root, else add_paths_to_joinrel(root, joinrel, outerrel, innerrel, jointype, sjinfo, restrictlist); - - if (scan_hint != NULL) - set_scan_config_options(current_hint_state->init_scan_mask, - current_hint_state->context); } static int @@ -3973,9 +4387,6 @@ pg_hint_plan_join_search(PlannerInfo *root, int levels_needed, return standard_join_search(root, levels_needed, initial_rels); } - /* apply scan method hint rebuild scan path. */ - rebuild_scan_path(current_hint_state, root, levels_needed, initial_rels); - /* * In the case using GEQO, only scan method hints and Set hints have * effect. Join method and join order is not controllable by hints. @@ -3994,6 +4405,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]); @@ -4014,11 +4457,204 @@ pg_hint_plan_join_search(PlannerInfo *root, int levels_needed, } /* + * Force number of wokers if instructed by hint + */ +void +pg_hint_plan_set_rel_pathlist(PlannerInfo * root, RelOptInfo *rel, + Index rti, RangeTblEntry *rte) +{ + 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 if no hint available */ + if (current_hint_state == NULL) + return; + + /* Don't touch dummy rels. */ + if (IS_DUMMY_REL(rel)) + return; + + /* + * 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; + + /* + * 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) + { + ListCell *lc; + bool inhibit_nonparallel = false; + + if (rel->partial_pathlist == NIL) + return; + + foreach(lc, rel->partial_pathlist) + { + ListCell *lcp; + AppendPath *apath = (AppendPath *) lfirst(lc); + int parallel_workers = 0; + + if (!IsA(apath, AppendPath)) + continue; + + foreach (lcp, apath->subpaths) + { + 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; + } + } + } + + 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 && 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); + + 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; + + /* 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) + generate_gather_paths(root, rel, false); + } + } + } + + reset_hint_enforcement(); +} + +/* * set_rel_pathlist * Build access paths for a base relation * * This function was copied and edited from set_rel_pathlist() in - * src/backend/optimizer/path/allpaths.c + * src/backend/optimizer/path/allpaths.c in order not to copy other static + * functions not required here. */ static void set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, @@ -4094,7 +4730,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;