Initial pgperltidy run for v12.

Make all the perl code look nice, too (for some value of "nice").

Author: tglsfdc

src/backend/catalog/genbki.pl

@@ -20,7 +20,7 @@
 
 use File::Basename;
 use File::Spec;
-BEGIN  { use lib File::Spec->rel2abs(dirname(__FILE__)); }
+BEGIN { use lib File::Spec->rel2abs(dirname(__FILE__)); }
 
 use Catalog;
 
@@ -34,7 +34,7 @@
 	'include-path:s' => \$include_path) || usage();
 
 # Sanity check arguments.
-die "No input files.\n" unless @ARGV;
+die "No input files.\n"                  unless @ARGV;
 die "--set-version must be specified.\n" unless $major_version;
 die "Invalid version string: $major_version\n"
   unless $major_version =~ /^\d+$/;
@@ -301,7 +301,7 @@
 	$typeoids{ $row->{typname} } = $row->{oid};
 
 	# for pg_attribute copies of pg_type values
-	$types{ $row->{typname} }    = $row;
+	$types{ $row->{typname} } = $row;
 }
 
 # Encoding identifier lookup.  This uses the same replacement machinery
@@ -313,7 +313,7 @@
 
 # We're parsing an enum, so start with 0 and increment
 # every time we find an enum member.
-my $encid = 0;
+my $encid             = 0;
 my $collect_encodings = 0;
 while (<$ef>)
 {

src/backend/utils/Gen_fmgrtab.pl

@@ -203,7 +203,7 @@
 $bmap{'f'} = 'false';
 my @fmgr_builtin_oid_index;
 my $last_builtin_oid = 0;
-my $fmgr_count = 0;
+my $fmgr_count       = 0;
 foreach my $s (sort { $a->{oid} <=> $b->{oid} } @fmgr)
 {
 	print $tfh

src/bin/initdb/t/001_initdb.pl

@@ -60,14 +60,14 @@
 }
 
 # Control file should tell that data checksums are disabled by default.
-command_like(['pg_controldata', $datadir],
-			 qr/Data page checksum version:.*0/,
-			 'checksums are disabled in control file');
+command_like(
+	[ 'pg_controldata', $datadir ],
+	qr/Data page checksum version:.*0/,
+	'checksums are disabled in control file');
 # pg_checksums fails with checksums disabled by default.  This is
 # not part of the tests included in pg_checksums to save from
 # the creation of an extra instance.
-command_fails(
-	[ 'pg_checksums', '-D', $datadir],
+command_fails([ 'pg_checksums', '-D', $datadir ],
 	"pg_checksums fails with data checksum disabled");
 
 command_ok([ 'initdb', '-S', $datadir ], 'sync only');

src/bin/pg_basebackup/t/010_pg_basebackup.pl

@@ -359,7 +359,7 @@
 $node->command_ok([ 'pg_basebackup', '-D', "$tempdir/backupR", '-R' ],
 	'pg_basebackup -R runs');
 ok(-f "$tempdir/backupR/postgresql.auto.conf", 'postgresql.auto.conf exists');
-ok(-f "$tempdir/backupR/standby.signal", 'standby.signal was created');
+ok(-f "$tempdir/backupR/standby.signal",       'standby.signal was created');
 my $recovery_conf = slurp_file "$tempdir/backupR/postgresql.auto.conf";
 rmtree("$tempdir/backupR");
 

src/bin/pg_checksums/t/002_actions.pl

@@ -14,21 +14,22 @@
 # at the end.
 sub check_relation_corruption
 {
-	my $node = shift;
-	my $table = shift;
+	my $node       = shift;
+	my $table      = shift;
 	my $tablespace = shift;
-	my $pgdata = $node->data_dir;
+	my $pgdata     = $node->data_dir;
 
-	$node->safe_psql('postgres',
+	$node->safe_psql(
+		'postgres',
 		"SELECT a INTO $table FROM generate_series(1,10000) AS a;
 		ALTER TABLE $table SET (autovacuum_enabled=false);");
 
 	$node->safe_psql('postgres',
-		"ALTER TABLE ".$table." SET TABLESPACE ".$tablespace.";");
+		"ALTER TABLE " . $table . " SET TABLESPACE " . $tablespace . ";");
 
-	my $file_corrupted = $node->safe_psql('postgres',
-		"SELECT pg_relation_filepath('$table');");
-	my $relfilenode_corrupted =  $node->safe_psql('postgres',
+	my $file_corrupted =
+	  $node->safe_psql('postgres', "SELECT pg_relation_filepath('$table');");
+	my $relfilenode_corrupted = $node->safe_psql('postgres',
 		"SELECT relfilenode FROM pg_class WHERE relname = '$table';");
 
 	# Set page header and block size
@@ -38,9 +39,14 @@ sub check_relation_corruption
 
 	# Checksums are correct for single relfilenode as the table is not
 	# corrupted yet.
-	command_ok(['pg_checksums',  '--check', '-D', $pgdata, '-r',
-			   $relfilenode_corrupted],
-		"succeeds for single relfilenode on tablespace $tablespace with offline cluster");
+	command_ok(
+		[
+			'pg_checksums', '--check',
+			'-D',           $pgdata,
+			'-r',           $relfilenode_corrupted
+		],
+		"succeeds for single relfilenode on tablespace $tablespace with offline cluster"
+	);
 
 	# Time to create some corruption
 	open my $file, '+<', "$pgdata/$file_corrupted";
@@ -49,26 +55,32 @@ sub check_relation_corruption
 	close $file;
 
 	# Checksum checks on single relfilenode fail
-	$node->command_checks_all([ 'pg_checksums', '--check', '-D', $pgdata,
-							  '-r', $relfilenode_corrupted],
-							  1,
-							  [qr/Bad checksums:.*1/],
-							  [qr/checksum verification failed/],
-							  "fails with corrupted data for single relfilenode on tablespace $tablespace");
+	$node->command_checks_all(
+		[
+			'pg_checksums', '--check',
+			'-D',           $pgdata,
+			'-r',           $relfilenode_corrupted
+		],
+		1,
+		[qr/Bad checksums:.*1/],
+		[qr/checksum verification failed/],
+		"fails with corrupted data for single relfilenode on tablespace $tablespace"
+	);
 
 	# Global checksum checks fail as well
-	$node->command_checks_all([ 'pg_checksums', '--check', '-D', $pgdata],
-							  1,
-							  [qr/Bad checksums:.*1/],
-							  [qr/checksum verification failed/],
-							  "fails with corrupted data on tablespace $tablespace");
+	$node->command_checks_all(
+		[ 'pg_checksums', '--check', '-D', $pgdata ],
+		1,
+		[qr/Bad checksums:.*1/],
+		[qr/checksum verification failed/],
+		"fails with corrupted data on tablespace $tablespace");
 
 	# Drop corrupted table again and make sure there is no more corruption.
 	$node->start;
 	$node->safe_psql('postgres', "DROP TABLE $table;");
 	$node->stop;
-	$node->command_ok(['pg_checksums', '--check', '-D', $pgdata],
-	        "succeeds again after table drop on tablespace $tablespace");
+	$node->command_ok([ 'pg_checksums', '--check', '-D', $pgdata ],
+		"succeeds again after table drop on tablespace $tablespace");
 
 	$node->start;
 	return;
@@ -80,19 +92,20 @@ sub check_relation_corruption
 my $pgdata = $node->data_dir;
 
 # Control file should know that checksums are disabled.
-command_like(['pg_controldata', $pgdata],
-	     qr/Data page checksum version:.*0/,
-		 'checksums disabled in control file');
+command_like(
+	[ 'pg_controldata', $pgdata ],
+	qr/Data page checksum version:.*0/,
+	'checksums disabled in control file');
 
 # These are correct but empty files, so they should pass through.
-append_to_file "$pgdata/global/99999", "";
-append_to_file "$pgdata/global/99999.123", "";
-append_to_file "$pgdata/global/99999_fsm", "";
-append_to_file "$pgdata/global/99999_init", "";
-append_to_file "$pgdata/global/99999_vm", "";
+append_to_file "$pgdata/global/99999",          "";
+append_to_file "$pgdata/global/99999.123",      "";
+append_to_file "$pgdata/global/99999_fsm",      "";
+append_to_file "$pgdata/global/99999_init",     "";
+append_to_file "$pgdata/global/99999_vm",       "";
 append_to_file "$pgdata/global/99999_init.123", "";
-append_to_file "$pgdata/global/99999_fsm.123", "";
-append_to_file "$pgdata/global/99999_vm.123", "";
+append_to_file "$pgdata/global/99999_fsm.123",  "";
+append_to_file "$pgdata/global/99999_vm.123",   "";
 
 # These are temporary files and folders with dummy contents, which
 # should be ignored by the scan.
@@ -101,67 +114,75 @@ sub check_relation_corruption
 append_to_file "$pgdata/global/pgsql_tmp/1.1", "foo";
 
 # Enable checksums.
-command_ok(['pg_checksums', '--enable', '--no-sync', '-D', $pgdata],
-	   "checksums successfully enabled in cluster");
+command_ok([ 'pg_checksums', '--enable', '--no-sync', '-D', $pgdata ],
+	"checksums successfully enabled in cluster");
 
 # Successive attempt to enable checksums fails.
-command_fails(['pg_checksums', '--enable', '--no-sync', '-D', $pgdata],
-	      "enabling checksums fails if already enabled");
+command_fails([ 'pg_checksums', '--enable', '--no-sync', '-D', $pgdata ],
+	"enabling checksums fails if already enabled");
 
 # Control file should know that checksums are enabled.
-command_like(['pg_controldata', $pgdata],
-	     qr/Data page checksum version:.*1/,
-	     'checksums enabled in control file');
+command_like(
+	[ 'pg_controldata', $pgdata ],
+	qr/Data page checksum version:.*1/,
+	'checksums enabled in control file');
 
 # Disable checksums again.  Flush result here as that should be cheap.
-command_ok(['pg_checksums', '--disable', '-D', $pgdata],
-	   "checksums successfully disabled in cluster");
+command_ok(
+	[ 'pg_checksums', '--disable', '-D', $pgdata ],
+	"checksums successfully disabled in cluster");
 
 # Successive attempt to disable checksums fails.
-command_fails(['pg_checksums', '--disable', '--no-sync', '-D', $pgdata],
-	      "disabling checksums fails if already disabled");
+command_fails(
+	[ 'pg_checksums', '--disable', '--no-sync', '-D', $pgdata ],
+	"disabling checksums fails if already disabled");
 
 # Control file should know that checksums are disabled.
-command_like(['pg_controldata', $pgdata],
-	     qr/Data page checksum version:.*0/,
-		 'checksums disabled in control file');
+command_like(
+	[ 'pg_controldata', $pgdata ],
+	qr/Data page checksum version:.*0/,
+	'checksums disabled in control file');
 
 # Enable checksums again for follow-up tests.
-command_ok(['pg_checksums', '--enable', '--no-sync', '-D', $pgdata],
-		   "checksums successfully enabled in cluster");
+command_ok([ 'pg_checksums', '--enable', '--no-sync', '-D', $pgdata ],
+	"checksums successfully enabled in cluster");
 
 # Control file should know that checksums are enabled.
-command_like(['pg_controldata', $pgdata],
-	     qr/Data page checksum version:.*1/,
-		 'checksums enabled in control file');
+command_like(
+	[ 'pg_controldata', $pgdata ],
+	qr/Data page checksum version:.*1/,
+	'checksums enabled in control file');
 
 # Checksums pass on a newly-created cluster
-command_ok(['pg_checksums', '--check', '-D', $pgdata],
-		   "succeeds with offline cluster");
+command_ok([ 'pg_checksums', '--check', '-D', $pgdata ],
+	"succeeds with offline cluster");
 
 # Checksums are verified if no other arguments are specified
-command_ok(['pg_checksums', '-D', $pgdata],
-		   "verifies checksums as default action");
+command_ok(
+	[ 'pg_checksums', '-D', $pgdata ],
+	"verifies checksums as default action");
 
 # Specific relation files cannot be requested when action is --disable
 # or --enable.
-command_fails(['pg_checksums', '--disable', '-r', '1234', '-D', $pgdata],
-	      "fails when relfilenodes are requested and action is --disable");
-command_fails(['pg_checksums', '--enable', '-r', '1234', '-D', $pgdata],
-	      "fails when relfilenodes are requested and action is --enable");
+command_fails(
+	[ 'pg_checksums', '--disable', '-r', '1234', '-D', $pgdata ],
+	"fails when relfilenodes are requested and action is --disable");
+command_fails(
+	[ 'pg_checksums', '--enable', '-r', '1234', '-D', $pgdata ],
+	"fails when relfilenodes are requested and action is --enable");
 
 # Checks cannot happen with an online cluster
 $node->start;
-command_fails(['pg_checksums', '--check', '-D', $pgdata],
-			  "fails with online cluster");
+command_fails([ 'pg_checksums', '--check', '-D', $pgdata ],
+	"fails with online cluster");
 
 # Check corruption of table on default tablespace.
 check_relation_corruption($node, 'corrupt1', 'pg_default');
 
 # Create tablespace to check corruptions in a non-default tablespace.
-my $basedir = $node->basedir;
+my $basedir        = $node->basedir;
 my $tablespace_dir = "$basedir/ts_corrupt_dir";
-mkdir ($tablespace_dir);
+mkdir($tablespace_dir);
 $tablespace_dir = TestLib::real_dir($tablespace_dir);
 $node->safe_psql('postgres',
 	"CREATE TABLESPACE ts_corrupt LOCATION '$tablespace_dir';");
@@ -171,19 +192,20 @@ sub check_relation_corruption
 # correctly-named relation files filled with some corrupted data.
 sub fail_corrupt
 {
-	my $node = shift;
-	my $file = shift;
+	my $node   = shift;
+	my $file   = shift;
 	my $pgdata = $node->data_dir;
 
 	# Create the file with some dummy data in it.
 	my $file_name = "$pgdata/global/$file";
 	append_to_file $file_name, "foo";
 
-	$node->command_checks_all([ 'pg_checksums', '--check', '-D', $pgdata],
-						  1,
-						  [qr/^$/],
-						  [qr/could not read block 0 in file.*$file\":/],
-						  "fails for corrupted data in $file");
+	$node->command_checks_all(
+		[ 'pg_checksums', '--check', '-D', $pgdata ],
+		1,
+		[qr/^$/],
+		[qr/could not read block 0 in file.*$file\":/],
+		"fails for corrupted data in $file");
 
 	# Remove file to prevent future lookup errors on conflicts.
 	unlink $file_name;

src/bin/pg_ctl/t/001_start_stop.pl

@@ -26,6 +26,7 @@
 print $conf "fsync = off\n";
 print $conf TestLib::slurp_file($ENV{TEMP_CONFIG})
   if defined $ENV{TEMP_CONFIG};
+
 if (!$windows_os)
 {
 	print $conf "listen_addresses = ''\n";

src/bin/pg_ctl/t/004_logrotate.pl

@@ -25,8 +25,10 @@
 
 note "current_logfiles = $current_logfiles";
 
-like($current_logfiles, qr|^stderr log/postgresql-.*log$|,
-	 'current_logfiles is sane');
+like(
+	$current_logfiles,
+	qr|^stderr log/postgresql-.*log$|,
+	'current_logfiles is sane');
 
 my $lfname = $current_logfiles;
 $lfname =~ s/^stderr //;
@@ -43,8 +45,7 @@
 	usleep(100_000);
 }
 
-like($first_logfile, qr/division by zero/,
-	 'found expected log file content');
+like($first_logfile, qr/division by zero/, 'found expected log file content');
 
 # Sleep 2 seconds and ask for log rotation; this should result in
 # output into a different log file name.
@@ -63,8 +64,10 @@
 
 note "now current_logfiles = $new_current_logfiles";
 
-like($new_current_logfiles, qr|^stderr log/postgresql-.*log$|,
-	 'new current_logfiles is sane');
+like(
+	$new_current_logfiles,
+	qr|^stderr log/postgresql-.*log$|,
+	'new current_logfiles is sane');
 
 $lfname = $new_current_logfiles;
 $lfname =~ s/^stderr //;
@@ -82,7 +85,9 @@
 	usleep(100_000);
 }
 
-like($second_logfile, qr/syntax error/,
-	 'found expected log file content in new log file');
+like(
+	$second_logfile,
+	qr/syntax error/,
+	'found expected log file content in new log file');
 
 $node->stop();