diff options
| -rw-r--r-- | src/backend/access/nbtree/nbtsort.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c index e6be7bba594..baec5de9993 100644 --- a/src/backend/access/nbtree/nbtsort.c +++ b/src/backend/access/nbtree/nbtsort.c @@ -1332,14 +1332,6 @@ _bt_begin_parallel(BTBuildState *buildstate, bool isconcurrent, int request) pcxt = CreateParallelContext("postgres", "_bt_parallel_build_main", request); - /* If no DSM segment was available, back out (do serial build) */ - if (pcxt->seg == NULL) - { - DestroyParallelContext(pcxt); - ExitParallelMode(); - return; - } - scantuplesortstates = leaderparticipates ? request + 1 : request; /* @@ -1383,6 +1375,16 @@ _bt_begin_parallel(BTBuildState *buildstate, bool isconcurrent, int request) /* Everyone's had a chance to ask for space, so now create the DSM */ InitializeParallelDSM(pcxt); + /* If no DSM segment was available, back out (do serial build) */ + if (pcxt->seg == NULL) + { + if (IsMVCCSnapshot(snapshot)) + UnregisterSnapshot(snapshot); + DestroyParallelContext(pcxt); + ExitParallelMode(); + return; + } + /* Store shared build state, for which we reserved space */ btshared = (BTShared *) shm_toc_allocate(pcxt->toc, estbtshared); /* Initialize immutable state */ |