Merge branch 'PGPRO9622_ptrack1_2' into PGPRO9_6

vbwagner · vbwagner · commit 10a8ab5a632d · 2017-05-11T12:44:05.000+03:00
diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
@@ -19,6 +19,7 @@
 #include "access/transam.h"
 #include "access/htup_details.h"
 #include "access/xlog.h"
+#include "access/ptrack.h"
 #include "catalog/catalog.h"
 #include "miscadmin.h"
 #include "pgstat.h"
@@ -228,6 +229,7 @@ heap_page_prune(Relation relation, Buffer buffer, TransactionId OldestXmin,
 	}
 
 	/* Any error while applying the changes is critical */
+	ptrack_add_block(relation, BufferGetBlockNumber(buffer));
 	START_CRIT_SECTION();
 
 	/* Have we found any prunable items? */
diff --git a/src/backend/access/heap/ptrack.c b/src/backend/access/heap/ptrack.c
@@ -28,6 +28,7 @@
 #include "utils/inval.h"
 #include "utils/array.h"
 #include "utils/relfilenodemap.h"
+#include "utils/builtins.h"
 #include <unistd.h>
 #include <sys/stat.h>
 
@@ -661,3 +662,13 @@ pg_ptrack_get_and_clear(PG_FUNCTION_ARGS)
 
 	PG_RETURN_BYTEA_P(ptrack_get_and_clear(PG_GETARG_OID(0), PG_GETARG_OID(1)));
 }
+
+/*
+ * Returns ptrack version currently in use.
+ */
+PG_FUNCTION_INFO_V1(ptrack_version);
+Datum
+ptrack_version(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_TEXT_P(cstring_to_text(PTRACK_VERSION));
+}
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
@@ -114,6 +114,7 @@
 #include "access/tuptoaster.h"
 #include "access/xact.h"
 #include "access/xloginsert.h"
+#include "access/ptrack.h"
 
 #include "catalog/catalog.h"
 
@@ -330,11 +331,15 @@ end_heap_rewrite(RewriteState state)
 	if (state->rs_buffer_valid)
 	{
 		if (state->rs_use_wal)
+		{
+			/* Don't forget to set ptrack bit even if we're skipping bufmgr stage */
+			ptrack_add_block_redo(state->rs_new_rel->rd_node, state->rs_blockno);
 			log_newpage(&state->rs_new_rel->rd_node,
 						MAIN_FORKNUM,
 						state->rs_blockno,
 						state->rs_buffer,
 						true);
+		}
 		RelationOpenSmgr(state->rs_new_rel);
 
 		PageSetChecksumInplace(state->rs_buffer, state->rs_blockno);
@@ -679,11 +684,15 @@ raw_heap_insert(RewriteState state, HeapTuple tup)
 
 			/* XLOG stuff */
 			if (state->rs_use_wal)
+			{
+				/* Don't forget to set ptrack bit even if we're skipping bufmgr stage */
+				ptrack_add_block_redo(state->rs_new_rel->rd_node, state->rs_blockno);
 				log_newpage(&state->rs_new_rel->rd_node,
 							MAIN_FORKNUM,
 							state->rs_blockno,
 							page,
 							true);
+			}
 
 			/*
 			 * Now write the page. We say isTemp = true even if it's not a
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
@@ -21,6 +21,7 @@
 #include "access/nbtree.h"
 #include "access/relscan.h"
 #include "access/xlog.h"
+#include "access/ptrack.h"
 #include "catalog/index.h"
 #include "commands/vacuum.h"
 #include "storage/indexfsm.h"
@@ -253,9 +254,13 @@ btbuildempty(Relation index)
 	PageSetChecksumInplace(metapage, BTREE_METAPAGE);
 	smgrwrite(index->rd_smgr, INIT_FORKNUM, BTREE_METAPAGE,
 			  (char *) metapage, true);
+
+	/* Don't forget to set ptrack bit even if we're skipping bufmgr stage */
+	ptrack_add_block_redo(index->rd_smgr->smgr_rnode.node, BTREE_METAPAGE);
 	log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
 				BTREE_METAPAGE, metapage, false);
-
+	/* Ensure rd_smgr is open (could have been closed by relcache flush!) */
+	RelationOpenSmgr(index);
 	/*
 	 * An immediate sync is required even if we xlog'd the page, because the
 	 * write did not go through shared_buffers and therefore a concurrent
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
@@ -69,6 +69,7 @@
 #include "access/nbtree.h"
 #include "access/xlog.h"
 #include "access/xloginsert.h"
+#include "access/ptrack.h"
 #include "miscadmin.h"
 #include "storage/smgr.h"
 #include "tcop/tcopprot.h"
@@ -276,8 +277,12 @@ _bt_blwritepage(BTWriteState *wstate, Page page, BlockNumber blkno)
 	/* XLOG stuff */
 	if (wstate->btws_use_wal)
 	{
+		/* Don't forget to set ptrack bit even if we're skipping bufmgr stage */
+		ptrack_add_block_redo(wstate->index->rd_node, blkno);
 		/* We use the heap NEWPAGE record type for this */
 		log_newpage(&wstate->index->rd_node, MAIN_FORKNUM, blkno, page, true);
+		/* Ensure rd_smgr is open (could have been closed by relcache flush!) */
+		RelationOpenSmgr(wstate->index);
 	}
 
 	/*
diff --git a/src/backend/access/spgist/spgdoinsert.c b/src/backend/access/spgist/spgdoinsert.c
@@ -215,6 +215,8 @@ addLeafTuple(Relation index, SpGistState *state, SpGistLeafTuple leafTuple,
 	xlrec.nodeI = 0;
 
 	ptrack_add_block(index, BufferGetBlockNumber(current->buffer));
+	if (parent->buffer)
+		ptrack_add_block(index, BufferGetBlockNumber(parent->buffer));
 	START_CRIT_SECTION();
 
 	if (current->offnum == InvalidOffsetNumber ||
diff --git a/src/backend/access/spgist/spginsert.c b/src/backend/access/spgist/spginsert.c
@@ -196,6 +196,13 @@ spgbuildempty(Relation index)
 	log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
 				SPGIST_NULL_BLKNO, page, true);
 
+	/* Don't forget to set ptrack bit even if we're skipping bufmgr stage */
+	ptrack_add_block_redo(index->rd_smgr->smgr_rnode.node, SPGIST_METAPAGE_BLKNO);
+	ptrack_add_block_redo(index->rd_smgr->smgr_rnode.node, SPGIST_ROOT_BLKNO);
+	ptrack_add_block_redo(index->rd_smgr->smgr_rnode.node, SPGIST_NULL_BLKNO);
+
+	/* Ensure rd_smgr is open (could have been closed by relcache flush!) */
+	RelationOpenSmgr(index);
 	/*
 	 * An immediate sync is required even if we xlog'd the pages, because the
 	 * writes did not go through shared buffers and therefore a concurrent
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -35,6 +35,7 @@
 #include "access/xloginsert.h"
 #include "access/xlogreader.h"
 #include "access/xlogutils.h"
+#include "access/ptrack.h"
 #include "catalog/catversion.h"
 #include "catalog/pg_control.h"
 #include "catalog/pg_database.h"
@@ -9479,6 +9480,11 @@ xlog_redo(XLogReaderState *record)
 	else if (info == XLOG_FPI || info == XLOG_FPI_FOR_HINT)
 	{
 		Buffer		buffer;
+		RelFileNode rnode;
+		BlockNumber blkno;
+
+		XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+		ptrack_add_block_redo(rnode, blkno);
 
 		/*
 		 * Full-page image (FPI) records contain nothing else but a backup
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/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c
@@ -550,8 +550,6 @@ CreateFakeRelcacheEntry(RelFileNode rnode)
 	FakeRelCacheEntry fakeentry;
 	Relation	rel;
 
-	Assert(InRecovery);
-
 	/* Allocate the Relation struct and all related space in one block. */
 	fakeentry = palloc0(sizeof(FakeRelCacheEntryData));
 	rel = (Relation) fakeentry;
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
@@ -21,6 +21,7 @@
 #include "access/xlog.h"
 #include "access/xloginsert.h"
 #include "access/xlogutils.h"
+#include "access/ptrack.h"
 #include "catalog/dependency.h"
 #include "catalog/namespace.h"
 #include "catalog/objectaccess.h"
@@ -365,6 +366,7 @@ fill_seq_with_data(Relation rel, HeapTuple tuple)
 	if (RelationNeedsWAL(rel))
 		GetTopTransactionId();
 
+	ptrack_add_block(rel, BufferGetBlockNumber(buf));
 	START_CRIT_SECTION();
 
 	MarkBufferDirty(buf);
@@ -451,6 +453,7 @@ AlterSequence(AlterSeqStmt *stmt)
 		GetTopTransactionId();
 
 	/* Now okay to update the on-disk tuple */
+	ptrack_add_block(seqrel, BufferGetBlockNumber(buf));
 	START_CRIT_SECTION();
 
 	memcpy(seq, &new, sizeof(FormData_pg_sequence));
@@ -711,6 +714,7 @@ nextval_internal(Oid relid)
 		GetTopTransactionId();
 
 	/* ready to change the on-disk (or really, in-buffer) tuple */
+	ptrack_add_block(seqrel, BufferGetBlockNumber(buf));
 	START_CRIT_SECTION();
 
 	/*
@@ -910,6 +914,7 @@ do_setval(Oid relid, int64 next, bool iscalled)
 		GetTopTransactionId();
 
 	/* ready to change the on-disk (or really, in-buffer) tuple */
+	ptrack_add_block(seqrel, BufferGetBlockNumber(buf));
 	START_CRIT_SECTION();
 
 	seq->last_value = next;		/* last fetched number */
@@ -1586,6 +1591,11 @@ seq_redo(XLogReaderState *record)
 	Size		itemsz;
 	xl_seq_rec *xlrec = (xl_seq_rec *) XLogRecGetData(record);
 	sequence_magic *sm;
+	RelFileNode rnode;
+	BlockNumber blkno;
+
+	XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
+	ptrack_add_block_redo(rnode, blkno);
 
 	if (info != XLOG_SEQ_LOG)
 		elog(PANIC, "seq_redo: unknown op code %u", info);
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -23,6 +23,7 @@
 #include "access/tupconvert.h"
 #include "access/xact.h"
 #include "access/xlog.h"
+#include "access/ptrack.h"
 #include "catalog/catalog.h"
 #include "catalog/dependency.h"
 #include "catalog/heap.h"
@@ -9761,6 +9762,13 @@ ATExecSetTableSpace(Oid tableOid, Oid newTableSpace, LOCKMODE lockmode)
 	/* copy those extra forks that exist */
 	for (forkNum = MAIN_FORKNUM + 1; forkNum <= MAX_FORKNUM; forkNum++)
 	{
+		/*
+		 * Do not copy ptrack fork, because it will be created
+		 * for new relation while copying data.
+		 */
+		if (forkNum == PAGESTRACK_FORKNUM)
+			continue;
+
 		if (smgrexists(rel->rd_smgr, forkNum))
 		{
 			smgrcreate(dstrel, forkNum, false);
@@ -10044,7 +10052,11 @@ copy_relation_data(SMgrRelation src, SMgrRelation dst,
 		 * space.
 		 */
 		if (use_wal)
+		{
+			if (forkNum == MAIN_FORKNUM)
+				ptrack_add_block_redo(dst->smgr_rnode.node, blkno);
 			log_newpage(&dst->smgr_rnode.node, forkNum, blkno, page, false);
+		}
 
 		PageSetChecksumInplace(page, blkno);
 
diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
@@ -45,6 +45,7 @@
 #include "access/transam.h"
 #include "access/visibilitymap.h"
 #include "access/xlog.h"
+#include "access/ptrack.h"
 #include "catalog/catalog.h"
 #include "catalog/storage.h"
 #include "commands/dbcommands.h"
@@ -856,6 +857,7 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
 				empty_pages++;
 			}
 			freespace = PageGetHeapFreeSpace(page);
+			ptrack_add_block(onerel, BufferGetBlockNumber(buf));
 			MarkBufferDirty(buf);
 			UnlockReleaseBuffer(buf);
 
@@ -871,6 +873,7 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
 			/* empty pages are always all-visible and all-frozen */
 			if (!PageIsAllVisible(page))
 			{
+				ptrack_add_block(onerel, BufferGetBlockNumber(buf));
 				START_CRIT_SECTION();
 
 				/* mark buffer dirty before writing a WAL record */
@@ -1096,6 +1099,7 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
 		 */
 		if (nfrozen > 0)
 		{
+			ptrack_add_block(onerel, BufferGetBlockNumber(buf));
 			START_CRIT_SECTION();
 
 			MarkBufferDirty(buf);
@@ -1169,6 +1173,7 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
 			 * rare cases after a crash, it is not worth optimizing.
 			 */
 			PageSetAllVisible(page);
+			ptrack_add_block(onerel, BufferGetBlockNumber(buf));
 			MarkBufferDirty(buf);
 			visibilitymap_set(onerel, blkno, buf, InvalidXLogRecPtr,
 							  vmbuffer, visibility_cutoff_xid, flags);
@@ -1208,6 +1213,7 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
 			elog(WARNING, "page containing dead tuples is marked as all-visible in relation \"%s\" page %u",
 				 relname, blkno);
 			PageClearAllVisible(page);
+			ptrack_add_block(onerel, BufferGetBlockNumber(buf));
 			MarkBufferDirty(buf);
 			visibilitymap_clear(onerel, blkno, vmbuffer,
 								VISIBILITYMAP_VALID_BITS);
@@ -1444,6 +1450,7 @@ lazy_vacuum_page(Relation onerel, BlockNumber blkno, Buffer buffer,
 
 	pgstat_progress_update_param(PROGRESS_VACUUM_HEAP_BLKS_VACUUMED, blkno);
 
+	ptrack_add_block(onerel, BufferGetBlockNumber(buffer));
 	START_CRIT_SECTION();
 
 	for (; tupindex < vacrelstats->num_dead_tuples; tupindex++)
diff --git a/src/include/access/ptrack.h b/src/include/access/ptrack.h
@@ -7,6 +7,11 @@
 #include "storage/relfilenode.h"
 #include "utils/relcache.h"
 
+/* Ptrack version as a string */
+#define PTRACK_VERSION "1.2"
+/* Ptrack version as a number */
+#define PTRACK_VERSION_NUM 102
+
 /* Number of bits allocated for each heap block. */
 #define PTRACK_BITS_PER_HEAPBLOCK 1
 
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
@@ -5363,6 +5363,8 @@ DATA(insert OID = 6017 ( pg_ptrack_test		PGNSP PGUID 12 1 0 0 0 f f f f t f v u
 DESCR("test ptrack fork relation");
 DATA(insert OID = 6018 ( pg_ptrack_get_and_clear		PGNSP PGUID 12 1 0 0 0 f f f f t f v s 2 0 17 "26 26" _null_ _null_ _null_ _null_ _null_ pg_ptrack_get_and_clear _null_ _null_ _null_ ));
 DESCR("get ptrack file as bytea and clear him");
+DATA(insert OID =  6021 ( ptrack_version	PGNSP PGUID 12 1 0 0 0 f f f f t f s s 0 0 25 "" _null_ _null_ _null_ _null_ _null_ ptrack_version _null_ _null_ _null_ ));
+DESCR("Ptrack version string");
 
 /*
  * Symbolic values for proargmodes column.  Note that these must agree with
