Fix page modification outside of critical section in GIN
authorAlexander Korotkov <[email protected]>
Tue, 19 Nov 2019 21:12:33 +0000 (00:12 +0300)
committerAlexander Korotkov <[email protected]>
Tue, 19 Nov 2019 21:12:33 +0000 (00:12 +0300)
By oversight 52ac6cd2d0 makes ginDeletePage() sets pd_prune_xid of page to be
deleted before entering the critical section.  It appears that only versions 11
and later were affected by this oversight.

Back-through: 11

src/backend/access/gin/ginvacuum.c

index 3a695a05552d4bbcd7a7a7459dddacdc02fc4e3e..0c8f4b1337266e53883bc22dc581bf837643bb2c 100644 (file)
@@ -153,9 +153,6 @@ ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkn
        page = BufferGetPage(dBuffer);
        rightlink = GinPageGetOpaque(page)->rightlink;
 
-       /* For deleted page remember last xid which could knew its address */
-       GinPageSetDeleteXid(page, ReadNewTransactionId());
-
        /*
         * Any insert which would have gone on the leaf block will now go to its
         * right sibling.
@@ -168,6 +165,9 @@ ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkn
        page = BufferGetPage(lBuffer);
        GinPageGetOpaque(page)->rightlink = rightlink;
 
+       /* For deleted page remember last xid which could knew its address */
+       GinPageSetDeleteXid(page, ReadNewTransactionId());
+
        /* Delete downlink from parent */
        parentPage = BufferGetPage(pBuffer);
 #ifdef USE_ASSERT_CHECKING