[PGPRO-6817] update for rel 15 beta.

Tags: ptrack

Author: funny-falcon

Diff for: patches/REL_15_STABLE-ptrack-core.diff

@@ -0,0 +1,261 @@
+diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c
+index cc16c4b331f..69b1af16cf5 100644
+--- a/src/backend/backup/basebackup.c
++++ b/src/backend/backup/basebackup.c
+@@ -197,6 +197,13 @@ static const struct exclude_list_item excludeFiles[] =
+ 	{"postmaster.pid", false},
+ 	{"postmaster.opts", false},
+ 
++	/*
++	 * Skip all transient ptrack files, but do copy ptrack.map, since it may
++	 * be successfully used immediately after backup. TODO: check, test?
++	 */
++	{"ptrack.map.mmap", false},
++	{"ptrack.map.tmp", false},
++
+ 	/* end of list */
+ 	{NULL, false}
+ };
+@@ -212,6 +219,11 @@ static const struct exclude_list_item noChecksumFiles[] = {
+ 	{"pg_filenode.map", false},
+ 	{"pg_internal.init", true},
+ 	{"PG_VERSION", false},
++
++	{"ptrack.map.mmap", false},
++	{"ptrack.map", false},
++	{"ptrack.map.tmp", false},
++
+ #ifdef EXEC_BACKEND
+ 	{"config_exec_params", true},
+ #endif
+diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c
+index 658fd95ba95..eee38eba176 100644
+--- a/src/backend/storage/file/copydir.c
++++ b/src/backend/storage/file/copydir.c
+@@ -27,6 +27,8 @@
+ #include "storage/copydir.h"
+ #include "storage/fd.h"
+ 
++copydir_hook_type copydir_hook = NULL;
++
+ /*
+  * copydir: copy a directory
+  *
+@@ -78,6 +80,9 @@ copydir(char *fromdir, char *todir, bool recurse)
+ 	}
+ 	FreeDir(xldir);
+ 
++	if (copydir_hook)
++		copydir_hook(todir);
++
+ 	/*
+ 	 * 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 a0fc60b32a3..7f091951c0d 100644
+--- a/src/backend/storage/smgr/md.c
++++ b/src/backend/storage/smgr/md.c
+@@ -87,6 +87,8 @@ typedef struct _MdfdVec
+ 
+ static MemoryContext MdCxt;		/* context for all MdfdVec objects */
+ 
++mdextend_hook_type mdextend_hook = NULL;
++mdwrite_hook_type mdwrite_hook = NULL;
+ 
+ /* Populate a file tag describing an md.c segment file. */
+ #define INIT_MD_FILETAG(a,xx_rnode,xx_forknum,xx_segno) \
+@@ -484,6 +486,9 @@ mdextend(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
+ 		register_dirty_segment(reln, forknum, v);
+ 
+ 	Assert(_mdnblocks(reln, forknum, v) <= ((BlockNumber) RELSEG_SIZE));
++
++	if (mdextend_hook)
++		mdextend_hook(reln->smgr_rnode, forknum, blocknum);
+ }
+ 
+ /*
+@@ -773,6 +778,9 @@ mdwrite(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
+ 
+ 	if (!skipFsync && !SmgrIsTemp(reln))
+ 		register_dirty_segment(reln, forknum, v);
++
++	if (mdwrite_hook)
++		mdwrite_hook(reln->smgr_rnode, forknum, blocknum);
+ }
+ 
+ /*
+diff --git a/src/backend/storage/sync/sync.c b/src/backend/storage/sync/sync.c
+index e1fb6310038..76d75680b31 100644
+--- a/src/backend/storage/sync/sync.c
++++ b/src/backend/storage/sync/sync.c
+@@ -81,6 +81,8 @@ static MemoryContext pendingOpsCxt; /* context for the above  */
+ static CycleCtr sync_cycle_ctr = 0;
+ static CycleCtr checkpoint_cycle_ctr = 0;
+ 
++ProcessSyncRequests_hook_type ProcessSyncRequests_hook = NULL;
++
+ /* Intervals for calling AbsorbSyncRequests */
+ #define FSYNCS_PER_ABSORB		10
+ #define UNLINKS_PER_ABSORB		10
+@@ -477,6 +479,9 @@ ProcessSyncRequests(void)
+ 	CheckpointStats.ckpt_longest_sync = longest;
+ 	CheckpointStats.ckpt_agg_sync_time = total_elapsed;
+ 
++	if (ProcessSyncRequests_hook)
++		ProcessSyncRequests_hook();
++
+ 	/* Flag successful completion of ProcessSyncRequests */
+ 	sync_in_progress = false;
+ }
+diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
+index 21dfe1b6ee5..266ac1ef40a 100644
+--- a/src/bin/pg_checksums/pg_checksums.c
++++ b/src/bin/pg_checksums/pg_checksums.c
+@@ -118,6 +118,11 @@ static const struct exclude_list_item skip[] = {
+ 	{"pg_filenode.map", false},
+ 	{"pg_internal.init", true},
+ 	{"PG_VERSION", false},
++
++	{"ptrack.map.mmap", false},
++	{"ptrack.map", false},
++	{"ptrack.map.tmp", false},
++
+ #ifdef EXEC_BACKEND
+ 	{"config_exec_params", true},
+ #endif
+diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
+index d4772a29650..3318f64359d 100644
+--- a/src/bin/pg_resetwal/pg_resetwal.c
++++ b/src/bin/pg_resetwal/pg_resetwal.c
+@@ -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);
+ 
+@@ -488,6 +489,7 @@ main(int argc, char *argv[])
+ 	RewriteControlFile();
+ 	KillExistingXLOG();
+ 	KillExistingArchiveStatus();
++	KillExistingPtrack();
+ 	WriteEmptyXLOG();
+ 
+ 	printf(_("Write-ahead log reset\n"));
+@@ -1036,6 +1038,41 @@ KillExistingArchiveStatus(void)
+ 		pg_fatal("could not close directory \"%s\": %m", ARCHSTATDIR);
+ }
+ 
++/*
++ * Remove existing ptrack files
++ */
++static void
++KillExistingPtrack(void)
++{
++#define PTRACKDIR "global"
++
++	DIR            *xldir;
++	struct dirent  *xlde;
++	char            path[MAXPGPATH + sizeof(PTRACKDIR)];
++
++	xldir = opendir(PTRACKDIR);
++	if (xldir == NULL)
++		pg_fatal("could not open directory \"%s\": %m", PTRACKDIR);
++
++	while (errno = 0, (xlde = readdir(xldir)) != NULL)
++	{
++		if (strcmp(xlde->d_name, "ptrack.map.mmap") == 0 ||
++			strcmp(xlde->d_name, "ptrack.map") == 0 ||
++			strcmp(xlde->d_name, "ptrack.map.tmp") == 0)
++		{
++			snprintf(path, sizeof(path), "%s/%s", PTRACKDIR, xlde->d_name);
++			if (unlink(path) < 0)
++				pg_fatal("could not delete file \"%s\": %m", path);
++		}
++	}
++
++	if (errno)
++		pg_fatal("could not read directory \"%s\": %m", PTRACKDIR);
++
++	if (closedir(xldir))
++		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 62529310415..b496f54fb06 100644
+--- a/src/bin/pg_rewind/filemap.c
++++ b/src/bin/pg_rewind/filemap.c
+@@ -157,6 +157,10 @@ static const struct exclude_list_item excludeFiles[] =
+ 	{"postmaster.pid", false},
+ 	{"postmaster.opts", false},
+ 
++	{"ptrack.map.mmap", false},
++	{"ptrack.map", false},
++	{"ptrack.map.tmp", false},
++
+ 	/* end of list */
+ 	{NULL, false}
+ };
+diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
+index d7668651ba8..33994a27f5f 100644
+--- a/src/include/port/pg_crc32c.h
++++ b/src/include/port/pg_crc32c.h
+@@ -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 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);
+diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
+index 50a26edeb06..af1602f5154 100644
+--- a/src/include/storage/copydir.h
++++ b/src/include/storage/copydir.h
+@@ -13,6 +13,9 @@
+ #ifndef COPYDIR_H
+ #define COPYDIR_H
+ 
++typedef void (*copydir_hook_type) (const char *path);
++extern PGDLLIMPORT copydir_hook_type copydir_hook;
++
+ extern void copydir(char *fromdir, char *todir, bool recurse);
+ extern void copy_file(char *fromfile, char *tofile);
+ 
+diff --git a/src/include/storage/md.h b/src/include/storage/md.h
+index ffffa40db71..3ff98e0bf01 100644
+--- a/src/include/storage/md.h
++++ b/src/include/storage/md.h
+@@ -19,6 +19,13 @@
+ #include "storage/smgr.h"
+ #include "storage/sync.h"
+ 
++typedef void (*mdextend_hook_type) (RelFileNodeBackend smgr_rnode,
++									ForkNumber forknum, BlockNumber blocknum);
++extern PGDLLIMPORT mdextend_hook_type mdextend_hook;
++typedef void (*mdwrite_hook_type) (RelFileNodeBackend smgr_rnode,
++									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 9737e1eb67c..914ad86328f 100644
+--- a/src/include/storage/sync.h
++++ b/src/include/storage/sync.h
+@@ -55,6 +55,9 @@ typedef struct FileTag
+ 	uint32		segno;
+ } FileTag;
+ 
++typedef void (*ProcessSyncRequests_hook_type) (void);
++extern PGDLLIMPORT ProcessSyncRequests_hook_type ProcessSyncRequests_hook;
++
+ extern void InitSync(void);
+ extern void SyncPreCheckpoint(void);
+ extern void SyncPostCheckpoint(void);