From 29ef2b310da9892fda075ff9ee12da7f92d5da6e Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Sat, 6 Oct 2018 15:49:37 -0400 Subject: Restore sane locking behavior during parallel query. Commit 9a3cebeaa changed things so that parallel workers didn't obtain any lock of their own on tables they access. That was clearly a bad idea, but I'd mistakenly supposed that it was the intended end result of the series of patches for simplifying the executor's lock management. Undo that change in relation_open(), and adjust ExecOpenScanRelation() so that it gets the correct lock if inside a parallel worker. In passing, clean up some more obsolete comments about when locks are acquired. Discussion: https://postgr.es/m/468c85d9-540e-66a2-1dde-fec2b741e688@lab.ntt.co.jp --- src/backend/executor/execMain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/backend/executor/execMain.c') diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 23e6749920a..b6abad554a4 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -1622,8 +1622,8 @@ ExecEndPlan(PlanState *planstate, EState *estate) } /* - * close whatever rangetable Relations have been opened. We did not - * acquire locks in ExecGetRangeTableRelation, so don't release 'em here. + * close whatever rangetable Relations have been opened. We do not + * release any locks we might hold on those rels. */ num_relations = estate->es_range_table_size; for (i = 0; i < num_relations; i++) -- cgit v1.2.3