X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=pg_hint_plan.c;h=346950073ad74f3e05a1d4ea63484b596864e4cb;hb=2a9e14e50905decc0d37506284fbfb5bf1e094ac;hp=41baf67c13129bd386acef5eee507f661331658c;hpb=beb606750700a71618beee99a8cb65e9d81fab51;p=pghintplan%2Fpg_hint_plan.git diff --git a/pg_hint_plan.c b/pg_hint_plan.c index 41baf67..3469500 100644 --- a/pg_hint_plan.c +++ b/pg_hint_plan.c @@ -16,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" @@ -26,12 +28,15 @@ #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 "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" @@ -87,10 +92,12 @@ 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)) + do { \ + ereport(pg_hint_plan_message_level, \ + (errmsg("pg_hint_plan%s: hint syntax error at or near \"%s\"", qnostr, (str)), \ + errdetail detail)); \ + msgqno = qno; \ + } while(0) #define skip_space(str) \ while (isspace(*str)) \ @@ -184,6 +191,12 @@ typedef enum HintType HINT_TYPE_PARALLEL } HintType; +typedef enum HintTypeBitmap +{ + HINT_BM_SCAN_METHOD = 1, + HINT_BM_PARALLEL = 2 +} HintTypeBitmap; + static const char *HintTypeName[] = { "scan method", "join method", @@ -207,7 +220,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 @@ -331,7 +346,10 @@ 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 */ @@ -367,11 +385,7 @@ 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 RelOptInfo *pg_hint_plan_join_search(PlannerInfo *root, @@ -445,8 +459,8 @@ 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 add_paths_to_append_rel(PlannerInfo *root, RelOptInfo *rel, + List *live_childrels); static void make_rels_by_clause_joins(PlannerInfo *root, RelOptInfo *old_rel, ListCell *other_rels); static void make_rels_by_clauseless_joins(PlannerInfo *root, @@ -458,8 +472,9 @@ static void set_plain_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, 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); + List *live_childrels, + List *all_child_pathkeys, + List *partitioned_rels); static Path *get_cheapest_parameterized_child_path(PlannerInfo *root, RelOptInfo *rel, Relids required_outer); @@ -490,9 +505,6 @@ static int pg_hint_plan_message_level = INFO; /* 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) */ @@ -534,7 +546,7 @@ 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; @@ -665,8 +677,8 @@ _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; @@ -691,7 +703,7 @@ _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; @@ -956,7 +968,8 @@ 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->parent_relid = 0; @@ -1260,8 +1273,9 @@ HintStateDump2(HintState *hstate) appendStringInfoChar(&buf, '}'); ereport(pg_hint_plan_message_level, - (errhidestmt(true), - errmsg("%s", buf.data))); + (errmsg("%s", buf.data), + errhidestmt(true), + errhidecontext(true))); pfree(buf.data); } @@ -1716,7 +1730,15 @@ get_hints_from_table(const char *client_query, const char *client_application) PG_TRY(); { + bool snapshot_set = false; + hint_inhibit_level++; + + if (!ActiveSnapshotSet()) + { + PushActiveSnapshot(GetTransactionSnapshot()); + snapshot_set = true; + } SPI_connect(); @@ -1753,7 +1775,10 @@ get_hints_from_table(const char *client_query, const char *client_application) } SPI_finish(); - + + if (snapshot_set) + PopActiveSnapshot(); + hint_inhibit_level--; } PG_CATCH(); @@ -1767,30 +1792,92 @@ 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 (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; + 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; } @@ -2467,10 +2554,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(); @@ -2550,7 +2637,9 @@ setup_parallel_plan_enforcement(ParallelHint *hint, HintState *state) { 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 @@ -2559,8 +2648,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); } } @@ -2619,132 +2712,6 @@ set_join_config_options(unsigned char enforce_mask, GucContext context) } /* - * pg_hint_plan hook functions - */ - -static void -pg_hint_plan_ProcessUtility(Node *parsetree, const char *queryString, - ProcessUtilityContext context, - ParamListInfo params, - DestReceiver *dest, char *completionTag) -{ - 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; - - 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; - } - - /* - * CREATE AS EXECUTE behavior has changed since 9.2, so we must handle it - * specially here. - */ - if (IsA(node, CreateTableAsStmt)) - { - 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)) - { - ExecuteStmt *estmt = (ExecuteStmt *) query->utilityStmt; - stmt_name = estmt->name; - } - } - - if (stmt_name) - { - if (debug_level > 1) - ereport(pg_hint_plan_message_level, - (errmsg ("pg_hint_plan: ProcessUtility:" - " stmt_name = \"%s\", statement=\"%s\"", - stmt_name, queryString))); - - PG_TRY(); - { - if (prev_ProcessUtility) - (*prev_ProcessUtility) (parsetree, queryString, - context, params, - dest, completionTag); - else - standard_ProcessUtility(parsetree, queryString, - context, params, - dest, completionTag); - } - PG_CATCH(); - { - stmt_name = NULL; - PG_RE_THROW(); - } - PG_END_TRY(); - - stmt_name = NULL; - - return; - } - - if (prev_ProcessUtility) - (*prev_ProcessUtility) (parsetree, queryString, - context, params, - dest, completionTag); - else - standard_ProcessUtility(parsetree, queryString, - context, params, - dest, completionTag); -} - -/* * Push a hint into hint stack which is implemented with List struct. Head of * list is top of stack. */ @@ -2778,24 +2745,182 @@ pop_hint(void) current_hint_state = (HintState *) lfirst(list_head(HintStateStack)); } +/* + * 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; + + if (prev_post_parse_analyze_hook) + prev_post_parse_analyze_hook(pstate, query); + + /* do nothing under hint table search */ + if (hint_inhibit_level > 0) + return; + + if (!pg_hint_plan_enable_hint) + { + if (current_hint_str) + { + pfree((void *)current_hint_str); + current_hint_str = NULL; + } + return; + } + + /* 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) + { + int query_len; + pgssJumbleState jstate; + Query *jumblequery; + char *normalized_query = NULL; + + query_str = get_query_string(pstate, query, &jumblequery); + + /* If this query is not for hint, just return */ + if (!query_str) + return; + + /* clear the previous hint string */ + if (current_hint_str) + { + pfree((void *)current_hint_str); + current_hint_str = NULL; + } + + if (jumblequery) + { + /* + * 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_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_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_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; + } + } + + /* retrun if we have hint here */ + if (current_hint_str) + return; + } + else + query_str = get_query_string(pstate, query, NULL); + + 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 (debug_level > 1) + { + if (debug_level == 1 && + (stmt_name || strcmp(query_str, debug_query_string))) + ereport(pg_hint_plan_message_level, + (errmsg("hints in comment=\"%s\"", + current_hint_str ? current_hint_str : "(none)"), + errhidestmt(msgqno != qno), + errhidecontext(msgqno != qno))); + else + ereport(pg_hint_plan_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; + } +} + +/* + * 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 @@ -2805,103 +2930,44 @@ 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_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. */ @@ -2917,7 +2983,10 @@ pg_hint_plan_planner(Query *parse, int cursorOptions, ParamListInfo boundParams) current_hint_state->init_scan_mask = get_current_scan_mask(); current_hint_state->init_join_mask = get_current_join_mask(); - current_hint_state->init_min_para_size = min_parallel_relation_size; + current_hint_state->init_min_para_tablescan_size = + min_parallel_table_scan_size; + current_hint_state->init_min_para_indexscan_size = + min_parallel_index_scan_size; current_hint_state->init_paratup_cost = parallel_tuple_cost; current_hint_state->init_parasetup_cost = parallel_setup_cost; @@ -2933,10 +3002,9 @@ 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; + (errhidestmt(msgqno != qno), + errmsg("pg_hint_plan%s: planner", qnostr))); + msgqno = qno; } /* @@ -2981,10 +3049,10 @@ 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; + (errhidestmt(msgqno != qno), + errmsg("pg_hint_plan%s: planner: no valid hint", + qnostr))); + msgqno = qno; } current_hint_state = NULL; if (prev_planner) @@ -3083,16 +3151,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; /* @@ -3101,11 +3170,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++) { @@ -3512,10 +3576,13 @@ reset_hint_enforcement() } /* - * Set planner guc parameters according to corresponding scan hints. + * Set planner guc parameters according to corresponding scan hints. Returns + * bitmap of HintTypeBitmap. If shint or phint is not NULL, set used hint + * there respectively. */ static bool -setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel) +setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel, + ScanMethodHint **rshint, ParallelHint **rphint) { Index new_parent_relid = 0; ListCell *l; @@ -3523,6 +3590,11 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel) ParallelHint *phint = NULL; bool inhparent = root->simple_rte_array[rel->relid]->inh; Oid relationObjectId = root->simple_rte_array[rel->relid]->relid; + int ret = 0; + + /* reset returns if requested */ + if (rshint != NULL) *rshint = NULL; + if (rphint != NULL) *rphint = NULL; /* * We could register the parent relation of the following children here @@ -3542,7 +3614,7 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel) qnostr, relationObjectId, get_rel_name(relationObjectId), inhparent, current_hint_state, hint_inhibit_level))); - return false; + return 0; } /* Find the parent for this relation other than the registered parent */ @@ -3638,6 +3710,8 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel) bool using_parent_hint = (shint == current_hint_state->parent_scan_hint); + ret |= HINT_BM_SCAN_METHOD; + /* Setup scan enforcement environment */ setup_scan_method_enforcement(shint, current_hint_state); @@ -3674,6 +3748,9 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel) setup_parallel_plan_enforcement(phint, current_hint_state); + if (phint) + ret |= HINT_BM_PARALLEL; + /* Nothing to apply. Reset the scan mask to intial state */ if (!shint && ! phint) { @@ -3691,10 +3768,13 @@ setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel) setup_scan_method_enforcement(NULL, current_hint_state); - return false; + return ret; } - return true; + if (rshint != NULL) *rshint = shint; + if (rphint != NULL) *rphint = phint; + + return ret; } /* @@ -4328,95 +4408,84 @@ pg_hint_plan_set_rel_pathlist(PlannerInfo * root, RelOptInfo *rel, { ParallelHint *phint; ListCell *l; + int found_hints; /* call the previous hook */ if (prev_set_rel_pathlist) prev_set_rel_pathlist(root, rel, rti, rte); - /* Nothing to do when hint has not been parsed yet */ + /* Nothing to do if no hint available */ if (current_hint_state == NULL) return; - /* Don't touch dummy rel */ + /* Don't touch dummy rels. */ if (IS_DUMMY_REL(rel)) return; - /* We cannot handle if this requires an outer */ - if (rel->lateral_relids) + /* + * We can accept only plain relations, foreign tables and table saples are + * also unacceptable. See set_rel_pathlist. + */ + if (rel->rtekind != RTE_RELATION || + rte->relkind == RELKIND_FOREIGN_TABLE || + rte->tablesample != NULL) return; - if (!setup_hint_enforcement(root, rel)) - { - /* - * No enforcement requested, but we might have to generate gather path - * on this relation. We could regenerate gather for relations not - * getting enforcement or even relations other than ordinary ones. - */ - - /* If no need of a gather path, just return */ - if (rel->reloptkind != RELOPT_BASEREL || max_hint_nworkers < 1 || - rel->partial_pathlist == NIL) - return; - - /* Lower the priorities of existing paths, then add a new path */ - foreach (l, rel->pathlist) - { - Path *path = (Path *) lfirst(l); - - if (path->startup_cost < disable_cost) - { - path->startup_cost += disable_cost; - path->total_cost += disable_cost; - } - } - - generate_gather_paths(root, rel); + /* We cannot handle if this requires an outer */ + if (rel->lateral_relids) return; - } - /* Don't touch other than ordinary relation hereafter */ - if (rte->rtekind != RTE_RELATION) + /* 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 */ - - /* Remove prviously generated paths */ - list_free_deep(rel->pathlist); - rel->pathlist = NIL; - - /* Rebuild access paths */ - set_plain_rel_pathlist(root, rel, rte); - - /* - * create_plain_partial_paths creates partial paths with reasonably - * estimated number of workers. Force the requested number of workers if - * hard mode. - */ - phint = find_parallel_hint(root, rel->relid); - - if (phint) + if (found_hints & HINT_BM_SCAN_METHOD || found_hints & HINT_BM_PARALLEL) { - /* if inhibiting parallel, remove existing partial paths */ - if (phint->nworkers == 0 && rel->partial_pathlist) + /* Just discard all the paths considered so far */ + list_free_deep(rel->pathlist); + rel->pathlist = NIL; + + /* Remove all the partial paths if Parallel hint is specfied */ + if ((found_hints & HINT_BM_PARALLEL) && rel->partial_pathlist) { list_free_deep(rel->partial_pathlist); rel->partial_pathlist = NIL; } - /* enforce number of workers if requested */ - if (rel->partial_pathlist && phint->force_parallel) + /* 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) { - foreach (l, rel->partial_pathlist) + /* Lower the priorities of non-parallel paths */ + foreach (l, rel->pathlist) { - Path *ppath = (Path *) lfirst(l); + Path *path = (Path *) lfirst(l); - ppath->parallel_workers = phint->nworkers; + if (path->startup_cost < disable_cost) + { + path->startup_cost += disable_cost; + path->total_cost += disable_cost; + } } - } - /* Generate gather paths for base rels */ - if (rel->reloptkind == RELOPT_BASEREL) - generate_gather_paths(root, rel); + /* enforce number of workers if requested */ + if (phint->force_parallel) + { + foreach (l, rel->partial_pathlist) + { + Path *ppath = (Path *) lfirst(l); + + ppath->parallel_workers = phint->nworkers; + } + } + + /* Generate gather paths for base rels */ + if (rel->reloptkind == RELOPT_BASEREL) + generate_gather_paths(root, rel); + } } reset_hint_enforcement();