Merge branch 'PGPROEE96_ptrack1_2' into PGPROEE9_6

vbwagner · vbwagner · commit efb2a1a8bfd2 · 2017-05-16T16:23:08.000+03:00
diff --git a/src/backend/access/transam/generic_xlog.c b/src/backend/access/transam/generic_xlog.c
@@ -15,6 +15,7 @@
 
 #include "access/generic_xlog.h"
 #include "access/xlogutils.h"
+#include "access/ptrack.h"
 #include "miscadmin.h"
 #include "utils/memutils.h"
 
@@ -305,10 +306,18 @@ GenericXLogRegisterBuffer(GenericXLogState *state, Buffer buffer, int flags)
 
 		if (BufferIsInvalid(page->buffer))
 		{
+			RelFileNode rnode;
+			BlockNumber blkno;
+			ForkNumber 	forkno;
+
 			/* Empty slot, so use it (there cannot be a match later) */
 			page->buffer = buffer;
 			page->flags = flags;
 			memcpy(page->image, BufferGetPage(buffer), BLCKSZ);
+
+			BufferGetTag(buffer, &rnode, &forkno, &blkno);
+			if (forkno == MAIN_FORKNUM)
+				ptrack_add_block_redo(rnode, blkno);
 			return (Page) page->image;
 		}
 		else if (page->buffer == buffer)
@@ -490,13 +499,18 @@ generic_redo(XLogReaderState *record)
 	for (block_id = 0; block_id <= record->max_block_id; block_id++)
 	{
 		XLogRedoAction action;
+		RelFileNode rnode;
+		BlockNumber blkno;
 
 		if (!XLogRecHasBlockRef(record, block_id))
 		{
 			buffers[block_id] = InvalidBuffer;
 			continue;
 		}
 
+		XLogRecGetBlockTag(record, block_id, &rnode, NULL, &blkno);
+		ptrack_add_block_redo(rnode, blkno);
+
 		action = XLogReadBufferForRedo(record, block_id, &buffers[block_id]);
 
 		/* Apply redo to given block if needed */
diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c
@@ -23,6 +23,7 @@
 #include "access/xlog.h"
 #include "access/xlog_internal.h"
 #include "access/xloginsert.h"
+#include "access/ptrack.h"
 #include "catalog/pg_control.h"
 #include "common/pg_lzcompress.h"
 #include "miscadmin.h"
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
@@ -243,8 +243,8 @@ RelationTruncate(Relation rel, BlockNumber nblocks)
 	rel->rd_smgr->smgr_targblock = InvalidBlockNumber;
 	rel->rd_smgr->smgr_fsm_nblocks = InvalidBlockNumber;
 	rel->rd_smgr->smgr_vm_nblocks = InvalidBlockNumber;
-	rel->rd_smgr->smgr_ptrack_nblocks = InvalidBlockNumber;
 	rel->rd_smgr->smgr_main_nblocks = InvalidBlockNumber;
+	rel->rd_smgr->smgr_ptrack_nblocks = InvalidBlockNumber;
 
 	/* Truncate the FSM first if it exists */
 	fsm = smgrexists(rel->rd_smgr, FSM_FORKNUM);
diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h
@@ -54,7 +54,7 @@ typedef struct SMgrRelationData
 	 */
 	BlockNumber smgr_targblock; /* current insertion target block */
 	BlockNumber smgr_fsm_nblocks;		/* last known size of fsm fork */
-	BlockNumber smgr_vm_nblocks;	/* last known size of vm fork */
+	BlockNumber smgr_vm_nblocks;		/* last known size of vm fork */
 	BlockNumber smgr_ptrack_nblocks;	/* last known size of ptrack fork */
 
 	/*
