Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/backend/cdb/cdbmutate.c
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,8 @@ shareinput_save_producer(ShareInputScan *plan, ApplyShareInputContext *ctxt)
ctxt->shared_input_count = new_shared_input_count;
}

plan->ref_set = true;

Assert(ctxt->shared_plans[share_id] == NULL);
ctxt->shared_plans[share_id] = plan->scan.plan.lefttree;
}
Expand Down
1 change: 1 addition & 0 deletions src/backend/nodes/copyfuncs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1262,6 +1262,7 @@ _copyShareInputScan(const ShareInputScan *from)
COPY_SCALAR_FIELD(this_slice_id);
COPY_SCALAR_FIELD(nconsumers);
COPY_SCALAR_FIELD(discard_output);
COPY_SCALAR_FIELD(ref_set);

return newnode;
}
Expand Down
1 change: 1 addition & 0 deletions src/backend/nodes/outfuncs_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ _outShareInputScan(StringInfo str, const ShareInputScan *node)
WRITE_INT_FIELD(this_slice_id);
WRITE_INT_FIELD(nconsumers);
WRITE_BOOL_FIELD(discard_output);
WRITE_BOOL_FIELD(ref_set);

_outPlanInfo(str, (Plan *) node);
}
Expand Down
1 change: 1 addition & 0 deletions src/backend/nodes/readfast.c
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,7 @@ _readShareInputScan(void)
READ_INT_FIELD(this_slice_id);
READ_INT_FIELD(nconsumers);
READ_BOOL_FIELD(discard_output);
READ_BOOL_FIELD(ref_set);

ReadCommonPlan(&local_node->scan.plan);

Expand Down
1 change: 1 addition & 0 deletions src/backend/optimizer/plan/planshare.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ make_shareinputscan(PlannerInfo *root, Plan *inputplan)
sisc->this_slice_id = -1;
sisc->nconsumers = 0;
sisc->discard_output = false;
sisc->ref_set = false;

sisc->scan.plan.qual = NIL;
sisc->scan.plan.righttree = NULL;
Expand Down
15 changes: 15 additions & 0 deletions src/backend/optimizer/plan/setrefs.c
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,7 @@ set_plan_references(PlannerInfo *root, Plan *plan)
PlannerGlobal *glob = root->glob;
int rtoffset = list_length(glob->finalrtable);
ListCell *lc;
bool need_append_rel = true;

#ifdef USE_ASSERT_CHECKING
/*
Expand Down Expand Up @@ -422,6 +423,17 @@ set_plan_references(PlannerInfo *root, Plan *plan)
glob->finalrowmarks = lappend(glob->finalrowmarks, newrc);
}

/*
* ShareInputScan nodes can be reused multiple times during execution, but this
* causes a crash when explaining plans with append info in the function
* deparse_context_for_plan_tree().
*
* To fix this, we only add appendrels for the producer ShareInputScan node of
* a given share_id, rather than all nodes with the same share_id.
*/
if (plan != NULL && IsA(plan, ShareInputScan))
need_append_rel = ((ShareInputScan *) plan)->ref_set;

/*
* Adjust RT indexes of AppendRelInfos and add to final appendrels list.
* We assume the AppendRelInfos were built during planning and don't need
Expand All @@ -431,6 +443,9 @@ set_plan_references(PlannerInfo *root, Plan *plan)
{
AppendRelInfo *appinfo = lfirst_node(AppendRelInfo, lc);

if (!need_append_rel)
break;

/* adjust RT indexes */
appinfo->parent_relid += rtoffset;
appinfo->child_relid += rtoffset;
Expand Down
3 changes: 3 additions & 0 deletions src/include/nodes/plannodes.h
Original file line number Diff line number Diff line change
Expand Up @@ -1245,6 +1245,9 @@ typedef struct ShareInputScan

/* Discard the scan output? True for ORCA CTE producer, false otherwise. */
bool discard_output;

/* Could be set reference? */
bool ref_set;
} ShareInputScan;

/* ----------------
Expand Down
5,546 changes: 5,546 additions & 0 deletions src/test/regress/expected/tpcds_q04.out

Large diffs are not rendered by default.

5,572 changes: 5,572 additions & 0 deletions src/test/regress/expected/tpcds_q04_optimizer.out

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/test/regress/greenplum_schedule
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@ test: rpt rpt_joins rpt_tpch rpt_returning
test: bfv_cte
test: bfv_joins bfv_subquery bfv_planner bfv_legacy bfv_temp bfv_dml

# test tpcds query 04
test: tpcds_q04

test: qp_olap_mdqa qp_misc gp_recursive_cte qp_dml_joins qp_skew qp_select partition_prune_opfamily gp_tsrf qp_join_union_all qp_join_universal qp_rowsecurity qp_query_params qp_full_join

test: qp_misc_jiras qp_with_clause qp_executor qp_olap_windowerr qp_olap_window qp_derived_table qp_bitmapscan qp_dropped_cols
Expand Down
Loading
Loading