remove all ptrack_v1.1 related stuff

Author: alubennikova

src/backend/access/brin/brin.c

@@ -22,7 +22,6 @@
 #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"
@@ -686,7 +685,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/brin/brin_pageops.c

@@ -15,7 +15,6 @@
 #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"
@@ -178,7 +177,6 @@ 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,
@@ -239,9 +237,6 @@ 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();
 
 		/*
@@ -413,8 +408,6 @@ 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);
@@ -869,7 +862,6 @@ 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);

src/backend/access/brin/brin_revmap.c

@@ -27,7 +27,6 @@
 #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"
@@ -476,8 +475,6 @@ 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 */

src/backend/access/brin/brin_xlog.c

@@ -14,7 +14,6 @@
 #include "access/brin_pageops.h"
 #include "access/brin_xlog.h"
 #include "access/xlogutils.h"
-#include "access/ptrack.h"
 
 
 /*
@@ -27,11 +26,6 @@ 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);
@@ -56,13 +50,6 @@ 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
@@ -150,15 +137,9 @@ 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;
@@ -193,15 +174,9 @@ 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;
@@ -245,21 +220,14 @@ 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, 0, &rnode, NULL, &blkno);
-	ptrack_add_block_redo(rnode, blkno);
-	XLogRecGetBlockTag(record, 1, &rnode, NULL, &targetBlk);
-	ptrack_add_block_redo(rnode, targetBlk);
-
+	XLogRecGetBlockTag(record, 1, NULL, NULL, &targetBlk);
 	Assert(xlrec->targetBlk == targetBlk);
 
 	/* Update the metapage */
 	action = XLogReadBufferForRedo(record, 0, &metabuf);
-
 	if (action == BLK_NEEDS_REDO)
 	{
 		Page		metapg;

src/backend/access/gin/ginbtree.c

@@ -16,7 +16,6 @@
 
 #include "access/gin_private.h"
 #include "access/xloginsert.h"
-#include "access/ptrack.h"
 #include "miscadmin.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
@@ -386,9 +385,6 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
 	else if (rc == GPTP_INSERT)
 	{
 		/* It will fit, perform the insertion */
-		ptrack_add_block(btree->index, BufferGetBlockNumber(stack->buffer));
-		if (BufferIsValid(childbuf))
-			ptrack_add_block(btree->index, BufferGetBlockNumber(childbuf));
 		START_CRIT_SECTION();
 
 		if (RelationNeedsWAL(btree->index) && !btree->isBuild)
@@ -538,12 +534,6 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
 		 * the new contents of the root.
 		 */
 
-		ptrack_add_block(btree->index, BufferGetBlockNumber(rbuffer));
-		ptrack_add_block(btree->index, BufferGetBlockNumber(stack->buffer));
-		if (stack->parent == NULL)
-			ptrack_add_block(btree->index, BufferGetBlockNumber(lbuffer));
-		if (BufferIsValid(childbuf))
-			ptrack_add_block(btree->index, BufferGetBlockNumber(childbuf));
 		START_CRIT_SECTION();
 
 		MarkBufferDirty(rbuffer);

src/backend/access/gin/gindatapage.c

@@ -16,7 +16,6 @@
 
 #include "access/gin_private.h"
 #include "access/xloginsert.h"
-#include "access/ptrack.h"
 #include "lib/ilist.h"
 #include "miscadmin.h"
 #include "utils/rel.h"
@@ -836,7 +835,6 @@ ginVacuumPostingTreeLeaf(Relation indexrel, Buffer buffer, GinVacuumState *gvs)
 			computeLeafRecompressWALData(leaf);
 
 		/* Apply changes to page */
-		ptrack_add_block(indexrel, BufferGetBlockNumber(buffer));
 		START_CRIT_SECTION();
 
 		dataPlaceToPageLeafRecompress(buffer, leaf);
@@ -1813,7 +1811,6 @@ createPostingTree(Relation index, ItemPointerData *items, uint32 nitems,
 	page = BufferGetPage(buffer);
 	blkno = BufferGetBlockNumber(buffer);
 
-	ptrack_add_block(index, BufferGetBlockNumber(buffer));
 	START_CRIT_SECTION();
 
 	PageRestoreTempPage(tmppage, page);

src/backend/access/gin/ginfast.c

@@ -20,7 +20,6 @@
 
 #include "access/gin_private.h"
 #include "access/xloginsert.h"
-#include "access/ptrack.h"
 #include "access/xlog.h"
 #include "commands/vacuum.h"
 #include "catalog/pg_am.h"
@@ -68,7 +67,6 @@ writeListPage(Relation index, Buffer buffer,
 	/* workspace could be a local array; we use palloc for alignment */
 	workspace = palloc(BLCKSZ);
 
-	ptrack_add_block(index, BufferGetBlockNumber(buffer));
 	START_CRIT_SECTION();
 
 	GinInitBuffer(buffer, GIN_LIST);
@@ -295,7 +293,6 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
 			/*
 			 * Main list is empty, so just insert sublist as main list
 			 */
-			ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
 			START_CRIT_SECTION();
 
 			metadata->head = sublist.head;
@@ -319,8 +316,6 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
 
 			Assert(GinPageGetOpaque(page)->rightlink == InvalidBlockNumber);
 
-			ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
-			ptrack_add_block(index, BufferGetBlockNumber(buffer));
 			START_CRIT_SECTION();
 
 			GinPageGetOpaque(page)->rightlink = sublist.head;
@@ -363,8 +358,6 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
 		if (needWal)
 			XLogBeginInsert();
 
-		ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
-		ptrack_add_block(index, BufferGetBlockNumber(buffer));
 		START_CRIT_SECTION();
 
 		/*
@@ -560,7 +553,6 @@ shiftList(Relation index, Buffer metabuffer, BlockNumber newHead,
 		if (RelationNeedsWAL(index))
 			XLogEnsureRecordSpace(data.ndeleted, 0);
 
-		ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
 		START_CRIT_SECTION();
 
 		metadata->head = blknoToDelete;

src/backend/access/gin/gininsert.c

@@ -17,7 +17,6 @@
 #include "access/gin_private.h"
 #include "access/xloginsert.h"
 #include "access/generic_xlog.h"
-#include "access/ptrack.h"
 #include "catalog/index.h"
 #include "miscadmin.h"
 #include "storage/bufmgr.h"
@@ -338,8 +337,6 @@ ginbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 	/* initialize the root page */
 	RootBuffer = GinNewBuffer(index);
 
-	ptrack_add_block(index, BufferGetBlockNumber(MetaBuffer));
-	ptrack_add_block(index, BufferGetBlockNumber(RootBuffer));
 	START_CRIT_SECTION();
 	GinInitMetabuffer(MetaBuffer);
 	MarkBufferDirty(MetaBuffer);
@@ -433,8 +430,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/gin/ginutil.c

@@ -17,7 +17,6 @@
 #include "access/gin_private.h"
 #include "access/reloptions.h"
 #include "access/xloginsert.h"
-#include "access/ptrack.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
@@ -640,7 +639,6 @@ ginUpdateStats(Relation index, const GinStatsData *stats, bool is_build)
 	metapage = BufferGetPage(metabuffer);
 	metadata = GinPageGetMeta(metapage);
 
-	ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
 	START_CRIT_SECTION();
 
 	metadata->nTotalPages = stats->nTotalPages;

src/backend/access/gin/ginvacuum.c

@@ -16,7 +16,6 @@
 
 #include "access/gin_private.h"
 #include "access/xloginsert.h"
-#include "access/ptrack.h"
 #include "commands/vacuum.h"
 #include "miscadmin.h"
 #include "postmaster/autovacuum.h"
@@ -210,9 +209,6 @@ ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkn
 								 * LockBufferForCleanup() */
 		LockBuffer(pBuffer, GIN_EXCLUSIVE);
 
-	ptrack_add_block(gvs->index, BufferGetBlockNumber(pBuffer));
-	ptrack_add_block(gvs->index, BufferGetBlockNumber(lBuffer));
-	ptrack_add_block(gvs->index, BufferGetBlockNumber(dBuffer));
 	START_CRIT_SECTION();
 
 	/* Unlink the page by changing left sibling's rightlink */
@@ -607,7 +603,6 @@ ginbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 
 		if (resPage)
 		{
-			ptrack_add_block(gvs.index, BufferGetBlockNumber(buffer));
 			START_CRIT_SECTION();
 			PageRestoreTempPage(resPage, page);
 			MarkBufferDirty(buffer);