Ensure sufficient alignment for ParallelTableScanDescData in BTShared.

Previously ParallelTableScanDescData was just a member in BTShared,
but after c2fe139c2 that doesn't guarantee sufficient alignment as
specific AMs might (are likely to) need atomic variables in the
struct.

One might think that MAXALIGNing would be sufficient, but as a
comment in shm_toc_allocate() explains, that's not enough. For now,
copy the hack described there.

For parallel sequential scans no such change is needed, as its
allocations go through shm_toc_allocate().

An alternative approach would have been to allocate the parallel scan
descriptor in a separate TOC entry, but there seems little benefit in
doing so.

Per buildfarm member dromedary.

Author: Andres Freund
Discussion: https://postgr.es/m/20190311203126.ty5gbfz42gjbm6i6@alap3.anarazel.de

diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index e37cbac7b3ca72cd3c1eaf82e418a758b6159f49..28c1aeefabb770547e9b8c3ccf2ffefca7abdbe8 100644 (file)
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -157,13 +157,21 @@ typedef struct BTShared
    bool        brokenhotchain;
 
    /*
-    * This variable-sized field must come last.
-    *
-    * See _bt_parallel_estimate_shared() and table_parallelscan_estimate().
+    * ParallelTableScanDescData data follows. Can't directly embed here, as
+    * implementations of the parallel table scan desc interface might need
+    * stronger alignment.
     */
-   ParallelTableScanDescData heapdesc;
 } BTShared;
 
+/*
+ * Return pointer to a BTShared's parallel table scan.
+ *
+ * c.f. shm_toc_allocate as to why BUFFERALIGN is used, rather than just
+ * MAXALIGN.
+ */
+#define ParallelTableScanFromBTShared(shared) \
+   (ParallelTableScanDesc) ((char *) (shared) + BUFFERALIGN(sizeof(BTShared)))
+
 /*
  * Status for leader in parallel index build.
  */
@@ -1317,7 +1325,8 @@ _bt_begin_parallel(BTBuildState *buildstate, bool isconcurrent, int request)
    btshared->havedead = false;
    btshared->indtuples = 0.0;
    btshared->brokenhotchain = false;
-   table_parallelscan_initialize(btspool->heap, &btshared->heapdesc,
+   table_parallelscan_initialize(btspool->heap,
+                                 ParallelTableScanFromBTShared(btshared),
                                  snapshot);
 
    /*
@@ -1407,7 +1416,8 @@ _bt_end_parallel(BTLeader *btleader)
 static Size
 _bt_parallel_estimate_shared(Relation heap, Snapshot snapshot)
 {
-   return add_size(offsetof(BTShared, heapdesc),
+   /* c.f. shm_toc_allocate as to why BUFFERALIGN is used */
+   return add_size(BUFFERALIGN(sizeof(BTShared)),
                    table_parallelscan_estimate(heap, snapshot));
 }
 
@@ -1672,7 +1682,8 @@ _bt_parallel_scan_and_sort(BTSpool *btspool, BTSpool *btspool2,
    /* Join parallel scan */
    indexInfo = BuildIndexInfo(btspool->index);
    indexInfo->ii_Concurrent = btshared->isconcurrent;
-   scan = table_beginscan_parallel(btspool->heap, &btshared->heapdesc);
+   scan = table_beginscan_parallel(btspool->heap,
+                                   ParallelTableScanFromBTShared(btshared));
    reltuples = IndexBuildHeapScan(btspool->heap, btspool->index, indexInfo,
                                   true, _bt_build_callback,
                                   (void *) &buildstate, scan);