gist ptrack with xlog

alubennikova · alubennikova · commit 31e7971970b4 · 2017-03-07T14:12:19.000+03:00
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
@@ -16,6 +16,7 @@
 
 #include "access/gist_private.h"
 #include "access/gistscan.h"
+#include "access/ptrack.h"
 #include "catalog/pg_collation.h"
 #include "miscadmin.h"
 #include "utils/index_selfuncs.h"
@@ -122,6 +123,7 @@ gistbuildempty(Relation index)
 	LockBuffer(buffer, BUFFER_LOCK_EXCLUSIVE);
 
 	/* Initialize and xlog buffer */
+	ptrack_add_block(index, BufferGetBlockNumber(buffer));
 	START_CRIT_SECTION();
 	GISTInitBuffer(buffer, F_LEAF);
 	MarkBufferDirty(buffer);
@@ -448,6 +450,10 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 		if (RelationNeedsWAL(rel) && !is_build)
 			XLogEnsureRecordSpace(npage, 1 + npage * 2);
 
+		for (ptr = dist; ptr; ptr = ptr->next)
+			ptrack_add_block(rel, BufferGetBlockNumber(ptr->buffer));
+		if (BufferIsValid(leftchildbuf))
+			ptrack_add_block(rel, BufferGetBlockNumber(leftchildbuf));
 		START_CRIT_SECTION();
 
 		/*
@@ -499,6 +505,9 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
 		/*
 		 * Enough space. We also get here if ntuples==0.
 		 */
+		ptrack_add_block(rel, BufferGetBlockNumber(buffer));
+		if (BufferIsValid(leftchildbuf))
+			ptrack_add_block(rel, BufferGetBlockNumber(leftchildbuf));
 		START_CRIT_SECTION();
 
 		/*
@@ -1537,6 +1546,7 @@ gistvacuumpage(Relation rel, Page page, Buffer buffer)
 
 	if (ndeletable > 0)
 	{
+		ptrack_add_block(rel, BufferGetBlockNumber(buffer));
 		START_CRIT_SECTION();
 
 		PageIndexMultiDelete(page, deletable, ndeletable);
diff --git a/src/backend/access/gist/gistbuild.c b/src/backend/access/gist/gistbuild.c
@@ -20,6 +20,7 @@
 #include "access/gist_private.h"
 #include "access/xloginsert.h"
 #include "access/generic_xlog.h"
+#include "access/ptrack.h"
 #include "catalog/index.h"
 #include "miscadmin.h"
 #include "optimizer/cost.h"
@@ -172,6 +173,7 @@ gistbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 	Assert(BufferGetBlockNumber(buffer) == GIST_ROOT_BLKNO);
 	page = BufferGetPage(buffer);
 
+	ptrack_add_block(index, BufferGetBlockNumber(buffer));
 	START_CRIT_SECTION();
 
 	GISTInitBuffer(buffer, F_LEAF);
diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c
@@ -16,6 +16,7 @@
 
 #include "access/genam.h"
 #include "access/gist_private.h"
+#include "access/ptrack.h"
 #include "commands/vacuum.h"
 #include "miscadmin.h"
 #include "storage/indexfsm.h"
@@ -212,6 +213,7 @@ gistbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 
 			if (ntodelete)
 			{
+				ptrack_add_block(rel, BufferGetBlockNumber(buffer));
 				START_CRIT_SECTION();
 
 				MarkBufferDirty(buffer);
diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c
@@ -16,6 +16,7 @@
 #include "access/gist_private.h"
 #include "access/xloginsert.h"
 #include "access/xlogutils.h"
+#include "access/ptrack.h"
 #include "utils/memutils.h"
 
 static MemoryContext opCtx;		/* working memory for operations */
@@ -38,6 +39,11 @@ gistRedoClearFollowRight(XLogReaderState *record, uint8 block_id)
 	Buffer		buffer;
 	Page		page;
 	XLogRedoAction action;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, block_id, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	/*
 	 * Note that we still update the page even if it was restored from a full
@@ -68,6 +74,11 @@ gistRedoPageUpdateRecord(XLogReaderState *record)
 	gistxlogPageUpdate *xldata = (gistxlogPageUpdate *) XLogRecGetData(record);
 	Buffer		buffer;
 	Page		page;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	if (XLogReadBufferForRedo(record, 0, &buffer) == BLK_NEEDS_REDO)
 	{
@@ -173,6 +184,7 @@ gistRedoPageSplitRecord(XLogReaderState *record)
 	int			i;
 	bool		isrootsplit = false;
 
+
 	/*
 	 * We must hold lock on the first-listed page throughout the action,
 	 * including while updating the left child page (if any).  We can unlock
@@ -190,8 +202,11 @@ gistRedoPageSplitRecord(XLogReaderState *record)
 		int			num;
 		BlockNumber blkno;
 		IndexTuple *tuples;
+		RelFileNode rnode;
+
+		XLogRecGetBlockTag(record, i + 1, &rnode, NULL, &blkno);
+		ptrack_add_block_redo(rnode, blkno);
 
-		XLogRecGetBlockTag(record, i + 1, NULL, NULL, &blkno);
 		if (blkno == GIST_ROOT_BLKNO)
 		{
 			Assert(i == 0);
@@ -262,6 +277,11 @@ gistRedoCreateIndex(XLogReaderState *record)
 	XLogRecPtr	lsn = record->EndRecPtr;
 	Buffer		buffer;
 	Page		page;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	buffer = XLogInitBufferForRedo(record, 0);
 	Assert(BufferGetBlockNumber(buffer) == GIST_ROOT_BLKNO);
