* pg_hint_plan.c
* hinting on how to execute a query for PostgreSQL
*
- * Copyright (c) 2012-2017, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+ * Copyright (c) 2012-2018, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
*
*-------------------------------------------------------------------------
*/
#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"
#define HINT_ARRAY_DEFAULT_INITSIZE 8
-#define hint_ereport(str, detail) \
+#define hint_ereport(str, detail) hint_parse_ereport(str, detail)
+#define hint_parse_ereport(str, detail) \
do { \
- ereport(pg_hint_plan_message_level, \
- (errmsg("pg_hint_plan%s: hint syntax error at or near \"%s\"", qnostr, (str)), \
+ ereport(pg_hint_plan_parse_message_level, \
+ (errmsg("pg_hint_plan: hint syntax error at or near \"%s\"", (str)), \
errdetail detail)); \
- msgqno = qno; \
} while(0)
#define skip_space(str) \
Index rti, RangeTblEntry *rte);
static void create_plain_partial_paths(PlannerInfo *root,
RelOptInfo *rel);
-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,
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,
- List *partitioned_rels);
-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);
/* 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;
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,
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,
if (!hstate)
{
- elog(LOG, "pg_hint_plan:\nno hint");
+ elog(pg_hint_plan_debug_message_level, "pg_hint_plan:\nno hint");
return;
}
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);
}
if (!hstate)
{
- elog(pg_hint_plan_message_level,
+ elog(pg_hint_plan_debug_message_level,
"pg_hint_plan%s: HintStateDump: no hint", qnostr);
return;
}
desc_hint_in_state(hstate, &buf, "}, {error hints", HINT_STATE_ERROR, true);
appendStringInfoChar(&buf, '}');
- ereport(pg_hint_plan_message_level,
+ ereport(pg_hint_plan_debug_message_level,
(errmsg("%s", buf.data),
errhidestmt(true),
errhidecontext(true)));
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);
char *hints = NULL;
Oid argtypes[2] = { TEXTOID, TEXTOID };
Datum values[2];
- bool nulls[2] = { false, false };
+ char nulls[2] = {' ', ' '};
text *qry;
text *app;
/*
* 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 the current hint
- * string is still valid.
+ * 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(ParseState *pstate, Query *query, Query **jumblequery)
{
const char *p = debug_query_string;
+ /*
+ * If debug_query_string is set, it is the top level statement. But in some
+ * cases we reach here with debug_query_string set NULL for example in the
+ * case of DESCRIBE message handling. We may still see a candidate
+ * top-level query in pstate in the case.
+ */
+ if (!p)
+ {
+ /* We don't see a query string, return NULL */
+ if (!pstate->p_sourcetext)
+ return NULL;
+
+ p = pstate->p_sourcetext;
+ }
+
if (jumblequery != NULL)
*jumblequery = query;
if (query->commandType == CMD_UTILITY)
{
- Query *target_query = query;
+ Query *target_query = (Query *)query->utilityStmt;
- /* Use the target query if EXPLAIN */
- if (IsA(query->utilityStmt, ExplainStmt))
+ /*
+ * 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 *)(query->utilityStmt);
-
+ ExplainStmt *stmt = (ExplainStmt *)target_query;
+
Assert(IsA(stmt->query, Query));
target_query = (Query *)stmt->query;
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))
{
- /*
- * Use the the body query for CREATE AS. The Query for jumble also
- * replaced with the corresponding one.
- */
CreateTableAsStmt *stmt = (CreateTableAsStmt *) target_query;
- PreparedStatement *entry;
- Query *tmp_query;
Assert(IsA(stmt->query, Query));
- tmp_query = (Query *) stmt->query;
+ target_query = (Query *) stmt->query;
- if (tmp_query->commandType == CMD_UTILITY &&
- IsA(tmp_query->utilityStmt, ExecuteStmt))
- {
- ExecuteStmt *estmt = (ExecuteStmt *) tmp_query->utilityStmt;
- entry = FetchPreparedStatement(estmt->name, true);
- p = entry->plansource->query_string;
- target_query = (Query *) linitial (entry->plansource->query_list);
- }
+ /* 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;
}
- else
+
if (IsA(target_query, ExecuteStmt))
{
/*
- * Use the prepared query for EXECUTE. The Query for jumble also
- * replaced with the corresponding one.
+ * Use the prepared query for EXECUTE. The Query for jumble
+ * also replaced with the corresponding one.
*/
ExecuteStmt *stmt = (ExecuteStmt *)target_query;
PreparedStatement *entry;
p = entry->plansource->query_string;
target_query = (Query *) linitial (entry->plansource->query_list);
}
-
- /* We don't accept other than a Query other than a CMD_UTILITY */
+
+ /* JumbleQuery accespts only a non-utility Query */
if (!IsA(target_query, Query) ||
- target_query->commandType == CMD_UTILITY)
+ target_query->utilityStmt != NULL)
target_query = NULL;
if (jumblequery)
if (length == 3)
{
const char *modeparam = (const char *)list_nth(name_list, 2);
- if (strcasecmp(modeparam, "hard") == 0)
+ if (pg_strcasecmp(modeparam, "hard") == 0)
force_parallel = true;
- else if (strcasecmp(modeparam, "soft") != 0)
+ else if (pg_strcasecmp(modeparam, "soft") != 0)
{
hint_ereport(modeparam,
("enforcement must be soft or hard: %s",
if (snprintf(buf, 16, "%d", value) < 0)
{
- ereport(pg_hint_plan_message_level,
- (errmsg ("Cannot set integer value: %d: %s",
- max_hint_nworkers, strerror(errno))));
+ ereport(pg_hint_plan_parse_message_level,
+ (errmsg ("Failed to convert integer to string: %d", value)));
return false;
}
return
set_config_option_noerror(name, buf, context,
PGC_S_SESSION, GUC_ACTION_SAVE, true,
- pg_hint_plan_message_level);
+ pg_hint_plan_parse_message_level);
}
/* setup scan method enforcement according to given options */
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
state->init_nworkers, state->context);
/* force means that enforce parallel as far as possible */
- if (hint && hint->force_parallel)
+ if (hint && hint->force_parallel && hint->nworkers > 0)
{
set_config_int32_option("parallel_tuple_cost", 0, state->context);
set_config_int32_option("parallel_setup_cost", 0, state->context);
query_len = strlen(query_str) + 1;
normalized_query =
generate_normalized_query(&jstate, query_str,
+ query->stmt_location,
&query_len,
GetDatabaseEncoding());
if (debug_level > 1)
{
if (current_hint_str)
- ereport(pg_hint_plan_message_level,
+ ereport(pg_hint_plan_debug_message_level,
(errmsg("pg_hint_plan[qno=0x%x]: "
"post_parse_analyze_hook: "
"hints from table: \"%s\": "
errhidestmt(msgqno != qno),
errhidecontext(msgqno != qno)));
else
- ereport(pg_hint_plan_message_level,
+ ereport(pg_hint_plan_debug_message_level,
(errmsg("pg_hint_plan[qno=0x%x]: "
"no match found in table: "
"application name = \"%s\", "
}
}
- /* retrun if we have hint here*/
+ /* retrun if we have hint here */
if (current_hint_str)
return;
}
{
if (debug_level == 1 &&
(stmt_name || strcmp(query_str, debug_query_string)))
- ereport(pg_hint_plan_message_level,
+ 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
- ereport(pg_hint_plan_message_level,
+ 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),
if (!pg_hint_plan_enable_hint || hint_inhibit_level > 0)
{
if (debug_level > 1)
- ereport(pg_hint_plan_message_level,
+ 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,
if (debug_level > 1)
{
- ereport(pg_hint_plan_message_level,
+ ereport(pg_hint_plan_debug_message_level,
(errhidestmt(msgqno != qno),
errmsg("pg_hint_plan%s: planner", qnostr)));
msgqno = qno;
standard_planner_proc:
if (debug_level > 1)
{
- ereport(pg_hint_plan_message_level,
+ ereport(pg_hint_plan_debug_message_level,
(errhidestmt(msgqno != qno),
errmsg("pg_hint_plan%s: planner: no valid hint",
qnostr)));
break;
c_attname = get_attname(relationObjectId,
- info->indexkeys[i]);
+ info->indexkeys[i], false);
/* deny if any of column attributes don't match */
if (strcmp(p_attname, c_attname) != 0 ||
/* 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;
/* 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;
initStringInfo(&rel_buf);
quote_value(&rel_buf, disprelname);
- ereport(LOG,
+ ereport(pg_hint_plan_debug_message_level,
(errmsg("available indexes for %s(%s):%s",
hint->base.keyword,
rel_buf.data,
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];
* 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;
* 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;
* bitmap of HintTypeBitmap. If shint or phint is not NULL, set used hint
* there respectively.
*/
-static bool
+static int
setup_hint_enforcement(PlannerInfo *root, RelOptInfo *rel,
ScanMethodHint **rshint, ParallelHint **rphint)
{
*/
if (inhparent)
{
+ /* set up only parallel hints for parent relation */
+ phint = find_parallel_hint(root, rel->relid);
+ if (phint)
+ {
+ setup_parallel_plan_enforcement(phint, current_hint_state);
+ if (rphint) *rphint = phint;
+ ret |= HINT_BM_PARALLEL;
+ return ret;
+ }
+
if (debug_level > 1)
- ereport(pg_hint_plan_message_level,
+ ereport(pg_hint_plan_debug_message_level,
(errhidestmt(true),
errmsg ("pg_hint_plan%s: setup_hint_enforcement"
" skipping inh parent: relation=%u(%s), inhparent=%d,"
{
/*
* Here we found a new parent for the current relation. Scan continues
- * hint to other childrens of this parent so remember it * to avoid
- * hinthintredundant setup cost.
+ * hint to other childrens of this parent so remember it to avoid
+ * redundant setup cost.
*/
current_hint_state->parent_relid = new_parent_relid;
if (shint == current_hint_state->parent_scan_hint)
additional_message = " by parent hint";
- ereport(pg_hint_plan_message_level,
+ ereport(pg_hint_plan_debug_message_level,
(errhidestmt(true),
errmsg ("pg_hint_plan%s: setup_hint_enforcement"
" index deletion%s:"
if (!shint && ! phint)
{
if (debug_level > 1)
- ereport(pg_hint_plan_message_level,
+ ereport(pg_hint_plan_debug_message_level,
(errhidestmt (true),
errmsg ("pg_hint_plan%s: setup_hint_enforcement"
" no hint applied:"
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]);
* We can accept only plain relations, foreign tables and table saples are
* also unacceptable. See set_rel_pathlist.
*/
- if (rel->rtekind != RTE_RELATION ||
+ if ((rel->rtekind != RTE_RELATION &&
+ rel->rtekind != RTE_SUBQUERY)||
rte->relkind == RELKIND_FOREIGN_TABLE ||
rte->tablesample != NULL)
return;
- /* We cannot handle if this requires an outer */
- if (rel->lateral_relids)
- return;
-
- /* Return if this relation gets no enfocement */
- if ((found_hints = setup_hint_enforcement(root, rel, NULL, &phint)) == 0)
- return;
-
- /* Here, we regenerate paths with the current hint restriction */
-
- if (found_hints & HINT_BM_SCAN_METHOD)
+ /*
+ * Even though UNION ALL node doesn't have particular name so usually it is
+ * unhintable, turn on parallel when it contains parallel nodes.
+ */
+ if (rel->rtekind == RTE_SUBQUERY)
{
- /*
- * With scan hints, we regenerate paths for this relation from the
- * first under the restricion.
- */
- list_free_deep(rel->pathlist);
- rel->pathlist = NIL;
+ ListCell *lc;
+ bool inhibit_nonparallel = false;
- set_plain_rel_pathlist(root, rel, rte);
- }
-
- if (found_hints & HINT_BM_PARALLEL)
- {
- Assert (phint);
+ if (rel->partial_pathlist == NIL)
+ return;
- /* the partial_pathlist may be for different parameters, discard it */
- if (rel->partial_pathlist)
+ foreach(lc, rel->partial_pathlist)
{
- list_free_deep(rel->partial_pathlist);
- rel->partial_pathlist = NIL;
- }
+ ListCell *lcp;
+ AppendPath *apath = (AppendPath *) lfirst(lc);
+ int parallel_workers = 0;
- /* also remove gather path */
- if (rel->pathlist)
- {
- ListCell *cell, *prev = NULL, *next;
+ if (!IsA(apath, AppendPath))
+ continue;
- for (cell = list_head(rel->pathlist) ; cell; cell = next)
+ foreach (lcp, apath->subpaths)
{
- Path *path = (Path *) lfirst(cell);
+ Path *spath = (Path *) lfirst(lcp);
- next = lnext(cell);
- if (IsA(path, GatherPath))
- rel->pathlist = list_delete_cell(rel->pathlist,
- cell, prev);
- else
- prev = cell;
+ if (spath->parallel_aware &&
+ parallel_workers < spath->parallel_workers)
+ parallel_workers = spath->parallel_workers;
}
+
+ apath->path.parallel_workers = parallel_workers;
+ inhibit_nonparallel = true;
}
- /* then generate new paths if needed */
- if (phint->nworkers > 0)
+ if (inhibit_nonparallel)
{
- /* Lower the priorities of non-parallel paths */
- foreach (l, rel->pathlist)
+ ListCell *lc;
+
+ foreach(lc, rel->pathlist)
{
- Path *path = (Path *) lfirst(l);
+ Path *path = (Path *) lfirst(lc);
if (path->startup_cost < disable_cost)
{
path->total_cost += disable_cost;
}
}
+ }
- /*
- * generate partial paths with enforcement, this is affected by
- * scan method enforcement. Specifically, the cost of this partial
- * seqscan path will be disabled_cost if seqscan is inhibited by
- * hint or GUC parameters.
- */
- Assert (rel->partial_pathlist == NIL);
- create_plain_partial_paths(root, rel);
+ return;
+ }
+ /* We cannot handle if this requires an outer */
+ if (rel->lateral_relids)
+ return;
+
+ /* Return if this relation gets no enfocement */
+ if ((found_hints = setup_hint_enforcement(root, rel, NULL, &phint)) == 0)
+ return;
+
+ /* Here, we regenerate paths with the current hint restriction */
+ if (found_hints & HINT_BM_SCAN_METHOD || found_hints & HINT_BM_PARALLEL)
+ {
+ /*
+ * When hint is specified on non-parent relations, discard existing
+ * paths and regenerate based on the hint considered. Otherwise we
+ * already have hinted childx paths then just adjust the number of
+ * planned number of workers.
+ */
+ if (root->simple_rte_array[rel->relid]->inh)
+ {
/* enforce number of workers if requested */
- if (phint->force_parallel)
+ if (phint && phint->force_parallel)
{
- foreach (l, rel->partial_pathlist)
+ if (phint->nworkers == 0)
+ {
+ list_free_deep(rel->partial_pathlist);
+ rel->partial_pathlist = NIL;
+ }
+ else
{
- Path *ppath = (Path *) lfirst(l);
+ /* prioritize partial paths */
+ foreach (l, rel->partial_pathlist)
+ {
+ Path *ppath = (Path *) lfirst(l);
- ppath->parallel_workers = phint->nworkers;
+ if (ppath->parallel_safe)
+ {
+ ppath->parallel_workers = phint->nworkers;
+ ppath->startup_cost = 0;
+ ppath->total_cost = 0;
+ }
+ }
+
+ /* disable non-partial paths */
+ foreach (l, rel->pathlist)
+ {
+ Path *ppath = (Path *) lfirst(l);
+
+ if (ppath->startup_cost < disable_cost)
+ {
+ ppath->startup_cost += disable_cost;
+ ppath->total_cost += disable_cost;
+ }
+ }
}
}
+ }
+ else
+ {
+ /* Just discard all the paths considered so far */
+ list_free_deep(rel->pathlist);
+ rel->pathlist = NIL;
+ list_free_deep(rel->partial_pathlist);
+ rel->partial_pathlist = NIL;
- /* Generate gather paths for base rels */
- if (rel->reloptkind == RELOPT_BASEREL)
- generate_gather_paths(root, rel);
+ /* Regenerate paths with the current enforcement */
+ set_plain_rel_pathlist(root, rel, rte);
+
+ /* Additional work to enforce parallel query execution */
+ if (phint && phint->nworkers > 0)
+ {
+ /*
+ * For Parallel Append to be planned properly, we shouldn't set
+ * the costs of non-partial paths to disable-value. Lower the
+ * priority of non-parallel paths by setting partial path costs
+ * to 0 instead.
+ */
+ foreach (l, rel->partial_pathlist)
+ {
+ Path *path = (Path *) lfirst(l);
+
+ path->startup_cost = 0;
+ path->total_cost = 0;
+ }
+
+ /* enforce number of workers if requested */
+ if (phint->force_parallel)
+ {
+ foreach (l, rel->partial_pathlist)
+ {
+ Path *ppath = (Path *) lfirst(l);
+
+ if (ppath->parallel_safe)
+ ppath->parallel_workers = phint->nworkers;
+ }
+ }
+
+ /* Generate gather paths */
+ if (rel->reloptkind == RELOPT_BASEREL)
+ generate_gather_paths(root, rel, false);
+ }
}
}
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;
OSDN Git Service
