brin ptrack with xlog

alubennikova · alubennikova · commit 86bcaf6cfb14 · 2017-03-07T14:19:25.000+03:00
diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c
@@ -22,6 +22,7 @@
 #include "access/reloptions.h"
 #include "access/relscan.h"
 #include "access/xloginsert.h"
+#include "access/ptrack.h"
 #include "catalog/index.h"
 #include "catalog/pg_am.h"
 #include "miscadmin.h"
@@ -685,6 +686,7 @@ brinbuildempty(Relation index)
 	LockBuffer(metabuf, BUFFER_LOCK_EXCLUSIVE);
 
 	/* Initialize and xlog metabuffer. */
+	ptrack_add_block(index, BufferGetBlockNumber(metabuf));
 	START_CRIT_SECTION();
 	brin_metapage_init(BufferGetPage(metabuf), BrinGetPagesPerRange(index),
 					   BRIN_CURRENT_VERSION);
diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c
@@ -15,6 +15,7 @@
 #include "access/brin_revmap.h"
 #include "access/brin_xlog.h"
 #include "access/xloginsert.h"
+#include "access/ptrack.h"
 #include "miscadmin.h"
 #include "storage/bufmgr.h"
 #include "storage/freespace.h"
@@ -177,6 +178,7 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
 			UnlockReleaseBuffer(newbuf);
 		}
 
+		ptrack_add_block(idxrel, BufferGetBlockNumber(oldbuf));
 		START_CRIT_SECTION();
 		PageIndexDeleteNoCompact(oldpage, &oldoff, 1);
 		if (PageAddItemExtended(oldpage, (Item) newtup, newsz, oldoff,
@@ -237,6 +239,9 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
 
 		revmapbuf = brinLockRevmapPageForUpdate(revmap, heapBlk);
 
+		ptrack_add_block(idxrel, BufferGetBlockNumber(newbuf));
+		ptrack_add_block(idxrel, BufferGetBlockNumber(oldbuf));
+		ptrack_add_block(idxrel, BufferGetBlockNumber(revmapbuf));
 		START_CRIT_SECTION();
 
 		/*
@@ -408,6 +413,8 @@ brin_doinsert(Relation idxrel, BlockNumber pagesPerRange,
 	blk = BufferGetBlockNumber(*buffer);
 
 	/* Execute the actual insertion */
+	ptrack_add_block(idxrel, BufferGetBlockNumber(*buffer));
+	ptrack_add_block(idxrel, BufferGetBlockNumber(revmapbuf));
 	START_CRIT_SECTION();
 	if (extended)
 		brin_page_init(BufferGetPage(*buffer), BRIN_PAGETYPE_REGULAR);
@@ -862,6 +869,7 @@ brin_initialize_empty_new_buffer(Relation idxrel, Buffer buffer)
 			   "brin_initialize_empty_new_buffer: initializing blank page %u",
 			   BufferGetBlockNumber(buffer)));
 
+	ptrack_add_block(idxrel, BufferGetBlockNumber(buffer));
 	START_CRIT_SECTION();
 	page = BufferGetPage(buffer);
 	brin_page_init(page, BRIN_PAGETYPE_REGULAR);
diff --git a/src/backend/access/brin/brin_revmap.c b/src/backend/access/brin/brin_revmap.c
@@ -27,6 +27,7 @@
 #include "access/brin_xlog.h"
 #include "access/rmgr.h"
 #include "access/xloginsert.h"
+#include "access/ptrack.h"
 #include "miscadmin.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
@@ -475,6 +476,8 @@ revmap_physical_extend(BrinRevmap *revmap)
 	 * Ok, we have now locked the metapage and the target block. Re-initialize
 	 * it as a revmap page.
 	 */
+	ptrack_add_block(irel, BufferGetBlockNumber(buf));
+	ptrack_add_block(irel, BufferGetBlockNumber(revmap->rm_metaBuf));
 	START_CRIT_SECTION();
 
 	/* the rm_tids array is initialized to all invalid by PageInit */
diff --git a/src/backend/access/brin/brin_xlog.c b/src/backend/access/brin/brin_xlog.c
@@ -14,6 +14,7 @@
 #include "access/brin_pageops.h"
 #include "access/brin_xlog.h"
 #include "access/xlogutils.h"
+#include "access/ptrack.h"
 
 
 /*
@@ -26,6 +27,11 @@ brin_xlog_createidx(XLogReaderState *record)
 	xl_brin_createidx *xlrec = (xl_brin_createidx *) XLogRecGetData(record);
 	Buffer		buf;
 	Page		page;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	/* create the index' metapage */
 	buf = XLogInitBufferForRedo(record, 0);
@@ -50,6 +56,13 @@ brin_xlog_insert_update(XLogReaderState *record,
 	BlockNumber regpgno;
 	Page		page;
 	XLogRedoAction action;
+	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 we inserted the first and only tuple on the page, re-initialize the
@@ -137,9 +150,15 @@ brin_xlog_update(XLogReaderState *record)
 	xl_brin_update *xlrec = (xl_brin_update *) XLogRecGetData(record);
 	Buffer		buffer;
 	XLogRedoAction action;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 2, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	/* First remove the old tuple */
 	action = XLogReadBufferForRedo(record, 2, &buffer);
+
 	if (action == BLK_NEEDS_REDO)
 	{
 		Page		page;
@@ -174,9 +193,15 @@ brin_xlog_samepage_update(XLogReaderState *record)
 	xl_brin_samepage_update *xlrec;
 	Buffer		buffer;
 	XLogRedoAction action;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	xlrec = (xl_brin_samepage_update *) XLogRecGetData(record);
 	action = XLogReadBufferForRedo(record, 0, &buffer);
+
 	if (action == BLK_NEEDS_REDO)
 	{
 		Size		tuplen;
@@ -220,14 +245,21 @@ brin_xlog_revmap_extend(XLogReaderState *record)
 	Page		page;
 	BlockNumber targetBlk;
 	XLogRedoAction action;
+	RelFileNode rnode;
+	BlockNumber blkno;
 
 	xlrec = (xl_brin_revmap_extend *) XLogRecGetData(record);
 
-	XLogRecGetBlockTag(record, 1, NULL, NULL, &targetBlk);
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
+	XLogRecGetBlockTag(record, 1, &rnode, NULL, &targetBlk);
+	ptrack_add_block_redo(rnode, targetBlk);
+
 	Assert(xlrec->targetBlk == targetBlk);
 
 	/* Update the metapage */
 	action = XLogReadBufferForRedo(record, 0, &metabuf);
+
 	if (action == BLK_NEEDS_REDO)
 	{
 		Page		metapg;
