summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Paquier2022-10-13 00:31:57 +0000
committerMichael Paquier2022-10-13 00:31:57 +0000
commit56b662523fd49f75abe89d5bad54d377b2f36c24 (patch)
treeabd05f0acbf8831b1b88fa189a01ae2fcd922d9c /src
parent63585b1ebd0d5ee66ff8f801202656d40ff9bb63 (diff)
Fix ordering issue with WAL operations in GIN fast insert path
Contrary to what is documented in src/backend/access/transam/README, ginHeapTupleFastInsert() had a few ordering issues with the way it does its WAL operations when inserting items in its fast path. First, when using a separate list, XLogBeginInsert() was being always called before START_CRIT_SECTION(), and in this case a second thing was wrong when merging lists, as an exclusive lock was taken on the tail page *before* calling XLogBeginInsert(). Finally, when inserting items into a tail page, the order of XLogBeginInsert() and START_CRIT_SECTION() was reversed. This commit addresses all these issues by moving the calls of XLogBeginInsert() after all the pages logged are locked and pinned, within a critical section. Author: Matthias van de Meent, Zhang Mingli Discussion: https://postgr.es/m/CAEze2WhL8uLMqynnnCu1LAPwxD5RKEo0nHV+eXGg_N6ELU88HQ@mail.gmail.com
Diffstat (limited to 'src')
-rw-r--r--src/backend/access/gin/ginfast.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index ab4bb67d4b4..f750b5ed9e9 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -285,9 +285,6 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
memset(&sublist, 0, sizeof(GinMetaPageData));
makeSublist(index, collector->tuples, collector->ntuples, &sublist);
- if (needWal)
- XLogBeginInsert();
-
/*
* metapage was unlocked, see above
*/
@@ -307,6 +304,9 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
metadata->nPendingPages = sublist.nPendingPages;
metadata->nPendingHeapTuples = sublist.nPendingHeapTuples;
+
+ if (needWal)
+ XLogBeginInsert();
}
else
{
@@ -335,7 +335,10 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
metadata->nPendingHeapTuples += sublist.nPendingHeapTuples;
if (needWal)
+ {
+ XLogBeginInsert();
XLogRegisterBuffer(1, buffer, REGBUF_STANDARD);
+ }
}
}
else
@@ -361,11 +364,11 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
data.ntuples = collector->ntuples;
+ START_CRIT_SECTION();
+
if (needWal)
XLogBeginInsert();
- START_CRIT_SECTION();
-
/*
* Increase counter of heap tuples
*/