gin ptrack with xlog

Author: alubennikova

src/backend/access/gin/ginbtree.c

@@ -16,6 +16,7 @@
 
 #include "access/gin_private.h"
 #include "access/xloginsert.h"
+#include "access/ptrack.h"
 #include "miscadmin.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
@@ -385,6 +386,9 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
 	else if (rc == GPTP_INSERT)
 	{
 		/* It will fit, perform the insertion */
+		ptrack_add_block(btree->index, BufferGetBlockNumber(stack->buffer));
+		if (BufferIsValid(childbuf))
+			ptrack_add_block(btree->index, BufferGetBlockNumber(childbuf));
 		START_CRIT_SECTION();
 
 		if (RelationNeedsWAL(btree->index) && !btree->isBuild)
@@ -534,6 +538,12 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
 		 * the new contents of the root.
 		 */
 
+		ptrack_add_block(btree->index, BufferGetBlockNumber(rbuffer));
+		ptrack_add_block(btree->index, BufferGetBlockNumber(stack->buffer));
+		if (stack->parent == NULL)
+			ptrack_add_block(btree->index, BufferGetBlockNumber(lbuffer));
+		if (BufferIsValid(childbuf))
+			ptrack_add_block(btree->index, BufferGetBlockNumber(childbuf));
 		START_CRIT_SECTION();
 
 		MarkBufferDirty(rbuffer);

src/backend/access/gin/gindatapage.c

@@ -16,6 +16,7 @@
 
 #include "access/gin_private.h"
 #include "access/xloginsert.h"
+#include "access/ptrack.h"
 #include "lib/ilist.h"
 #include "miscadmin.h"
 #include "utils/rel.h"
@@ -835,6 +836,7 @@ ginVacuumPostingTreeLeaf(Relation indexrel, Buffer buffer, GinVacuumState *gvs)
 			computeLeafRecompressWALData(leaf);
 
 		/* Apply changes to page */
+		ptrack_add_block(indexrel, BufferGetBlockNumber(buffer));
 		START_CRIT_SECTION();
 
 		dataPlaceToPageLeafRecompress(buffer, leaf);
@@ -1811,6 +1813,7 @@ createPostingTree(Relation index, ItemPointerData *items, uint32 nitems,
 	page = BufferGetPage(buffer);
 	blkno = BufferGetBlockNumber(buffer);
 
+	ptrack_add_block(index, BufferGetBlockNumber(buffer));
 	START_CRIT_SECTION();
 
 	PageRestoreTempPage(tmppage, page);

src/backend/access/gin/ginfast.c

@@ -20,6 +20,7 @@
 
 #include "access/gin_private.h"
 #include "access/xloginsert.h"
+#include "access/ptrack.h"
 #include "access/xlog.h"
 #include "commands/vacuum.h"
 #include "catalog/pg_am.h"
@@ -67,6 +68,7 @@ writeListPage(Relation index, Buffer buffer,
 	/* workspace could be a local array; we use palloc for alignment */
 	workspace = palloc(BLCKSZ);
 
+	ptrack_add_block(index, BufferGetBlockNumber(buffer));
 	START_CRIT_SECTION();
 
 	GinInitBuffer(buffer, GIN_LIST);
@@ -293,6 +295,7 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
 			/*
 			 * Main list is empty, so just insert sublist as main list
 			 */
+			ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
 			START_CRIT_SECTION();
 
 			metadata->head = sublist.head;
@@ -316,6 +319,8 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
 
 			Assert(GinPageGetOpaque(page)->rightlink == InvalidBlockNumber);
 
+			ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
+			ptrack_add_block(index, BufferGetBlockNumber(buffer));
 			START_CRIT_SECTION();
 
 			GinPageGetOpaque(page)->rightlink = sublist.head;
@@ -358,6 +363,8 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
 		if (needWal)
 			XLogBeginInsert();
 
+		ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
+		ptrack_add_block(index, BufferGetBlockNumber(buffer));
 		START_CRIT_SECTION();
 
 		/*
@@ -553,6 +560,7 @@ shiftList(Relation index, Buffer metabuffer, BlockNumber newHead,
 		if (RelationNeedsWAL(index))
 			XLogEnsureRecordSpace(data.ndeleted, 0);
 
+		ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
 		START_CRIT_SECTION();
 
 		metadata->head = blknoToDelete;

src/backend/access/gin/gininsert.c

@@ -17,6 +17,7 @@
 #include "access/gin_private.h"
 #include "access/xloginsert.h"
 #include "access/generic_xlog.h"
+#include "access/ptrack.h"
 #include "catalog/index.h"
 #include "miscadmin.h"
 #include "storage/bufmgr.h"
@@ -337,6 +338,8 @@ ginbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 	/* initialize the root page */
 	RootBuffer = GinNewBuffer(index);
 
+	ptrack_add_block(index, BufferGetBlockNumber(MetaBuffer));
+	ptrack_add_block(index, BufferGetBlockNumber(RootBuffer));
 	START_CRIT_SECTION();
 	GinInitMetabuffer(MetaBuffer);
 	MarkBufferDirty(MetaBuffer);
@@ -430,6 +433,8 @@ ginbuildempty(Relation index)
 	LockBuffer(RootBuffer, BUFFER_LOCK_EXCLUSIVE);
 
 	/* Initialize and xlog metabuffer and root buffer. */
+	ptrack_add_block(index, BufferGetBlockNumber(MetaBuffer));
+	ptrack_add_block(index, BufferGetBlockNumber(RootBuffer));
 	START_CRIT_SECTION();
 	GinInitMetabuffer(MetaBuffer);
 	MarkBufferDirty(MetaBuffer);

src/backend/access/gin/ginutil.c

@@ -17,6 +17,7 @@
 #include "access/gin_private.h"
 #include "access/reloptions.h"
 #include "access/xloginsert.h"
+#include "access/ptrack.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
@@ -639,6 +640,7 @@ ginUpdateStats(Relation index, const GinStatsData *stats, bool is_build)
 	metapage = BufferGetPage(metabuffer);
 	metadata = GinPageGetMeta(metapage);
 
+	ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
 	START_CRIT_SECTION();
 
 	metadata->nTotalPages = stats->nTotalPages;

src/backend/access/gin/ginvacuum.c

@@ -16,6 +16,7 @@
 
 #include "access/gin_private.h"
 #include "access/xloginsert.h"
+#include "access/ptrack.h"
 #include "commands/vacuum.h"
 #include "miscadmin.h"
 #include "postmaster/autovacuum.h"
@@ -209,6 +210,9 @@ ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkn
 								 * LockBufferForCleanup() */
 		LockBuffer(pBuffer, GIN_EXCLUSIVE);
 
+	ptrack_add_block(gvs->index, BufferGetBlockNumber(pBuffer));
+	ptrack_add_block(gvs->index, BufferGetBlockNumber(lBuffer));
+	ptrack_add_block(gvs->index, BufferGetBlockNumber(dBuffer));
 	START_CRIT_SECTION();
 
 	/* Unlink the page by changing left sibling's rightlink */
@@ -603,6 +607,7 @@ ginbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 
 		if (resPage)
 		{
+			ptrack_add_block(gvs.index, BufferGetBlockNumber(buffer));
 			START_CRIT_SECTION();
 			PageRestoreTempPage(resPage, page);
 			MarkBufferDirty(buffer);

src/backend/access/gin/ginxlog.c

@@ -15,6 +15,7 @@
 
 #include "access/gin_private.h"
 #include "access/xlogutils.h"
+#include "access/ptrack.h"
 #include "utils/memutils.h"
 
 static MemoryContext opCtx;		/* working memory for operations */
@@ -25,6 +26,11 @@ ginRedoClearIncompleteSplit(XLogReaderState *record, uint8 block_id)
 	XLogRecPtr	lsn = record->EndRecPtr;
 	Buffer		buffer;
 	Page		page;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, block_id, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	if (XLogReadBufferForRedo(record, block_id, &buffer) == BLK_NEEDS_REDO)
 	{
@@ -45,8 +51,12 @@ ginRedoCreateIndex(XLogReaderState *record)
 	Buffer		RootBuffer,
 				MetaBuffer;
 	Page		page;
+	RelFileNode rnode;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, NULL);
 
 	MetaBuffer = XLogInitBufferForRedo(record, 0);
+	ptrack_add_block_redo(rnode, BufferGetBlockNumber(MetaBuffer));
 	Assert(BufferGetBlockNumber(MetaBuffer) == GIN_METAPAGE_BLKNO);
 	page = (Page) BufferGetPage(MetaBuffer);
 
@@ -56,6 +66,7 @@ ginRedoCreateIndex(XLogReaderState *record)
 	MarkBufferDirty(MetaBuffer);
 
 	RootBuffer = XLogInitBufferForRedo(record, 1);
+	ptrack_add_block_redo(rnode, BufferGetBlockNumber(RootBuffer));
 	Assert(BufferGetBlockNumber(RootBuffer) == GIN_ROOT_BLKNO);
 	page = (Page) BufferGetPage(RootBuffer);
 
@@ -76,8 +87,13 @@ ginRedoCreatePTree(XLogReaderState *record)
 	char	   *ptr;
 	Buffer		buffer;
 	Page		page;
+	RelFileNode rnode;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, NULL);
 
 	buffer = XLogInitBufferForRedo(record, 0);
+	ptrack_add_block_redo(rnode, BufferGetBlockNumber(buffer));
+
 	page = (Page) BufferGetPage(buffer);
 
 	GinInitBuffer(buffer, GIN_DATA | GIN_LEAF | GIN_COMPRESSED);
@@ -329,6 +345,11 @@ ginRedoInsert(XLogReaderState *record)
 #endif
 	BlockNumber rightChildBlkno = InvalidBlockNumber;
 	bool		isLeaf = (data->flags & GIN_INSERT_ISLEAF) != 0;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	/*
 	 * First clear incomplete-split flag on child page if this finishes a
@@ -382,6 +403,18 @@ ginRedoSplit(XLogReaderState *record)
 				rootbuf;
 	bool		isLeaf = (data->flags & GIN_INSERT_ISLEAF) != 0;
 	bool		isRoot = (data->flags & GIN_SPLIT_ROOT) != 0;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
+	XLogRecGetBlockTag(record, 1, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
+	if (isRoot)
+	{
+		XLogRecGetBlockTag(record, 2, &rnode, NULL, &blkno);
+		ptrack_add_block_redo(rnode, blkno);
+	}
 
 	/*
 	 * First clear incomplete-split flag on child page if this finishes a
@@ -415,6 +448,11 @@ static void
 ginRedoVacuumPage(XLogReaderState *record)
 {
 	Buffer		buffer;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	if (XLogReadBufferForRedo(record, 0, &buffer) != BLK_RESTORED)
 	{
@@ -428,6 +466,11 @@ ginRedoVacuumDataLeafPage(XLogReaderState *record)
 {
 	XLogRecPtr	lsn = record->EndRecPtr;
 	Buffer		buffer;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	if (XLogReadBufferForRedo(record, 0, &buffer) == BLK_NEEDS_REDO)
 	{
@@ -457,6 +500,15 @@ ginRedoDeletePage(XLogReaderState *record)
 	Buffer		pbuffer;
 	Buffer		lbuffer;
 	Page		page;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
+	XLogRecGetBlockTag(record, 1, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
+	XLogRecGetBlockTag(record, 2, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	if (XLogReadBufferForRedo(record, 0, &dbuffer) == BLK_NEEDS_REDO)
 	{
@@ -502,6 +554,13 @@ ginRedoUpdateMetapage(XLogReaderState *record)
 	Buffer		metabuffer;
 	Page		metapage;
 	Buffer		buffer;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
+	XLogRecGetBlockTag(record, 1, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	/*
 	 * Restore the metapage. This is essentially the same as a full-page
@@ -600,6 +659,11 @@ ginRedoInsertListPage(XLogReaderState *record)
 	char	   *payload;
 	IndexTuple	tuples;
 	Size		totaltupsize;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	/* We always re-initialize the page. */
 	buffer = XLogInitBufferForRedo(record, 0);
@@ -649,6 +713,11 @@ ginRedoDeleteListPages(XLogReaderState *record)
 	Buffer		metabuffer;
 	Page		metapage;
 	int			i;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	metabuffer = XLogInitBufferForRedo(record, 0);
 	Assert(BufferGetBlockNumber(metabuffer) == GIN_METAPAGE_BLKNO);
@@ -680,6 +749,9 @@ ginRedoDeleteListPages(XLogReaderState *record)
 		Buffer		buffer;
 		Page		page;
 
+		XLogRecGetBlockTag(record, i+1, &rnode, NULL, &blkno);
+		ptrack_add_block_redo(rnode, blkno);
+
 		buffer = XLogInitBufferForRedo(record, i + 1);
 		page = BufferGetPage(buffer);
 		GinInitBuffer(buffer, GIN_DELETED);