[PGPRO-6817] ptrack has been ported to version 15.

Daniel Shelepanov · funny-falcon · commit 5714dd1dc346 · 2022-07-20T16:05:34.000+03:00
Has been tested on 15beta2 and 16devel

tags: ptrack
diff --git a/patches/master-ptrack-core.diff b/patches/master-ptrack-core.diff
@@ -1,14 +1,8 @@
-commit a14ac459d71528c64df00c693e9c71ac70d3ba29
-Author: anastasia <a.lubennikova@postgrespro.ru>
-Date:   Mon Oct 19 14:53:06 2020 +0300
-
-    add ptrack 2.0
-
 diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
-index 50ae1f16d0..721b926ad2 100644
+index 5244823ff85..160889b4a04 100644
 --- a/src/backend/replication/basebackup.c
 +++ b/src/backend/replication/basebackup.c
-@@ -233,6 +233,13 @@ static const struct exclude_list_item excludeFiles[] =
+@@ -197,6 +197,13 @@ static const struct exclude_list_item excludeFiles[] =
  	{"postmaster.pid", false},
  	{"postmaster.opts", false},
  
@@ -22,7 +16,7 @@ index 50ae1f16d0..721b926ad2 100644
  	/* end of list */
  	{NULL, false}
  };
-@@ -248,6 +255,11 @@ static const struct exclude_list_item noChecksumFiles[] = {
+@@ -212,6 +219,11 @@ static const struct exclude_list_item noChecksumFiles[] = {
  	{"pg_filenode.map", false},
  	{"pg_internal.init", true},
  	{"PG_VERSION", false},
@@ -35,7 +29,7 @@ index 50ae1f16d0..721b926ad2 100644
  	{"config_exec_params", true},
  #endif
 diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c
-index 0cf598dd0c..c9c44a4ae7 100644
+index 658fd95ba95..eee38eba176 100644
 --- a/src/backend/storage/file/copydir.c
 +++ b/src/backend/storage/file/copydir.c
 @@ -27,6 +27,8 @@
@@ -58,7 +52,7 @@ index 0cf598dd0c..c9c44a4ae7 100644
  	 * Be paranoid here and fsync all files to ensure the copy is really done.
  	 * But if fsync is disabled, we're done.
 diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
-index 0eacd461cd..c2ef404a1a 100644
+index 43edaf5d873..bbaf7500944 100644
 --- a/src/backend/storage/smgr/md.c
 +++ b/src/backend/storage/smgr/md.c
 @@ -87,6 +87,8 @@ typedef struct _MdfdVec
@@ -70,7 +64,7 @@ index 0eacd461cd..c2ef404a1a 100644
  
  /* Populate a file tag describing an md.c segment file. */
  #define INIT_MD_FILETAG(a,xx_rnode,xx_forknum,xx_segno) \
-@@ -435,6 +437,9 @@ mdextend(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
+@@ -467,6 +469,9 @@ mdextend(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
  		register_dirty_segment(reln, forknum, v);
  
  	Assert(_mdnblocks(reln, forknum, v) <= ((BlockNumber) RELSEG_SIZE));
@@ -80,7 +74,7 @@ index 0eacd461cd..c2ef404a1a 100644
  }
  
  /*
-@@ -721,6 +726,9 @@ mdwrite(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
+@@ -756,6 +761,9 @@ mdwrite(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
  
  	if (!skipFsync && !SmgrIsTemp(reln))
  		register_dirty_segment(reln, forknum, v);
@@ -91,10 +85,10 @@ index 0eacd461cd..c2ef404a1a 100644
  
  /*
 diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
-index 3ded2cdd71..3a596a59f7 100644
+index e1fb6310038..76d75680b31 100644
 --- a/src/backend/storage/sync/sync.c
 +++ b/src/backend/storage/sync/sync.c
-@@ -75,6 +75,8 @@ static MemoryContext pendingOpsCxt; /* context for the above  */
+@@ -81,6 +81,8 @@ static MemoryContext pendingOpsCxt; /* context for the above  */
  static CycleCtr sync_cycle_ctr = 0;
  static CycleCtr checkpoint_cycle_ctr = 0;
  
@@ -103,7 +97,7 @@ index 3ded2cdd71..3a596a59f7 100644
  /* Intervals for calling AbsorbSyncRequests */
  #define FSYNCS_PER_ABSORB		10
  #define UNLINKS_PER_ABSORB		10
-@@ -420,6 +422,9 @@ ProcessSyncRequests(void)
+@@ -477,6 +479,9 @@ ProcessSyncRequests(void)
  	CheckpointStats.ckpt_longest_sync = longest;
  	CheckpointStats.ckpt_agg_sync_time = total_elapsed;
  
@@ -113,23 +107,11 @@ index 3ded2cdd71..3a596a59f7 100644
  	/* Flag successful completion of ProcessSyncRequests */
  	sync_in_progress = false;
  }
-diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
-index 1683629ee3..d2fc154576 100644
---- a/src/backend/utils/misc/guc.c
-+++ b/src/backend/utils/misc/guc.c
-@@ -620,7 +620,6 @@ static char *recovery_target_xid_string;
- static char *recovery_target_name_string;
- static char *recovery_target_lsn_string;
- 
--
- /* should be static, but commands/variable.c needs to get at this */
- char	   *role_string;
- 
 diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
-index ffdc23945c..7ae95866ce 100644
+index 21dfe1b6ee5..266ac1ef40a 100644
 --- a/src/bin/pg_checksums/pg_checksums.c
 +++ b/src/bin/pg_checksums/pg_checksums.c
-@@ -114,6 +114,11 @@ static const struct exclude_list_item skip[] = {
+@@ -118,6 +118,11 @@ static const struct exclude_list_item skip[] = {
  	{"pg_filenode.map", false},
  	{"pg_internal.init", true},
  	{"PG_VERSION", false},
@@ -142,27 +124,27 @@ index ffdc23945c..7ae95866ce 100644
  	{"config_exec_params", true},
  #endif
 diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
-index 233441837f..cf7bd073bf 100644
+index d4772a29650..3318f64359d 100644
 --- a/src/bin/pg_resetwal/pg_resetwal.c
 +++ b/src/bin/pg_resetwal/pg_resetwal.c
-@@ -84,6 +84,7 @@ static void RewriteControlFile(void);
+@@ -85,6 +85,7 @@ static void RewriteControlFile(void);
  static void FindEndOfXLOG(void);
  static void KillExistingXLOG(void);
  static void KillExistingArchiveStatus(void);
 +static void KillExistingPtrack(void);
  static void WriteEmptyXLOG(void);
  static void usage(void);
  
-@@ -513,6 +514,7 @@ main(int argc, char *argv[])
+@@ -488,6 +489,7 @@ main(int argc, char *argv[])
  	RewriteControlFile();
  	KillExistingXLOG();
  	KillExistingArchiveStatus();
 +	KillExistingPtrack();
  	WriteEmptyXLOG();
  
  	printf(_("Write-ahead log reset\n"));
-@@ -1102,6 +1104,53 @@ KillExistingArchiveStatus(void)
- 	}
+@@ -1036,6 +1038,41 @@ KillExistingArchiveStatus(void)
+ 		pg_fatal("could not close directory \"%s\": %m", ARCHSTATDIR);
  }
  
 +/*
@@ -173,16 +155,13 @@ index 233441837f..cf7bd073bf 100644
 +{
 +#define PTRACKDIR "global"
 +
-+	DIR			   *xldir;
++	DIR            *xldir;
 +	struct dirent  *xlde;
-+	char			path[MAXPGPATH + sizeof(PTRACKDIR)];
++	char            path[MAXPGPATH + sizeof(PTRACKDIR)];
 +
 +	xldir = opendir(PTRACKDIR);
 +	if (xldir == NULL)
-+	{
-+		pg_log_error("could not open directory \"%s\": %m", PTRACKDIR);
-+		exit(1);
-+	}
++		pg_fatal("could not open directory \"%s\": %m", PTRACKDIR);
 +
 +	while (errno = 0, (xlde = readdir(xldir)) != NULL)
 +	{
@@ -192,34 +171,25 @@ index 233441837f..cf7bd073bf 100644
 +		{
 +			snprintf(path, sizeof(path), "%s/%s", PTRACKDIR, xlde->d_name);
 +			if (unlink(path) < 0)
-+			{
-+				pg_log_error("could not delete file \"%s\": %m", path);
-+				exit(1);
-+			}
++				pg_fatal("could not delete file \"%s\": %m", path);
 +		}
 +	}
 +
 +	if (errno)
-+	{
-+		pg_log_error("could not read directory \"%s\": %m", PTRACKDIR);
-+		exit(1);
-+	}
++		pg_fatal("could not read directory \"%s\": %m", PTRACKDIR);
 +
 +	if (closedir(xldir))
-+	{
-+		pg_log_error("could not close directory \"%s\": %m", PTRACKDIR);
-+		exit(1);
-+	}
++		pg_fatal("could not close directory \"%s\": %m", PTRACKDIR);
 +}
 +
  
  /*
   * Write an empty XLOG file, containing only the checkpoint record
 diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c
-index fbb97b5cf1..6cd7f2ae3e 100644
+index 62529310415..b496f54fb06 100644
 --- a/src/bin/pg_rewind/filemap.c
 +++ b/src/bin/pg_rewind/filemap.c
-@@ -124,6 +124,10 @@ static const struct exclude_list_item excludeFiles[] =
+@@ -157,6 +157,10 @@ static const struct exclude_list_item excludeFiles[] =
  	{"postmaster.pid", false},
  	{"postmaster.opts", false},
  
@@ -230,39 +200,21 @@ index fbb97b5cf1..6cd7f2ae3e 100644
  	/* end of list */
  	{NULL, false}
  };
-diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
-index 72e3352398..5c2e016501 100644
---- a/src/include/miscadmin.h
-+++ b/src/include/miscadmin.h
-@@ -388,7 +388,7 @@ typedef enum ProcessingMode
- 	NormalProcessing			/* normal processing */
- } ProcessingMode;
- 
--extern ProcessingMode Mode;
-+extern PGDLLIMPORT ProcessingMode Mode;
- 
- #define IsBootstrapProcessingMode() (Mode == BootstrapProcessing)
- #define IsInitProcessingMode()		(Mode == InitProcessing)
 diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
-index 3c6f906683..a7355f7ad1 100644
+index d7668651ba8..33994a27f5f 100644
 --- a/src/include/port/pg_crc32c.h
 +++ b/src/include/port/pg_crc32c.h
-@@ -69,8 +69,11 @@ extern pg_crc32c pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t le
+@@ -69,7 +69,7 @@ extern pg_crc32c pg_comp_crc32c_armv8(pg_crc32c crc, const void *data, size_t le
  #define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF)
  
  extern pg_crc32c pg_comp_crc32c_sb8(pg_crc32c crc, const void *data, size_t len);
 -extern pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
--
-+extern
-+#ifndef FRONTEND
-+PGDLLIMPORT
-+#endif
-+pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
++extern PGDLLIMPORT pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len);
+ 
  #ifdef USE_SSE42_CRC32C_WITH_RUNTIME_CHECK
  extern pg_crc32c pg_comp_crc32c_sse42(pg_crc32c crc, const void *data, size_t len);
- #endif
 diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
-index 5d28f59c1d..0d3f04d8af 100644
+index 50a26edeb06..af1602f5154 100644
 --- a/src/include/storage/copydir.h
 +++ b/src/include/storage/copydir.h
 @@ -13,6 +13,9 @@
@@ -276,7 +228,7 @@ index 5d28f59c1d..0d3f04d8af 100644
  extern void copy_file(char *fromfile, char *tofile);
  
 diff --git a/src/include/storage/md.h b/src/include/storage/md.h
-index 07fd1bb7d0..5294811bc8 100644
+index ffffa40db71..3ff98e0bf01 100644
 --- a/src/include/storage/md.h
 +++ b/src/include/storage/md.h
 @@ -19,6 +19,13 @@
@@ -287,17 +239,17 @@ index 07fd1bb7d0..5294811bc8 100644
 +									ForkNumber forknum, BlockNumber blocknum);
 +extern PGDLLIMPORT mdextend_hook_type mdextend_hook;
 +typedef void (*mdwrite_hook_type) (RelFileNodeBackend smgr_rnode,
-+								   ForkNumber forknum, BlockNumber blocknum);
++									ForkNumber forknum, BlockNumber blocknum);
 +extern PGDLLIMPORT mdwrite_hook_type mdwrite_hook;
 +
  /* md storage manager functionality */
  extern void mdinit(void);
  extern void mdopen(SMgrRelation reln);
 diff --git a/src/include/storage/sync.h b/src/include/storage/sync.h
-index e16ab8e711..88da9686eb 100644
+index 9737e1eb67c..914ad86328f 100644
 --- a/src/include/storage/sync.h
 +++ b/src/include/storage/sync.h
-@@ -50,6 +50,9 @@ typedef struct FileTag
+@@ -55,6 +55,9 @@ typedef struct FileTag
  	uint32		segno;
  } FileTag;
  
diff --git a/ptrack.c b/ptrack.c
@@ -81,6 +81,10 @@ static void ptrack_ProcessSyncRequests_hook(void);
 
 static void ptrack_gather_filelist(List **filelist, char *path, Oid spcOid, Oid dbOid);
 static int	ptrack_filelist_getnext(PtScanCtx * ctx);
+#if PG_VERSION_NUM >= 150000
+static shmem_request_hook_type prev_shmem_request_hook = NULL;
+static void ptrack_shmem_request(void);
+#endif
 
 /*
  * Module load callback
@@ -119,7 +123,14 @@ _PG_init(void)
 
 	/* Request server shared memory */
 	if (ptrack_map_size != 0)
+	{
+#if PG_VERSION_NUM >= 150000
+		prev_shmem_request_hook = shmem_request_hook;
+		shmem_request_hook = ptrack_shmem_request;
+#else
 		RequestAddinShmemSpace(PtrackActualSize);
+#endif
+	}
 	else
 		ptrackCleanFiles();
 
@@ -136,6 +147,17 @@ _PG_init(void)
 	ProcessSyncRequests_hook = ptrack_ProcessSyncRequests_hook;
 }
 
+#if PG_VERSION_NUM >= 150000
+static void
+ptrack_shmem_request(void)
+{
+	if (prev_shmem_request_hook)
+		prev_shmem_request_hook();
+
+	RequestAddinShmemSpace(PtrackActualSize);
+}
+#endif
+
 /*
  * Module unload callback
  */
