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: 1 addition & 1 deletion src/backend/cdb/cdbmutate.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ make_parallel_broadcast_motion(Plan *lefttree)

motion = make_motion(NULL, lefttree,
0, NULL, NULL, NULL, NULL);
motion->motionType = MOTIONTYPE_PARALLEL_BROADCAST;
motion->motionType = MOTIONTYPE_BROADCAST_WORKERS;
motion->hashExprs = NIL;
motion->hashFuncs = NULL;

Expand Down
4 changes: 2 additions & 2 deletions src/backend/commands/explain.c
Original file line number Diff line number Diff line change
Expand Up @@ -1789,8 +1789,8 @@ ExplainNode(PlanState *planstate, List *ancestors,
case MOTIONTYPE_BROADCAST:
sname = "Broadcast Motion";
break;
case MOTIONTYPE_PARALLEL_BROADCAST:
sname = "Parallel Broadcast Motion";
case MOTIONTYPE_BROADCAST_WORKERS:
sname = "Broadcast Workers Motion";
break;
case MOTIONTYPE_EXPLICIT:
sname = "Explicit Redistribute Motion";
Expand Down
6 changes: 3 additions & 3 deletions src/backend/executor/nodeMotion.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ execMotionSender(MotionState *node)
motion->motionType == MOTIONTYPE_GATHER_SINGLE ||
motion->motionType == MOTIONTYPE_HASH ||
motion->motionType == MOTIONTYPE_BROADCAST ||
motion->motionType == MOTIONTYPE_PARALLEL_BROADCAST ||
motion->motionType == MOTIONTYPE_BROADCAST_WORKERS ||
(motion->motionType == MOTIONTYPE_EXPLICIT && motion->segidColIdx > 0));
Assert(node->ps.state->interconnect_context);

Expand Down Expand Up @@ -316,7 +316,7 @@ execMotionUnsortedReceiver(MotionState *node)
motion->motionType == MOTIONTYPE_GATHER_SINGLE ||
motion->motionType == MOTIONTYPE_HASH ||
motion->motionType == MOTIONTYPE_BROADCAST ||
motion->motionType == MOTIONTYPE_PARALLEL_BROADCAST ||
motion->motionType == MOTIONTYPE_BROADCAST_WORKERS ||
(motion->motionType == MOTIONTYPE_EXPLICIT && motion->segidColIdx > 0));

Assert(node->ps.state->motionlayer_context);
Expand Down Expand Up @@ -1210,7 +1210,7 @@ doSendTuple(Motion *motion, MotionState *node, TupleTableSlot *outerTupleSlot)
{
targetRoute = BROADCAST_SEGIDX;
}
else if (motion->motionType == MOTIONTYPE_PARALLEL_BROADCAST)
else if (motion->motionType == MOTIONTYPE_BROADCAST_WORKERS)
{
int numSegments = recvSlice->planNumSegments;

Expand Down
2 changes: 1 addition & 1 deletion src/backend/nodes/readfast.c
Original file line number Diff line number Diff line change
Expand Up @@ -980,7 +980,7 @@ _readMotion(void)
local_node->motionType == MOTIONTYPE_GATHER_SINGLE ||
local_node->motionType == MOTIONTYPE_HASH ||
local_node->motionType == MOTIONTYPE_BROADCAST ||
local_node->motionType == MOTIONTYPE_PARALLEL_BROADCAST ||
local_node->motionType == MOTIONTYPE_BROADCAST_WORKERS ||
local_node->motionType == MOTIONTYPE_EXPLICIT);

READ_BOOL_FIELD(sendSorted);
Expand Down
2 changes: 1 addition & 1 deletion src/include/nodes/plannodes.h
Original file line number Diff line number Diff line change
Expand Up @@ -1452,7 +1452,7 @@ typedef enum MotionType
MOTIONTYPE_GATHER_SINGLE, /* Execute subplan on N nodes, but only send the tuples from one */
MOTIONTYPE_HASH, /* Use hashing to select a segindex destination */
MOTIONTYPE_BROADCAST, /* Send tuples from one sender to a fixed set of segindexes */
MOTIONTYPE_PARALLEL_BROADCAST, /* */
MOTIONTYPE_BROADCAST_WORKERS, /* CBDB_PARALLEL: Send tuples across worker processes of a fixed set of segindexes */
MOTIONTYPE_EXPLICIT, /* Send tuples to the segment explicitly specified in their segid column */
MOTIONTYPE_OUTER_QUERY /* Gather or Broadcast to outer query's slice, don't know which one yet */
} MotionType;
Expand Down
4 changes: 2 additions & 2 deletions src/test/regress/expected/gp_parallel.out
Original file line number Diff line number Diff line change
Expand Up @@ -1827,7 +1827,7 @@ explain(costs off) select sum(t1.c1) from t1 where c1 not in (select c2 from t2)
Hash Cond: (t1.c1 = t2.c2)
-> Parallel Seq Scan on t1
-> Parallel Hash
-> Parallel Broadcast Motion 6:6 (slice2; segments: 6)
-> Broadcast Workers Motion 6:6 (slice2; segments: 6)
-> Parallel Seq Scan on t2
Optimizer: Postgres query optimizer
(10 rows)
Expand All @@ -1846,7 +1846,7 @@ explain(costs off) select * from t1 where c1 not in (select c2 from t3_null);
Hash Cond: (t1.c1 = t3_null.c2)
-> Parallel Seq Scan on t1
-> Parallel Hash
-> Parallel Broadcast Motion 6:6 (slice2; segments: 6)
-> Broadcast Workers Motion 6:6 (slice2; segments: 6)
-> Parallel Seq Scan on t3_null
Optimizer: Postgres query optimizer
(8 rows)
Expand Down