merge: resolve merge conflicts from REL_17_10

Resolve seven merge conflicts introduced by upstream REL_17_10:

visibilitymap: keep macros in the header file per PolarDB convention and
add the new HEAPBLK_TO_MAPBLOCK_LIMIT macro there as well.

multixact: retain PolarDB's local cache macro alongside upstream's
expanded comment and new last_initialized_offsets_page variable.

slotsync: combine upstream's parameter_changed condition with PolarDB's
hot_standby_feedback check, preserving upstream's comment.

walsender: drop the unused fullyAppliedLastTime variable, keep PolarDB's
polar_bg_replay_lsn, and add upstream's prevWritePtr, prevFlushPtr, and
prevApplyPtr static variables.

pg_config.h.in: keep PolarDB's PFSD_VERSION and add upstream's
PG_CXX_PRINTF_ATTRIBUTE and PG_C_PRINTF_ATTRIBUTE definitions.

procsignal: add upstream's PROCSIG_SLOTSYNC_MESSAGE before PolarDB's
POLAR_PROCSIG_BACKEND_MEMORY_CONTEXT, both preceding NUM_PROCSIGNALS.

test/Makefile: keep PolarDB's comment and ordering, add postmaster to
the SUBDIRS list.

Also apply style fixes to upstream-introduced files: rewrap comments in
xslt_proc.c and applyparallelworker.c, and fix line wrapping in
004_negotiate.pl and 011_ib_truncation.pl.

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: mrdrivingduck

contrib/xml2/xslt_proc.c

@@ -180,8 +180,8 @@ xslt_process(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 
 	/*
-	 * If an empty string has been returned, resstr would be NULL. In
-	 * this case, assume that the result is an empty string.
+	 * If an empty string has been returned, resstr would be NULL. In this
+	 * case, assume that the result is an empty string.
 	 */
 	if (reslen == 0)
 		result = cstring_to_text("");

src/backend/access/heap/visibilitymap.c

@@ -104,29 +104,6 @@
 
 /*#define TRACE_VISIBILITYMAP */
 
-<<<<<<< HEAD
-=======
-/*
- * Size of the bitmap on each visibility map page, in bytes. There's no
- * extra headers, so the whole page minus the standard page header is
- * used for the bitmap.
- */
-#define MAPSIZE (BLCKSZ - MAXALIGN(SizeOfPageHeaderData))
-
-/* Number of heap blocks we can represent in one byte */
-#define HEAPBLOCKS_PER_BYTE (BITS_PER_BYTE / BITS_PER_HEAPBLOCK)
-
-/* Number of heap blocks we can represent in one visibility map page. */
-#define HEAPBLOCKS_PER_PAGE (MAPSIZE * HEAPBLOCKS_PER_BYTE)
-
-/* Mapping from heap block number to the right bit in the visibility map */
-#define HEAPBLK_TO_MAPBLOCK(x) ((x) / HEAPBLOCKS_PER_PAGE)
-#define HEAPBLK_TO_MAPBLOCK_LIMIT(x) \
-	(((x) + HEAPBLOCKS_PER_PAGE - 1) / HEAPBLOCKS_PER_PAGE)
-#define HEAPBLK_TO_MAPBYTE(x) (((x) % HEAPBLOCKS_PER_PAGE) / HEAPBLOCKS_PER_BYTE)
-#define HEAPBLK_TO_OFFSET(x) (((x) % HEAPBLOCKS_PER_BYTE) * BITS_PER_HEAPBLOCK)
-
->>>>>>> REL_17_10
 /* Masks for counting subsets of bits in the visibility map. */
 #define VISIBLE_MASK8	(0x55)	/* The lower bit of each bit pair */
 #define FROZEN_MASK8	(0xaa)	/* The upper bit of each bit pair */

src/backend/access/transam/multixact.c

@@ -416,13 +416,10 @@ static MemoryContext MXactContext = NULL;
 #define debug_elog6(a,b,c,d,e,f)
 #endif
 
-<<<<<<< HEAD
 /* POLAR: Check whether multixact local file cache is enabled */
 #define POLAR_ENABLE_MULTIXACT_LOCAL_CACHE() \
 	(polar_multixact_max_local_cache_segments > 0 && polar_enable_shared_storage_mode)
 
-/* hack to deal with WAL generated with older minor versions */
-=======
 /*
  * Hack to deal with WAL generated with older minor versions.
  *
@@ -434,7 +431,6 @@ static MemoryContext MXactContext = NULL;
  * seen a XLOG_MULTIXACT_ZERO_OFF_PAGE record for the page yet.
  */
 static int64 last_initialized_offsets_page = -1;
->>>>>>> REL_17_10
 static int64 pre_initialized_offsets_page = -1;
 
 /* internal MultiXactId management */

src/backend/replication/logical/applyparallelworker.c

@@ -813,10 +813,10 @@ LogicalParallelApplyLoop(shm_mq_handle *mqh)
 					ResetLatch(MyLatch);
 
 				/*
-				 * Force stats reporting to avoid long delays. There can be long
-				 * idle gaps before the leader assigns the next transaction, and
-				 * the only opportunity to report stats during such gaps is
-				 * here.
+				 * Force stats reporting to avoid long delays. There can be
+				 * long idle gaps before the leader assigns the next
+				 * transaction, and the only opportunity to report stats
+				 * during such gaps is here.
 				 */
 				if ((rc & WL_TIMEOUT) && !IsTransactionState())
 					pgstat_report_stat(true);

src/backend/replication/logical/slotsync.c

@@ -1192,17 +1192,12 @@ slotsync_reread_config(void)
 		}
 	}
 
-<<<<<<< HEAD
-	if (conninfo_changed ||
-		primary_slotname_changed ||
-		(old_hot_standby_feedback != POLAR_ENABLE_FEEDBACK()))
-=======
 	/*
 	 * If we have reached here with a parameter change, we must be running in
 	 * SQL function, emit error in such a case.
 	 */
-	if (parameter_changed)
->>>>>>> REL_17_10
+	if (parameter_changed ||
+		(old_hot_standby_feedback != POLAR_ENABLE_FEEDBACK()))
 	{
 		Assert(!is_slotsync_worker);
 		ereport(ERROR,

src/backend/replication/walsender.c

@@ -2615,14 +2615,10 @@ ProcessStandbyReplyMessage(void)
 	TimestampTz now;
 	TimestampTz replyTime;
 
-<<<<<<< HEAD
-	static bool fullyAppliedLastTime = false;
 	XLogRecPtr	polar_bg_replay_lsn = InvalidXLogRecPtr;
-=======
 	static XLogRecPtr prevWritePtr = InvalidXLogRecPtr;
 	static XLogRecPtr prevFlushPtr = InvalidXLogRecPtr;
 	static XLogRecPtr prevApplyPtr = InvalidXLogRecPtr;
->>>>>>> REL_17_10
 
 	/* the caller already consumed the msgtype byte */
 	writePtr = pq_getmsgint64(&reply_message);

src/bin/pg_combinebackup/t/011_ib_truncation.pl

@@ -91,17 +91,17 @@
 # truncation limit. We can't just check whether the restored VM fork is
 # the right size on disk, because it's so small that the incremental backup
 # code will send the entire file.
-my $relfilenode = $primary->safe_psql('postgres',
-	"SELECT pg_relation_filenode('t');");
-my $vm_limits = $primary->safe_psql('postgres',
+my $relfilenode =
+  $primary->safe_psql('postgres', "SELECT pg_relation_filenode('t');");
+my $vm_limits = $primary->safe_psql(
+	'postgres',
 	"SELECT string_agg(relblocknumber::text, ',')
 	   FROM pg_available_wal_summaries() s,
 	        pg_wal_summary_contents(s.tli, s.start_lsn, s.end_lsn) c
 	  WHERE c.relfilenode = $relfilenode
 	    AND c.relforknumber = 2
 	    AND c.is_limit_block;");
-is($vm_limits, '1',
-	'WAL summary has correct VM fork truncation limit');
+is($vm_limits, '1', 'WAL summary has correct VM fork truncation limit');
 
 # Combine full and incremental backups.  Before the fix, this failed because
 # the INCREMENTAL file header contained an incorrect truncation_block value.

src/include/access/visibilitymap.h

@@ -73,6 +73,8 @@ extern BlockNumber visibilitymap_truncation_length(BlockNumber nheapblocks);
 
 /* Mapping from heap block number to the right bit in the visibility map */
 #define HEAPBLK_TO_MAPBLOCK(x) ((x) / HEAPBLOCKS_PER_PAGE)
+#define HEAPBLK_TO_MAPBLOCK_LIMIT(x) \
+	(((x) + HEAPBLOCKS_PER_PAGE - 1) / HEAPBLOCKS_PER_PAGE)
 #define HEAPBLK_TO_MAPBYTE(x) (((x) % HEAPBLOCKS_PER_PAGE) / HEAPBLOCKS_PER_BYTE)
 #define HEAPBLK_TO_OFFSET(x) (((x) % HEAPBLOCKS_PER_BYTE) * BITS_PER_HEAPBLOCK)
 

src/include/pg_config.h.in

@@ -631,18 +631,16 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-<<<<<<< HEAD
 /* PFSD version number */
 #undef PFSD_VERSION
-=======
+
 /* Define to best C++ printf format archetype, usually gnu_printf if
    available. */
 #undef PG_CXX_PRINTF_ATTRIBUTE
 
 /* Define to best C printf format archetype, usually gnu_printf if available.
    */
 #undef PG_C_PRINTF_ATTRIBUTE
->>>>>>> REL_17_10
 
 /* Define to the name of a signed 128-bit integer type. */
 #undef PG_INT128_TYPE

src/include/storage/procsignal.h

@@ -48,12 +48,10 @@ typedef enum
 	PROCSIG_RECOVERY_CONFLICT_STARTUP_DEADLOCK,
 	PROCSIG_RECOVERY_CONFLICT_LAST = PROCSIG_RECOVERY_CONFLICT_STARTUP_DEADLOCK,
 
-<<<<<<< HEAD
+	PROCSIG_SLOTSYNC_MESSAGE,	/* ask slot synchronization to stop */
+
 	/* POLAR */
 	POLAR_PROCSIG_BACKEND_MEMORY_CONTEXT,
-=======
-	PROCSIG_SLOTSYNC_MESSAGE,	/* ask slot synchronization to stop */
->>>>>>> REL_17_10
 
 	NUM_PROCSIGNALS				/* Must be last! */
 } ProcSignalReason;