remove unused code, update ptrack.

Author: alubennikova

src/backend/access/heap/ptrack.c

@@ -6763,7 +6763,6 @@ StartupXLOG(void)
 			do
 			{
 				bool		switchedTLI = false;
-				int nblock;
 
 #ifdef WAL_DEBUG
 				if (XLOG_DEBUG ||
@@ -6917,17 +6916,6 @@ StartupXLOG(void)
 				/* Pop the error context stack */
 				error_context_stack = errcallback.previous;
 
-				if (ptrack_enable)
-					for(nblock = 0; nblock < xlogreader->max_block_id; nblock++)
-					{
-						if(xlogreader->blocks[nblock].forknum == MAIN_FORKNUM)
-						{
-							ptrack_add_block(xlogreader->blocks[nblock].blkno,
-											xlogreader->blocks[nblock].rnode);
-							ptrack_save();
-						}
-					}
-
 				/*
 				 * Update lastReplayedEndRecPtr after this record has been
 				 * successfully replayed.

src/backend/access/transam/xlog.c

@@ -168,6 +168,7 @@ pg_stop_backup(PG_FUNCTION_ARGS)
 	PG_RETURN_LSN(stoppoint);
 }
 
+
 /*
  * pg_stop_backup_v2: finish taking exclusive or nonexclusive on-line backup.
  *
@@ -275,30 +276,6 @@ pg_stop_backup_v2(PG_FUNCTION_ARGS)
 	return (Datum) 0;
 }
 
-Datum
-pg_ptrack_clear(PG_FUNCTION_ARGS)
-{
-	if (!superuser() && !has_rolreplication(GetUserId()))
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-		 (errmsg("must be superuser or replication role to clear ptrack files"))));
-
-	ptrack_clear();
-
-	PG_RETURN_VOID();
-}
-
-Datum
-pg_ptrack_get_and_clear(PG_FUNCTION_ARGS)
-{
-	if (!superuser() && !has_rolreplication(GetUserId()))
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-		 (errmsg("must be superuser or replication role to clear ptrack files"))));
-
-	PG_RETURN_BYTEA_P(ptrack_get_and_clear(PG_GETARG_OID(0), PG_GETARG_OID(1)));
-}
-
 /*
  * pg_switch_xlog: switch to next xlog file
  *

src/backend/access/transam/xlogfuncs.c

@@ -23,7 +23,6 @@
 #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"
@@ -257,10 +256,6 @@ XLogRegisterBuffer(uint8 block_id, Buffer buffer, uint8 flags)
 #endif
 
 	regbuf->in_use = true;
-	if (ptrack_enable && regbuf->forkno == MAIN_FORKNUM)
-	{
-		ptrack_add_block(regbuf->block, regbuf->rnode);
-	}
 }
 
 /*

src/backend/access/transam/xloginsert.c

@@ -783,18 +783,6 @@ ReadBufferWithoutRelcache(RelFileNode rnode, ForkNumber forkNum,
 							 mode, strategy, &hit);
 }
 
-Buffer
-ReadBufferWithoutRelcache2(SMgrRelation smgr, ForkNumber forkNum,
-						  BlockNumber blockNum, ReadBufferMode mode,
-						  BufferAccessStrategy strategy)
-{
-	bool		hit;
-
-	return ReadBuffer_common(smgr, RELPERSISTENCE_PERMANENT, RELKIND_UNKNOWN, forkNum, blockNum,
-							 mode, strategy, &hit);
-}
-
-
 /*
  * ReadBuffer_common -- common logic for all ReadBuffer variants
  *

src/backend/storage/buffer/bufmgr.c

@@ -390,30 +390,6 @@ UnlockRelationForExtension(Relation relation, LOCKMODE lockmode)
 	LockRelease(&tag, lockmode, false);
 }
 
-void
-LockSmgrForExtension(SMgrRelation smgr, LOCKMODE lockmode)
-{
-	LOCKTAG		tag;
-
-	SET_LOCKTAG_SMGR(tag, smgr->smgr_rnode.node.relNode);
-
-	(void) LockAcquire(&tag, lockmode, false, false);
-}
-
-/*
- *		UnlockRelationForExtension
- */
-void
-UnlockSmgrForExtension(SMgrRelation smgr, LOCKMODE lockmode)
-{
-	LOCKTAG		tag;
-
-	SET_LOCKTAG_SMGR(tag ,smgr->smgr_rnode.node.relNode);
-
-	LockRelease(&tag, lockmode, false);
-}
-
-
 /*
  *		LockPage
  *
@@ -1064,11 +1040,6 @@ DescribeLockTag(StringInfo buf, const LOCKTAG *tag)
 							 tag->locktag_field3,
 							 tag->locktag_field4);
 			break;
-		case LOCKTAG_SMGR:
-			appendStringInfo(buf,
-							 _("smgr lock %u"),
-							 tag->locktag_field1);
-			break;
 		default:
 			appendStringInfo(buf,
 							 _("unrecognized locktag type %d"),

src/backend/storage/lmgr/lmgr.c

@@ -7,13 +7,15 @@
 #include "storage/relfilenode.h"
 #include "utils/relcache.h"
 
-extern PGDLLIMPORT unsigned int blocks_track_count;
+/* Number of bits allocated for each heap block. */
+#define PTRACK_BITS_PER_HEAPBLOCK 1
 
 extern PGDLLIMPORT bool ptrack_enable;
 
-extern void ptrack_save(void);
-
-extern void ptrack_add_block(BlockNumber block_number, RelFileNode rel);
+extern void ptrack_add_block(Relation rel, BlockNumber heapBlk);
+extern void ptrack_add_block_redo(RelFileNode rnode, BlockNumber heapBlk);
+extern void ptrack_pin(Relation rel, BlockNumber heapBlk, Buffer *buf);
+extern void ptrack_set(BlockNumber heapBlk, Buffer ptrackBuf);
 
 extern void ptrack_clear(void);
 extern bytea *ptrack_get_and_clear(Oid tablespace_oid, Oid table_oid);

src/include/access/ptrack.h

@@ -16,8 +16,6 @@
 extern Datum pg_start_backup(PG_FUNCTION_ARGS);
 extern Datum pg_stop_backup(PG_FUNCTION_ARGS);
 extern Datum pg_stop_backup_v2(PG_FUNCTION_ARGS);
-extern Datum pg_ptrack_clear(PG_FUNCTION_ARGS);
-extern Datum pg_ptrack_get_and_clear(PG_FUNCTION_ARGS);
 extern Datum pg_switch_xlog(PG_FUNCTION_ARGS);
 extern Datum pg_create_restore_point(PG_FUNCTION_ARGS);
 extern Datum pg_current_xlog_location(PG_FUNCTION_ARGS);
@@ -35,6 +33,5 @@ extern Datum pg_is_xlog_replay_paused(PG_FUNCTION_ARGS);
 extern Datum pg_xlog_location_diff(PG_FUNCTION_ARGS);
 extern Datum pg_is_in_backup(PG_FUNCTION_ARGS);
 extern Datum pg_backup_start_time(PG_FUNCTION_ARGS);
-extern Datum pg_ptrack_test(PG_FUNCTION_ARGS);
 
 #endif   /* XLOG_FN_H */

src/include/access/xlog_fn.h

@@ -39,7 +39,7 @@ typedef enum ForkNumber
 
 #define MAX_FORKNUM		PAGESTRACK_FORKNUM
 
-#define FORKNAMECHARS	6		/* max chars for a fork name */
+#define FORKNAMECHARS	5		/* max chars for a fork name */
 
 extern const char *const forkNames[];
 

src/include/common/relpath.h

@@ -24,7 +24,6 @@
 #define MISCADMIN_H
 
 #include "pgtime.h"				/* for pg_time_t */
-#include "access/ptrack.h"
 
 
 #define PG_BACKEND_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
@@ -131,14 +130,6 @@ do { \
 #define START_CRIT_SECTION()  (CritSectionCount++)
 
 #define END_CRIT_SECTION() \
-do { \
-	Assert(CritSectionCount > 0); \
-	CritSectionCount--; \
-	if (!CritSectionCount  && ptrack_enable && blocks_track_count > 0) \
-		ptrack_save(); \
-} while(0)
-
-#define END_CRIT_SECTION_WITHOUT_TRACK() \
 do { \
 	Assert(CritSectionCount > 0); \
 	CritSectionCount--; \

src/include/miscadmin.h

@@ -18,7 +18,6 @@
 #include "storage/buf.h"
 #include "storage/bufpage.h"
 #include "storage/relfilenode.h"
-#include "storage/smgr.h"
 #include "utils/relcache.h"
 #include "utils/snapmgr.h"
 #include "utils/tqual.h"
@@ -173,10 +172,6 @@ extern Buffer ReadBufferExtended(Relation reln, ForkNumber forkNum,
 extern Buffer ReadBufferWithoutRelcache(RelFileNode rnode,
 						  ForkNumber forkNum, BlockNumber blockNum,
 						  ReadBufferMode mode, BufferAccessStrategy strategy);
-extern Buffer ReadBufferWithoutRelcache2(SMgrRelation smgr,
-						  ForkNumber forkNum, BlockNumber blockNum,
-						  ReadBufferMode mode, BufferAccessStrategy strategy);
-
 extern void ReleaseBuffer(Buffer buffer);
 extern void UnlockReleaseBuffer(Buffer buffer);
 extern void MarkBufferDirty(Buffer buffer);

src/include/storage/bufmgr.h

@@ -17,7 +17,6 @@
 #include "lib/stringinfo.h"
 #include "storage/itemptr.h"
 #include "storage/lock.h"
-#include "storage/smgr.h"
 #include "utils/rel.h"
 
 
@@ -58,9 +57,6 @@ extern bool ConditionalLockRelationForExtension(Relation relation,
 									LOCKMODE lockmode);
 extern int	RelationExtensionLockWaiterCount(Relation relation);
 
-extern void LockSmgrForExtension(SMgrRelation smgr, LOCKMODE lockmode);
-extern void UnlockSmgrForExtension(SMgrRelation smgr, LOCKMODE lockmode);
-
 /* Lock a page (currently only used within indexes) */
 extern void LockPage(Relation relation, BlockNumber blkno, LOCKMODE lockmode);
 extern bool ConditionalLockPage(Relation relation, BlockNumber blkno, LOCKMODE lockmode);

src/include/storage/lmgr.h

@@ -161,8 +161,7 @@ typedef enum LockTagType
 	 * Also, we use DB OID = 0 for shared objects such as tablespaces.
 	 */
 	LOCKTAG_USERLOCK,			/* reserved for old contrib/userlock code */
-	LOCKTAG_ADVISORY,			/* advisory user locks */
-	LOCKTAG_SMGR /**/
+	LOCKTAG_ADVISORY			/* advisory user locks */
 } LockTagType;
 
 #define LOCKTAG_LAST_TYPE	LOCKTAG_ADVISORY
@@ -208,14 +207,6 @@ typedef struct LOCKTAG
 	 (locktag).locktag_type = LOCKTAG_RELATION_EXTEND, \
 	 (locktag).locktag_lockmethodid = DEFAULT_LOCKMETHOD)
 
-#define SET_LOCKTAG_SMGR(locktag,relfilenode) \
-	((locktag).locktag_field1 = (relfilenode), \
-	 (locktag).locktag_field2 = 0, \
-	 (locktag).locktag_field3 = 0, \
-	 (locktag).locktag_field4 = 0, \
-	 (locktag).locktag_type = LOCKTAG_SMGR, \
-	 (locktag).locktag_lockmethodid = DEFAULT_LOCKMETHOD)
-
 #define SET_LOCKTAG_PAGE(locktag,dboid,reloid,blocknum) \
 	((locktag).locktag_field1 = (dboid), \
 	 (locktag).locktag_field2 = (reloid), \

src/include/storage/lock.h

@@ -46,16 +46,16 @@ typedef struct SMgrRelationData
 	struct SMgrRelationData **smgr_owner;
 
 	/*
-	 * These next three fields are not actually used or manipulated by smgr,
+	 * These next four fields are not actually used or manipulated by smgr,
 	 * except that they are reset to InvalidBlockNumber upon a cache flush
 	 * event (in particular, upon truncation of the relation).  Higher levels
 	 * store cached state here so that it will be reset when truncation
-	 * happens.  In all three cases, InvalidBlockNumber means "unknown".
+	 * happens.  In all four cases, InvalidBlockNumber means "unknown".
 	 */
 	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_ptrack_nblocks;	/* last known size of vm fork */
+	BlockNumber smgr_ptrack_nblocks;	/* last known size of ptrack fork */
 
 	/*
 	 * It's unnecessary to create a physical file for a local temp