From 17cc133f017cb13737e23ce0da4415daf2c34cc3 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Wed, 13 May 2020 15:31:14 -0400 Subject: Dial back -Wimplicit-fallthrough to level 3 The additional pain from level 4 is excessive for the gain. Also revert all the source annotation changes to their original wordings, to avoid back-patching pain. Discussion: https://postgr.es/m/31166.1589378554@sss.pgh.pa.us --- src/backend/executor/nodeHashjoin.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/backend/executor/nodeHashjoin.c') diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c index 6159a6957f4..cc8edacdd01 100644 --- a/src/backend/executor/nodeHashjoin.c +++ b/src/backend/executor/nodeHashjoin.c @@ -340,7 +340,7 @@ ExecHashJoinImpl(PlanState *pstate, bool parallel) else node->hj_JoinState = HJ_NEED_NEW_OUTER; - /* FALLTHROUGH */ + /* FALL THRU */ case HJ_NEED_NEW_OUTER: @@ -413,7 +413,7 @@ ExecHashJoinImpl(PlanState *pstate, bool parallel) /* OK, let's scan the bucket for matches */ node->hj_JoinState = HJ_SCAN_BUCKET; - /* FALLTHROUGH */ + /* FALL THRU */ case HJ_SCAN_BUCKET: @@ -1137,13 +1137,13 @@ ExecParallelHashJoinNewBatch(HashJoinState *hjstate) if (BarrierArriveAndWait(batch_barrier, WAIT_EVENT_HASH_BATCH_ELECTING)) ExecParallelHashTableAlloc(hashtable, batchno); - /* FALLTHROUGH */ + /* Fall through. */ case PHJ_BATCH_ALLOCATING: /* Wait for allocation to complete. */ BarrierArriveAndWait(batch_barrier, WAIT_EVENT_HASH_BATCH_ALLOCATING); - /* FALLTHROUGH */ + /* Fall through. */ case PHJ_BATCH_LOADING: /* Start (or join in) loading tuples. */ @@ -1163,7 +1163,7 @@ ExecParallelHashJoinNewBatch(HashJoinState *hjstate) sts_end_parallel_scan(inner_tuples); BarrierArriveAndWait(batch_barrier, WAIT_EVENT_HASH_BATCH_LOADING); - /* FALLTHROUGH */ + /* Fall through. */ case PHJ_BATCH_PROBING: -- cgit v1.2.3