From 3048898e73c75f54bb259323382e0e7f6368cb6f Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 16 May 2020 21:00:05 -0400 Subject: Mop-up for wait event naming issues. Synchronize the event names for parallel hash join waits with other event names, by getting rid of the slashes and dropping "-ing" suffixes. Rename ClogGroupUpdate to XactGroupUpdate, to match the new SLRU name. Move the ProcSignalBarrier event to the IPC category; it doesn't belong under IO. Also a bit more wordsmithing in the wait event documentation tables. Discussion: https://postgr.es/m/4505.1589640417@sss.pgh.pa.us --- src/backend/executor/nodeHashjoin.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/backend/executor/nodeHashjoin.c') diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index cc8edacdd01..2cdc38a6014 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -327,7 +327,7 @@ ExecHashJoinImpl(PlanState *pstate, bool parallel) if (hashtable->nbatch > 1) ExecParallelHashJoinPartitionOuter(node); BarrierArriveAndWait(build_barrier, - WAIT_EVENT_HASH_BUILD_HASHING_OUTER); + WAIT_EVENT_HASH_BUILD_HASH_OUTER); } Assert(BarrierPhase(build_barrier) == PHJ_BUILD_DONE); @@ -1135,14 +1135,14 @@ ExecParallelHashJoinNewBatch(HashJoinState *hjstate) /* One backend allocates the hash table. */ if (BarrierArriveAndWait(batch_barrier, - WAIT_EVENT_HASH_BATCH_ELECTING)) + WAIT_EVENT_HASH_BATCH_ELECT)) ExecParallelHashTableAlloc(hashtable, batchno); /* Fall through. */ case PHJ_BATCH_ALLOCATING: /* Wait for allocation to complete. */ BarrierArriveAndWait(batch_barrier, - WAIT_EVENT_HASH_BATCH_ALLOCATING); + WAIT_EVENT_HASH_BATCH_ALLOCATE); /* Fall through. */ case PHJ_BATCH_LOADING: @@ -1162,7 +1162,7 @@ ExecParallelHashJoinNewBatch(HashJoinState *hjstate) } sts_end_parallel_scan(inner_tuples); BarrierArriveAndWait(batch_barrier, - WAIT_EVENT_HASH_BATCH_LOADING); + WAIT_EVENT_HASH_BATCH_LOAD); /* Fall through. */ case PHJ_BATCH_PROBING: -- cgit v1.2.3