diff options
Diffstat (limited to 'src/backend/access/transam/parallel.c')
| -rw-r--r-- | src/backend/access/transam/parallel.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c index d4e84aabac7..4a2e352d579 100644 --- a/src/backend/access/transam/parallel.c +++ b/src/backend/access/transam/parallel.c @@ -1421,17 +1421,18 @@ ParallelWorkerMain(Datum main_arg) StartParallelWorkerTransaction(tstatespace); /* - * Restore relmapper and reindex state early, since these affect catalog - * access. Ideally we'd do this even before calling InitPostgres, but - * that has order-of-initialization problems, and also the relmapper would - * get confused during the CommitTransactionCommand call above. + * Restore state that affects catalog access. Ideally we'd do this even + * before calling InitPostgres, but that has order-of-initialization + * problems, and also the relmapper would get confused during the + * CommitTransactionCommand call above. */ + pendingsyncsspace = shm_toc_lookup(toc, PARALLEL_KEY_PENDING_SYNCS, + false); + RestorePendingSyncs(pendingsyncsspace); relmapperspace = shm_toc_lookup(toc, PARALLEL_KEY_RELMAPPER_STATE, false); RestoreRelationMap(relmapperspace); reindexspace = shm_toc_lookup(toc, PARALLEL_KEY_REINDEX_STATE, false); RestoreReindexState(reindexspace); - - /* Restore combo CID state. */ combocidspace = shm_toc_lookup(toc, PARALLEL_KEY_COMBO_CID, false); RestoreComboCIDState(combocidspace); @@ -1488,11 +1489,6 @@ ParallelWorkerMain(Datum main_arg) SetTempNamespaceState(fps->temp_namespace_id, fps->temp_toast_namespace_id); - /* Restore pending syncs. */ - pendingsyncsspace = shm_toc_lookup(toc, PARALLEL_KEY_PENDING_SYNCS, - false); - RestorePendingSyncs(pendingsyncsspace); - /* Restore uncommitted enums. */ uncommittedenumsspace = shm_toc_lookup(toc, PARALLEL_KEY_UNCOMMITTEDENUMS, false); |