Run pgperltidy

This is required before the creation of a new branch.  pgindent is
clean, as well as is reformat-dat-files.

perltidy version is v20230309, as documented in pgindent's README.

10 files changed, 174 insertions, 106 deletions

diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl
index 15dd10ce40a..b7ef7ed8d06 100644
--- a/src/bin/initdb/t/001_initdb.pl
+++ b/src/bin/initdb/t/001_initdb.pl
@@ -76,7 +76,8 @@ command_like(
 	'checksums are enabled in control file');
 
 command_ok([ 'initdb', '--sync-only', $datadir ], 'sync only');
-command_ok([ 'initdb', '--sync-only', '--no-sync-data-files', $datadir ], '--no-sync-data-files');
+command_ok([ 'initdb', '--sync-only', '--no-sync-data-files', $datadir ],
+	'--no-sync-data-files');
 command_fails([ 'initdb', $datadir ], 'existing data directory');
 
 if ($supports_syncfs)
diff --git a/src/bin/pg_basebackup/t/030_pg_recvlogical.pl b/src/bin/pg_basebackup/t/030_pg_recvlogical.pl
index 5f46357e72a..1b7a6f6f43f 100644
--- a/src/bin/pg_basebackup/t/030_pg_recvlogical.pl
+++ b/src/bin/pg_basebackup/t/030_pg_recvlogical.pl
@@ -147,7 +147,8 @@ $node->command_ok(
 	'slot with failover created');
 
 my $result = $node->safe_psql('postgres',
-	"SELECT failover FROM pg_catalog.pg_replication_slots WHERE slot_name = 'test'");
+	"SELECT failover FROM pg_catalog.pg_replication_slots WHERE slot_name = 'test'"
+);
 is($result, 't', "failover is enabled for the new slot");
 
 done_testing();
diff --git a/src/bin/pg_combinebackup/t/010_hardlink.pl b/src/bin/pg_combinebackup/t/010_hardlink.pl
index a0ee419090c..4f92d6676bd 100644
--- a/src/bin/pg_combinebackup/t/010_hardlink.pl
+++ b/src/bin/pg_combinebackup/t/010_hardlink.pl
@@ -56,7 +56,7 @@ $primary->command_ok(
 		'--pgdata' => $backup1path,
 		'--no-sync',
 		'--checkpoint' => 'fast',
-        '--wal-method' => 'none'
+		'--wal-method' => 'none'
 	],
 	"full backup");
 
@@ -74,7 +74,7 @@ $primary->command_ok(
 		'--pgdata' => $backup2path,
 		'--no-sync',
 		'--checkpoint' => 'fast',
-        '--wal-method' => 'none',
+		'--wal-method' => 'none',
 		'--incremental' => $backup1path . '/backup_manifest'
 	],
 	"incremental backup");
@@ -112,45 +112,45 @@ done_testing();
 #                        of the given data file.
 sub check_data_file
 {
-    my ($data_file, $last_segment_nlinks) = @_;
-
-    my @data_file_segments = ($data_file);
-
-    # Start checking for additional segments
-    my $segment_number = 1;
-
-    while (1)
-    {
-        my $next_segment = $data_file . '.' . $segment_number;
-
-        # If the file exists and is a regular file, add it to the list
-        if (-f $next_segment)
-        {
-            push @data_file_segments, $next_segment;
-            $segment_number++;
-        }
-        # Stop the loop if the file doesn't exist
-        else
-        {
-            last;
-        }
-    }
-
-    # All segments of the given data file should contain 2 hard links, except
-    # for the last one, which should match the given number of links.
-    my $last_segment = pop @data_file_segments;
-
-    for my $segment (@data_file_segments)
-    {
-        # Get the file's stat information of each segment
-        my $nlink_count = get_hard_link_count($segment);
-        ok($nlink_count == 2, "File '$segment' has 2 hard links");
-    }
-
-    # Get the file's stat information of the last segment
-    my $nlink_count = get_hard_link_count($last_segment);
-    ok($nlink_count == $last_segment_nlinks,
-       "File '$last_segment' has $last_segment_nlinks hard link(s)");
+	my ($data_file, $last_segment_nlinks) = @_;
+
+	my @data_file_segments = ($data_file);
+
+	# Start checking for additional segments
+	my $segment_number = 1;
+
+	while (1)
+	{
+		my $next_segment = $data_file . '.' . $segment_number;
+
+		# If the file exists and is a regular file, add it to the list
+		if (-f $next_segment)
+		{
+			push @data_file_segments, $next_segment;
+			$segment_number++;
+		}
+		# Stop the loop if the file doesn't exist
+		else
+		{
+			last;
+		}
+	}
+
+	# All segments of the given data file should contain 2 hard links, except
+	# for the last one, which should match the given number of links.
+	my $last_segment = pop @data_file_segments;
+
+	for my $segment (@data_file_segments)
+	{
+		# Get the file's stat information of each segment
+		my $nlink_count = get_hard_link_count($segment);
+		ok($nlink_count == 2, "File '$segment' has 2 hard links");
+	}
+
+	# Get the file's stat information of the last segment
+	my $nlink_count = get_hard_link_count($last_segment);
+	ok($nlink_count == $last_segment_nlinks,
+		"File '$last_segment' has $last_segment_nlinks hard link(s)");
 }
 
 
@@ -159,11 +159,11 @@ sub check_data_file
 # that file.
 sub get_hard_link_count
 {
-    my ($file) = @_;
+	my ($file) = @_;
 
-    # Get file stats
-    my @stats = stat($file);
-    my $nlink = $stats[3];  # Number of hard links
+	# Get file stats
+	my @stats = stat($file);
+	my $nlink = $stats[3];    # Number of hard links
 
-    return $nlink;
+	return $nlink;
 }
diff --git a/src/bin/pg_dump/t/001_basic.pl b/src/bin/pg_dump/t/001_basic.pl
index 0be9f6dd538..c3c5fae11ea 100644
--- a/src/bin/pg_dump/t/001_basic.pl
+++ b/src/bin/pg_dump/t/001_basic.pl
@@ -240,17 +240,20 @@ command_fails_like(
 command_fails_like(
 	[ 'pg_restore', '--exclude-database=foo', '--globals-only', '-d', 'xxx' ],
 	qr/\Qpg_restore: error: option --exclude-database cannot be used together with -g\/--globals-only\E/,
-	'pg_restore: option --exclude-database cannot be used together with -g/--globals-only');
+	'pg_restore: option --exclude-database cannot be used together with -g/--globals-only'
+);
 
 command_fails_like(
 	[ 'pg_restore', '--exclude-database=foo', '-d', 'xxx', 'dumpdir' ],
 	qr/\Qpg_restore: error: option --exclude-database can be used only when restoring an archive created by pg_dumpall\E/,
-	'When option --exclude-database is used in pg_restore with dump of pg_dump');
+	'When option --exclude-database is used in pg_restore with dump of pg_dump'
+);
 
 command_fails_like(
 	[ 'pg_restore', '--globals-only', '-d', 'xxx', 'dumpdir' ],
 	qr/\Qpg_restore: error: option -g\/--globals-only can be used only when restoring an archive created by pg_dumpall\E/,
-	'When option --globals-only is not used in pg_restore with dump of pg_dump');
+	'When option --globals-only is not used in pg_restore with dump of pg_dump'
+);
 
 # also fails for -r and -t, but it seems pointless to add more tests for those.
 command_fails_like(
diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
index e1cfa99874e..2485d8f360e 100644
--- a/src/bin/pg_dump/t/002_pg_dump.pl
+++ b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -368,7 +368,7 @@ my %pgdump_runs = (
 			'--data-only',
 			'--superuser' => 'test_superuser',
 			'--disable-triggers',
-			'--verbose',         # no-op, just make sure it works
+			'--verbose',    # no-op, just make sure it works
 			'postgres',
 		],
 	},
@@ -810,8 +810,7 @@ my %pgdump_runs = (
 		dump_cmd => [
 			'pg_dump', '--no-sync',
 			"--file=$tempdir/no_schema.sql", '--no-schema',
-			'--with-statistics',
-			'postgres',
+			'--with-statistics', 'postgres',
 		],
 	},);
 
diff --git a/src/bin/pg_dump/t/006_pg_dumpall.pl b/src/bin/pg_dump/t/006_pg_dumpall.pl
index 0ea02a3a4a9..c274b777586 100644
--- a/src/bin/pg_dump/t/006_pg_dumpall.pl
+++ b/src/bin/pg_dump/t/006_pg_dumpall.pl
@@ -294,17 +294,17 @@ my %pgdumpall_runs = (
 			'--format' => 'directory',
 			'--globals-only',
 			'--file' => "$tempdir/dump_globals_only",
-			],
-			restore_cmd => [
-				'pg_restore', '-C', '--globals-only',
-				'--format' => 'directory',
-				'--file' => "$tempdir/dump_globals_only.sql",
-				"$tempdir/dump_globals_only",
-				],
-				like => qr/
+		],
+		restore_cmd => [
+			'pg_restore', '-C', '--globals-only',
+			'--format' => 'directory',
+			'--file' => "$tempdir/dump_globals_only.sql",
+			"$tempdir/dump_globals_only",
+		],
+		like => qr/
             ^\s*\QCREATE ROLE dumpall;\E\s*\n
 			/xm
-			}, );
+	},);
 
 # First execute the setup_sql
 foreach my $run (sort keys %pgdumpall_runs)
@@ -339,7 +339,8 @@ foreach my $run (sort keys %pgdumpall_runs)
 	# pg_restore --file output file.
 	my $output_file = slurp_file("$tempdir/${run}.sql");
 
-	if (!($pgdumpall_runs{$run}->{like}) && !($pgdumpall_runs{$run}->{unlike}))
+	if (   !($pgdumpall_runs{$run}->{like})
+		&& !($pgdumpall_runs{$run}->{unlike}))
 	{
 		die "missing \"like\" or \"unlike\" in test \"$run\"";
 	}
@@ -361,30 +362,38 @@ foreach my $run (sort keys %pgdumpall_runs)
 # Some negative test case with dump of pg_dumpall and restore using pg_restore
 # test case 1: when -C is not used in pg_restore with dump of pg_dumpall
 $node->command_fails_like(
-    [ 'pg_restore',
-    "$tempdir/format_custom",
-    '--format' => 'custom',
-    '--file' => "$tempdir/error_test.sql", ],
-    qr/\Qpg_restore: error: option -C\/--create must be specified when restoring an archive created by pg_dumpall\E/,
-    'When -C is not used in pg_restore with dump of pg_dumpall');
+	[
+		'pg_restore',
+		"$tempdir/format_custom",
+		'--format' => 'custom',
+		'--file' => "$tempdir/error_test.sql",
+	],
+	qr/\Qpg_restore: error: option -C\/--create must be specified when restoring an archive created by pg_dumpall\E/,
+	'When -C is not used in pg_restore with dump of pg_dumpall');
 
 # test case 2: When --list option is used with dump of pg_dumpall
 $node->command_fails_like(
-	[ 'pg_restore',
+	[
+		'pg_restore',
 		"$tempdir/format_custom", '-C',
-		'--format' => 'custom', '--list',
-		'--file' => "$tempdir/error_test.sql", ],
+		'--format' => 'custom',
+		'--list',
+		'--file' => "$tempdir/error_test.sql",
+	],
 	qr/\Qpg_restore: error: option -l\/--list cannot be used when restoring an archive created by pg_dumpall\E/,
 	'When --list is used in pg_restore with dump of pg_dumpall');
 
 # test case 3: When non-exist database is given with -d option
 $node->command_fails_like(
-	[ 'pg_restore',
+	[
+		'pg_restore',
 		"$tempdir/format_custom", '-C',
 		'--format' => 'custom',
-		'-d' => 'dbpq', ],
+		'-d' => 'dbpq',
+	],
 	qr/\Qpg_restore: error: could not connect to database "dbpq"\E/,
-	'When non-existent database is given with -d option in pg_restore with dump of pg_dumpall');
+	'When non-existent database is given with -d option in pg_restore with dump of pg_dumpall'
+);
 
 $node->stop('fast');
 
diff --git a/src/bin/pg_rewind/t/RewindTest.pm b/src/bin/pg_rewind/t/RewindTest.pm
index 3efab831797..b0234ebfaf2 100644
--- a/src/bin/pg_rewind/t/RewindTest.pm
+++ b/src/bin/pg_rewind/t/RewindTest.pm
@@ -285,7 +285,7 @@ sub run_pg_rewind
 		# Check that pg_rewind with dbname and --write-recovery-conf
 		# wrote the dbname in the generated primary_conninfo value.
 		like(slurp_file("$primary_pgdata/postgresql.auto.conf"),
-		     qr/dbname=postgres/m, 'recovery conf file sets dbname');
+			qr/dbname=postgres/m, 'recovery conf file sets dbname');
 
 		# Check that standby.signal is here as recovery configuration
 		# was requested.
diff --git a/src/bin/pg_upgrade/t/004_subscription.pl b/src/bin/pg_upgrade/t/004_subscription.pl
index c545abf6581..e46f02c6cc6 100644
--- a/src/bin/pg_upgrade/t/004_subscription.pl
+++ b/src/bin/pg_upgrade/t/004_subscription.pl
@@ -53,7 +53,8 @@ $old_sub->safe_psql('postgres',
 
 $old_sub->stop;
 
-$new_sub->append_conf('postgresql.conf', "max_active_replication_origins = 0");
+$new_sub->append_conf('postgresql.conf',
+	"max_active_replication_origins = 0");
 
 # pg_upgrade will fail because the new cluster has insufficient
 # max_active_replication_origins.
@@ -80,7 +81,8 @@ command_checks_all(
 );
 
 # Reset max_active_replication_origins
-$new_sub->append_conf('postgresql.conf', "max_active_replication_origins = 10");
+$new_sub->append_conf('postgresql.conf',
+	"max_active_replication_origins = 10");
 
 # Cleanup
 $publisher->safe_psql('postgres', "DROP PUBLICATION regress_pub1");
diff --git a/src/bin/pg_upgrade/t/006_transfer_modes.pl b/src/bin/pg_upgrade/t/006_transfer_modes.pl
index 550a63fdf7d..58fe8a8c7dc 100644
--- a/src/bin/pg_upgrade/t/006_transfer_modes.pl
+++ b/src/bin/pg_upgrade/t/006_transfer_modes.pl
@@ -13,7 +13,8 @@ sub test_mode
 {
 	my ($mode) = @_;
 
-	my $old = PostgreSQL::Test::Cluster->new('old', install_path => $ENV{oldinstall});
+	my $old =
+	  PostgreSQL::Test::Cluster->new('old', install_path => $ENV{oldinstall});
 	my $new = PostgreSQL::Test::Cluster->new('new');
 
 	# --swap can't be used to upgrade from versions older than 10, so just skip
@@ -40,9 +41,11 @@ sub test_mode
 	# Create a small variety of simple test objects on the old cluster.  We'll
 	# check that these reach the new version after upgrading.
 	$old->start;
-	$old->safe_psql('postgres', "CREATE TABLE test1 AS SELECT generate_series(1, 100)");
+	$old->safe_psql('postgres',
+		"CREATE TABLE test1 AS SELECT generate_series(1, 100)");
 	$old->safe_psql('postgres', "CREATE DATABASE testdb1");
-	$old->safe_psql('testdb1', "CREATE TABLE test2 AS SELECT generate_series(200, 300)");
+	$old->safe_psql('testdb1',
+		"CREATE TABLE test2 AS SELECT generate_series(200, 300)");
 	$old->safe_psql('testdb1', "VACUUM FULL test2");
 	$old->safe_psql('testdb1', "CREATE SEQUENCE testseq START 5432");
 
@@ -51,10 +54,15 @@ sub test_mode
 	if (defined($ENV{oldinstall}))
 	{
 		my $tblspc = PostgreSQL::Test::Utils::tempdir_short();
-		$old->safe_psql('postgres', "CREATE TABLESPACE test_tblspc LOCATION '$tblspc'");
-		$old->safe_psql('postgres', "CREATE DATABASE testdb2 TABLESPACE test_tblspc");
-		$old->safe_psql('postgres', "CREATE TABLE test3 TABLESPACE test_tblspc AS SELECT generate_series(300, 401)");
-		$old->safe_psql('testdb2', "CREATE TABLE test4 AS SELECT generate_series(400, 502)");
+		$old->safe_psql('postgres',
+			"CREATE TABLESPACE test_tblspc LOCATION '$tblspc'");
+		$old->safe_psql('postgres',
+			"CREATE DATABASE testdb2 TABLESPACE test_tblspc");
+		$old->safe_psql('postgres',
+			"CREATE TABLE test3 TABLESPACE test_tblspc AS SELECT generate_series(300, 401)"
+		);
+		$old->safe_psql('testdb2',
+			"CREATE TABLE test4 AS SELECT generate_series(400, 502)");
 	}
 	$old->stop;
 
@@ -90,9 +98,11 @@ sub test_mode
 		# tablespace.
 		if (defined($ENV{oldinstall}))
 		{
-			$result = $new->safe_psql('postgres', "SELECT COUNT(*) FROM test3");
+			$result =
+			  $new->safe_psql('postgres', "SELECT COUNT(*) FROM test3");
 			is($result, '102', "test3 data after pg_upgrade $mode");
-			$result = $new->safe_psql('testdb2', "SELECT COUNT(*) FROM test4");
+			$result =
+			  $new->safe_psql('testdb2', "SELECT COUNT(*) FROM test4");
 			is($result, '103', "test4 data after pg_upgrade $mode");
 		}
 		$new->stop;
diff --git a/src/bin/scripts/t/100_vacuumdb.pl b/src/bin/scripts/t/100_vacuumdb.pl
index 75ac24a7a55..ff56a13b46b 100644
--- a/src/bin/scripts/t/100_vacuumdb.pl
+++ b/src/bin/scripts/t/100_vacuumdb.pl
@@ -238,62 +238,105 @@ $node->command_fails_like(
 	'cannot use option --all and a dbname as argument at the same time');
 
 $node->safe_psql('postgres',
-	'CREATE TABLE regression_vacuumdb_test AS select generate_series(1, 10) a, generate_series(2, 11) b;');
+	'CREATE TABLE regression_vacuumdb_test AS select generate_series(1, 10) a, generate_series(2, 11) b;'
+);
 $node->issues_sql_like(
-	[ 'vacuumdb', '--analyze-only', '--missing-stats-only', '-t', 'regression_vacuumdb_test', 'postgres' ],
+	[
+		'vacuumdb', '--analyze-only',
+		'--missing-stats-only', '-t',
+		'regression_vacuumdb_test', 'postgres'
+	],
 	qr/statement:\ ANALYZE/sx,
 	'--missing-stats-only with missing stats');
 $node->issues_sql_unlike(
-	[ 'vacuumdb', '--analyze-only', '--missing-stats-only', '-t', 'regression_vacuumdb_test', 'postgres' ],
+	[
+		'vacuumdb', '--analyze-only',
+		'--missing-stats-only', '-t',
+		'regression_vacuumdb_test', 'postgres'
+	],
 	qr/statement:\ ANALYZE/sx,
 	'--missing-stats-only with no missing stats');
 
 $node->safe_psql('postgres',
-	'CREATE INDEX regression_vacuumdb_test_idx ON regression_vacuumdb_test (mod(a, 2));');
+	'CREATE INDEX regression_vacuumdb_test_idx ON regression_vacuumdb_test (mod(a, 2));'
+);
 $node->issues_sql_like(
-	[ 'vacuumdb', '--analyze-in-stages', '--missing-stats-only', '-t', 'regression_vacuumdb_test', 'postgres' ],
+	[
+		'vacuumdb', '--analyze-in-stages',
+		'--missing-stats-only', '-t',
+		'regression_vacuumdb_test', 'postgres'
+	],
 	qr/statement:\ ANALYZE/sx,
 	'--missing-stats-only with missing index expression stats');
 $node->issues_sql_unlike(
-	[ 'vacuumdb', '--analyze-in-stages', '--missing-stats-only', '-t', 'regression_vacuumdb_test', 'postgres' ],
+	[
+		'vacuumdb', '--analyze-in-stages',
+		'--missing-stats-only', '-t',
+		'regression_vacuumdb_test', 'postgres'
+	],
 	qr/statement:\ ANALYZE/sx,
 	'--missing-stats-only with no missing index expression stats');
 
 $node->safe_psql('postgres',
-	'CREATE STATISTICS regression_vacuumdb_test_stat ON a, b FROM regression_vacuumdb_test;');
+	'CREATE STATISTICS regression_vacuumdb_test_stat ON a, b FROM regression_vacuumdb_test;'
+);
 $node->issues_sql_like(
-	[ 'vacuumdb', '--analyze-only', '--missing-stats-only', '-t', 'regression_vacuumdb_test', 'postgres' ],
+	[
+		'vacuumdb', '--analyze-only',
+		'--missing-stats-only', '-t',
+		'regression_vacuumdb_test', 'postgres'
+	],
 	qr/statement:\ ANALYZE/sx,
 	'--missing-stats-only with missing extended stats');
 $node->issues_sql_unlike(
-	[ 'vacuumdb', '--analyze-only', '--missing-stats-only', '-t', 'regression_vacuumdb_test', 'postgres' ],
+	[
+		'vacuumdb', '--analyze-only',
+		'--missing-stats-only', '-t',
+		'regression_vacuumdb_test', 'postgres'
+	],
 	qr/statement:\ ANALYZE/sx,
 	'--missing-stats-only with no missing extended stats');
 
 $node->safe_psql('postgres',
 	"CREATE TABLE regression_vacuumdb_child (a INT) INHERITS (regression_vacuumdb_test);\n"
-	. "INSERT INTO regression_vacuumdb_child VALUES (1, 2);\n"
-	. "ANALYZE regression_vacuumdb_child;\n");
+	  . "INSERT INTO regression_vacuumdb_child VALUES (1, 2);\n"
+	  . "ANALYZE regression_vacuumdb_child;\n");
 $node->issues_sql_like(
-	[ 'vacuumdb', '--analyze-in-stages', '--missing-stats-only', '-t', 'regression_vacuumdb_test', 'postgres' ],
+	[
+		'vacuumdb', '--analyze-in-stages',
+		'--missing-stats-only', '-t',
+		'regression_vacuumdb_test', 'postgres'
+	],
 	qr/statement:\ ANALYZE/sx,
 	'--missing-stats-only with missing inherited stats');
 $node->issues_sql_unlike(
-	[ 'vacuumdb', '--analyze-in-stages', '--missing-stats-only', '-t', 'regression_vacuumdb_test', 'postgres' ],
+	[
+		'vacuumdb', '--analyze-in-stages',
+		'--missing-stats-only', '-t',
+		'regression_vacuumdb_test', 'postgres'
+	],
 	qr/statement:\ ANALYZE/sx,
 	'--missing-stats-only with no missing inherited stats');
 
 $node->safe_psql('postgres',
 	"CREATE TABLE regression_vacuumdb_parted (a INT) PARTITION BY LIST (a);\n"
-	. "CREATE TABLE regression_vacuumdb_part1 PARTITION OF regression_vacuumdb_parted FOR VALUES IN (1);\n"
-	. "INSERT INTO regression_vacuumdb_parted VALUES (1);\n"
-	. "ANALYZE regression_vacuumdb_part1;\n");
+	  . "CREATE TABLE regression_vacuumdb_part1 PARTITION OF regression_vacuumdb_parted FOR VALUES IN (1);\n"
+	  . "INSERT INTO regression_vacuumdb_parted VALUES (1);\n"
+	  . "ANALYZE regression_vacuumdb_part1;\n");
 $node->issues_sql_like(
-	[ 'vacuumdb', '--analyze-only', '--missing-stats-only', '-t', 'regression_vacuumdb_parted', 'postgres' ],
+	[
+		'vacuumdb', '--analyze-only',
+		'--missing-stats-only', '-t',
+		'regression_vacuumdb_parted', 'postgres'
+	],
 	qr/statement:\ ANALYZE/sx,
 	'--missing-stats-only with missing partition stats');
 $node->issues_sql_unlike(
-	[ 'vacuumdb', '--analyze-only', '--missing-stats-only', '-t', 'regression_vacuumdb_parted', 'postgres' ],
+	[
+		'vacuumdb', '--analyze-only',
+		'--missing-stats-only', '-t',
+		'regression_vacuumdb_parted', 'postgres'
+	],
 	qr/statement:\ ANALYZE/sx,
 	'--missing-stats-only with no missing partition stats');