merge: resolve conflicts with PostgreSQL 15.15

Author: mrdrivingduck

.git-blame-ignore-revs

@@ -14,13 +14,11 @@
 #
 # $ git log --pretty=format:"%H # %cd%n# %s" $PGINDENTGITHASH -1 --date=iso
 
-<<<<<<< HEAD
-d04649cd9674a5408bada0c1d5f543a931ab675f # 2024-08-29 21:34:37 +0800
-# feat: prior indent run for PolarDB-PG 15
-=======
 f9790ac5464da45eb44470ab831584356381597b # 2025-10-21 09:56:26 -0500
 # Re-pgindent brin.c.
->>>>>>> REL_15_15
+
+d04649cd9674a5408bada0c1d5f543a931ab675f # 2024-08-29 21:34:37 +0800
+# feat: prior indent run for PolarDB-PG 15
 
 82d0ffae3219e4bc153a1306ce23013d168e04a2 # 2022-06-30 11:03:03 -0400
 # pgindent run prior to branching v15.

external/polar_audit/polar_audit.c

@@ -1317,4 +1317,4 @@ _PG_init(void)
 #endif							/* EXEC_BACKEND */
 
 	inited = true;
-}
+}

src/backend/replication/slot.c

@@ -1835,7 +1835,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
 
 		pgstat_report_wait_end();
 		CloseTransientFile(fd);
-		unlink(tmppath);
+		polar_unlink(tmppath);
 		LWLockRelease(&slot->io_in_progress_lock);
 
 		/* if write didn't set errno, assume problem is no disk space */
@@ -1856,7 +1856,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
 
 		pgstat_report_wait_end();
 		CloseTransientFile(fd);
-		unlink(tmppath);
+		polar_unlink(tmppath);
 		LWLockRelease(&slot->io_in_progress_lock);
 
 		errno = save_errno;
@@ -1872,7 +1872,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
 	{
 		int			save_errno = errno;
 
-		unlink(tmppath);
+		polar_unlink(tmppath);
 		LWLockRelease(&slot->io_in_progress_lock);
 
 		errno = save_errno;
@@ -1888,7 +1888,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
 	{
 		int			save_errno = errno;
 
-		unlink(tmppath);
+		polar_unlink(tmppath);
 		LWLockRelease(&slot->io_in_progress_lock);
 
 		errno = save_errno;

src/backend/replication/walsender.c

@@ -224,10 +224,6 @@ typedef struct
 	XLogRecPtr	last_lsn;
 	WalTimeSample buffer[LAG_TRACKER_BUFFER_SIZE];
 	int			write_head;
-<<<<<<< HEAD
-	int			read_heads[POLAR_NUM_ALL_REP_WAIT_MODE];
-	WalTimeSample last_read[POLAR_NUM_ALL_REP_WAIT_MODE];
-=======
 	int			read_heads[NUM_SYNC_REP_WAIT_MODE];
 	WalTimeSample last_read[NUM_SYNC_REP_WAIT_MODE];
 
@@ -244,7 +240,6 @@ typedef struct
 	 * we transition back to normal buffer-based tracking.
 	 */
 	WalTimeSample overflowed[NUM_SYNC_REP_WAIT_MODE];
->>>>>>> REL_15_15
 } LagTracker;
 
 static LagTracker *lag_tracker;

src/backend/utils/activity/pgstat.c

@@ -1637,7 +1637,7 @@ pgstat_read_statsfile(void)
 						 * WARNING, but it would mean that all the statistics
 						 * are discarded when the environment fails on OOM.
 						 */
-						elog(ERROR,	"could not allocate entry %d/%u/%u",
+						elog(ERROR, "could not allocate entry %d/%u/%u",
 							 key.kind, key.dboid, key.objoid);
 					}
 

src/bin/pg_dump/t/002_pg_dump.pl

@@ -513,31 +513,18 @@
 	createdb => 1,
 	defaults => 1,
 	exclude_dump_test_schema => 1,
-<<<<<<< HEAD
 	exclude_test_table => 1,
 	exclude_test_table_data => 1,
 	no_toast_compression => 1,
 	no_blobs => 1,
 	no_owner => 1,
 	no_privs => 1,
+	no_subscriptions => 1,
+	no_subscriptions_restore => 1,
 	no_table_access_method => 1,
 	pg_dumpall_dbprivs => 1,
 	pg_dumpall_exclude => 1,
 	schema_only => 1,);
-=======
-	exclude_test_table       => 1,
-	exclude_test_table_data  => 1,
-	no_toast_compression     => 1,
-	no_blobs                 => 1,
-	no_owner                 => 1,
-	no_privs                 => 1,
-	no_subscriptions => 1,
-	no_subscriptions_restore => 1,
-	no_table_access_method   => 1,
-	pg_dumpall_dbprivs       => 1,
-	pg_dumpall_exclude       => 1,
-	schema_only              => 1,);
->>>>>>> REL_15_15
 
 # This is where the actual tests are defined.
 my %tests = (
@@ -3294,33 +3281,19 @@
 			defaults => 1,
 			exclude_test_table => 1,
 			exclude_test_table_data => 1,
-<<<<<<< HEAD
 			no_toast_compression => 1,
 			no_blobs => 1,
 			no_privs => 1,
 			no_owner => 1,
+			no_subscriptions => 1,
+			no_subscriptions_restore => 1,
 			no_table_access_method => 1,
 			only_dump_test_schema => 1,
 			pg_dumpall_dbprivs => 1,
 			pg_dumpall_exclude => 1,
 			schema_only => 1,
 			section_post_data => 1,
 			test_schema_plus_blobs => 1,
-=======
-			no_toast_compression    => 1,
-			no_blobs                => 1,
-			no_privs                => 1,
-			no_owner                => 1,
-			no_subscriptions => 1,
-			no_subscriptions_restore => 1,
-			no_table_access_method  => 1,
-			only_dump_test_schema   => 1,
-			pg_dumpall_dbprivs      => 1,
-			pg_dumpall_exclude      => 1,
-			schema_only             => 1,
-			section_post_data       => 1,
-			test_schema_plus_blobs  => 1,
->>>>>>> REL_15_15
 		},
 		unlike => {
 			exclude_dump_test_schema => 1,
@@ -3381,35 +3354,20 @@
 			createdb => 1,
 			defaults => 1,
 			exclude_dump_test_schema => 1,
-<<<<<<< HEAD
 			exclude_test_table => 1,
 			exclude_test_table_data => 1,
 			no_toast_compression => 1,
 			no_blobs => 1,
 			no_privs => 1,
 			no_owner => 1,
+			no_subscriptions => 1,
+			no_subscriptions_restore => 1,
 			no_table_access_method => 1,
 			pg_dumpall_dbprivs => 1,
 			pg_dumpall_exclude => 1,
 			role => 1,
 			schema_only => 1,
 			section_post_data => 1,
-=======
-			exclude_test_table       => 1,
-			exclude_test_table_data  => 1,
-			no_toast_compression     => 1,
-			no_blobs                 => 1,
-			no_privs                 => 1,
-			no_owner                 => 1,
-			no_subscriptions => 1,
-			no_subscriptions_restore => 1,
-			no_table_access_method   => 1,
-			pg_dumpall_dbprivs       => 1,
-			pg_dumpall_exclude       => 1,
-			role                     => 1,
-			schema_only              => 1,
-			section_post_data        => 1,
->>>>>>> REL_15_15
 		},
 		unlike => {
 			only_dump_test_schema => 1,

src/bin/pgbench/t/001_pgbench_with_server.pl

@@ -1545,10 +1545,9 @@ BEGIN
 
 # Test copy in pgbench
 $node->pgbench(
-	'-t 10',
-	2,
+	'-t 10', 2,
 	[],
-	[ qr{COPY is not supported in pgbench, aborting} ],
+	[qr{COPY is not supported in pgbench, aborting}],
 	'Test copy in script',
 	{
 		'001_copy' => q{ COPY pgbench_accounts FROM stdin }

src/interfaces/libpq/fe-protocol3.c

@@ -51,13 +51,8 @@ static int	getCopyStart(PGconn *conn, ExecStatusType copytype);
 static int	getReadyForQuery(PGconn *conn);
 static void reportErrorPosition(PQExpBuffer msg, const char *query,
 								int loc, int encoding);
-<<<<<<< HEAD
-static int	build_startup_packet(PGconn *conn, char *packet,
-								 const PQEnvironmentOption *options);
-=======
-static size_t build_startup_packet(const PGconn *conn, char *packet,
+static size_t build_startup_packet(PGconn *conn, char *packet,
 								   const PQEnvironmentOption *options);
->>>>>>> REL_15_15
 
 
 /*
@@ -2258,13 +2253,8 @@ add_size_overflow(size_t s1, size_t s2, size_t *dst)
  * (with packet == allocated space) fills it in.  Return value is the number
  * of bytes used, or zero in the unlikely event of size_t overflow.
  */
-<<<<<<< HEAD
-static int
-build_startup_packet(PGconn *conn, char *packet,
-=======
 static size_t
-build_startup_packet(const PGconn *conn, char *packet,
->>>>>>> REL_15_15
+build_startup_packet(PGconn *conn, char *packet,
 					 const PQEnvironmentOption *options)
 {
 	size_t		packet_len = 0;

src/test/modules/brin/t/01_workitems.pl

@@ -48,14 +48,16 @@
 $node->safe_psql('postgres',
 	'insert into brin_wi select * from generate_series(1, 100)');
 $node->safe_psql('postgres',
-	"insert into journal select * from generate_series(timestamp '1976-08-01', '1976-10-28', '1 day')");
+	"insert into journal select * from generate_series(timestamp '1976-08-01', '1976-10-28', '1 day')"
+);
 
 $node->poll_query_until(
 	'postgres',
 	"select count(*) > 1 from brin_page_items(get_raw_page('brin_wi_idx', 2), 'brin_wi_idx'::regclass)",
 	't');
 
-$count = $node->safe_psql('postgres',
+$count = $node->safe_psql(
+	'postgres',
 	"select count(*) from brin_page_items(get_raw_page('brin_wi_idx', 2), 'brin_wi_idx'::regclass)
 	 where not placeholder;"
 );
@@ -66,7 +68,8 @@
 	"select count(*) > 1 from brin_page_items(get_raw_page('brin_packdate_idx', 2), 'brin_packdate_idx'::regclass)",
 	't');
 
-$count = $node->safe_psql('postgres',
+$count = $node->safe_psql(
+	'postgres',
 	"select count(*) from brin_page_items(get_raw_page('brin_packdate_idx', 2), 'brin_packdate_idx'::regclass)
 	 where not placeholder;"
 );