Merge branch 'PGPRO10_1617' into PGPRO10

Author: vbwagner

src/backend/access/brin/brin.c

@@ -748,7 +748,6 @@ 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);

src/backend/access/gin/gininsert.c

@@ -447,8 +447,6 @@ 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/gist/gist.c

@@ -129,7 +129,6 @@ 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);

src/backend/access/heap/ptrack.c

@@ -649,19 +649,6 @@ pg_ptrack_control_lsn(PG_FUNCTION_ARGS)
 	PG_RETURN_LSN(lsn);
 }
 
-
-static RangeVar *
-makeRangeVarFromRelid(Oid relid)
-{
-	char *relname = get_rel_name(relid);
-	char *nspname = get_namespace_name(get_rel_namespace(relid));
-
-	if (relname == NULL)
-		elog(ERROR, "Invalid relation OID");
-
-	return makeRangeVar(nspname, relname, -1);
-}
-
 PG_FUNCTION_INFO_V1(pg_ptrack_get_block);
 
 Datum
@@ -671,7 +658,6 @@ pg_ptrack_get_block(PG_FUNCTION_ARGS)
 	Oid			relfilenode = PG_GETARG_OID(1);
 	uint32		blkno = PG_GETARG_UINT32(2);
 	bytea	   *raw_page;
-	RangeVar   *relrv;
 	char	   *raw_page_data;
 	Buffer		buf;
 	Oid relationOid = RelidByRelfilenode(tablespace_oid, relfilenode);

src/backend/access/nbtree/nbtree.c

@@ -303,8 +303,6 @@ btbuildempty(Relation index)
 	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!) */

src/include/access/ptrack.h

@@ -8,9 +8,9 @@
 #include "utils/relcache.h"
 
 /* Ptrack version as a string */
-#define PTRACK_VERSION "1.5"
+#define PTRACK_VERSION "1.6"
 /* Ptrack version as a number */
-#define PTRACK_VERSION_NUM 105
+#define PTRACK_VERSION_NUM 106
 
 /* Number of bits allocated for each heap block. */
 #define PTRACK_BITS_PER_HEAPBLOCK 1