Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita387a3d

Browse files
committed
Fix slot type assumptions for nodeGather[Merge].
The assumption made in1a0586d was wrong, as evidenced bybuildfarm failure on locust, which runs withforce_parallel_mode=regress. The tuples accessed in either nodes arein the outer slot, and we can't trivially rely on the slot type beingknown because the leader might execute the subsidiary node directly,or via the tuple queue on a worker. In the latter case the tuple willalways be a heaptuple slot, but in the former, it'll be whatever thesubsidiary node returns.
1 parentf92cd73 commita387a3d

File tree

2 files changed

+31
-5
lines changed

2 files changed

+31
-5
lines changed

‎src/backend/executor/nodeGather.c

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,31 @@ ExecInitGather(Gather *node, EState *estate, int eflags)
9191
outerPlanState(gatherstate)=ExecInitNode(outerNode,estate,eflags);
9292
tupDesc=ExecGetResultType(outerPlanState(gatherstate));
9393

94-
/* this node uses tuples from the tuple queue as scan slot */
95-
gatherstate->ps.scanops=&TTSOpsHeapTuple;
96-
gatherstate->ps.scanopsfixed= true;
97-
gatherstate->ps.scanopsset= true;
94+
/*
95+
* Leader may access ExecProcNode result directly (if
96+
* need_to_scan_locally), or from workers via tuple queue. So we can't
97+
* trivially rely on the slot type being fixed for expressions evaluated
98+
* within this node.
99+
*/
100+
gatherstate->ps.outeropsset= true;
101+
gatherstate->ps.outeropsfixed= false;
98102

99103
/*
100104
* Initialize result type and projection.
101105
*/
102106
ExecInitResultTypeTL(&gatherstate->ps);
103107
ExecConditionalAssignProjectionInfo(&gatherstate->ps,tupDesc,OUTER_VAR);
104108

109+
/*
110+
* Without projections result slot type is not trivially known, see
111+
* comment above.
112+
*/
113+
if (gatherstate->ps.ps_ProjInfo==NULL)
114+
{
115+
gatherstate->ps.resultopsset= true;
116+
gatherstate->ps.resultopsfixed= false;
117+
}
118+
105119
/*
106120
* Initialize funnel slot to same tuple descriptor as outer plan.
107121
*/

‎src/backend/executor/nodeGatherMerge.c

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,15 @@ ExecInitGatherMerge(GatherMerge *node, EState *estate, int eflags)
109109
outerNode=outerPlan(node);
110110
outerPlanState(gm_state)=ExecInitNode(outerNode,estate,eflags);
111111

112+
/*
113+
* Leader may access ExecProcNode result directly (if
114+
* need_to_scan_locally), or from workers via tuple queue. So we can't
115+
* trivially rely on the slot type being fixed for expressions evaluated
116+
* within this node.
117+
*/
118+
gm_state->ps.outeropsset= true;
119+
gm_state->ps.outeropsfixed= false;
120+
112121
/*
113122
* Store the tuple descriptor into gather merge state, so we can use it
114123
* while initializing the gather merge slots.
@@ -122,7 +131,10 @@ ExecInitGatherMerge(GatherMerge *node, EState *estate, int eflags)
122131
ExecInitResultTypeTL(&gm_state->ps);
123132
ExecConditionalAssignProjectionInfo(&gm_state->ps,tupDesc,OUTER_VAR);
124133

125-
/* leader accesses ExecProcNode result directly, others go through tuple queue */
134+
/*
135+
* Without projections result slot type is not trivially known, see
136+
* comment above.
137+
*/
126138
if (gm_state->ps.ps_ProjInfo==NULL)
127139
{
128140
gm_state->ps.resultopsset= true;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp