Run perltidy

A follow-up patch will adjust the TAP tests to follow a more-structured
format for option lists in commands, that perltidy is able to cope
better with.  Putting the tree first in a clean state makes the next
change a bit easier.  v20230309 has been used.

Author: Dagfinn Ilmari Mannsåker
Discussion: https://postgr.es/m/87jzc46d8u.fsf@wibble.ilmari.org

diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
index 6f4c6c2b5860cc67c88a3423f1da5934902abafa..9ef9f65dd700cf927c80c80ba574878386eb854d 100644 (file)
--- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl
+++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
@@ -364,7 +364,7 @@ my $sys_tempdir = PostgreSQL::Test::Utils::tempdir_short;
 # drives.
 rmdir("$pgdata/pg_replslot")
   or BAIL_OUT "could not remove $pgdata/pg_replslot";
-mkdir("$sys_tempdir/pg_replslot"); # if this fails the symlink will fail
+mkdir("$sys_tempdir/pg_replslot");    # if this fails the symlink will fail
 dir_symlink("$sys_tempdir/pg_replslot", "$pgdata/pg_replslot")
   or BAIL_OUT "could not symlink to $pgdata/pg_replslot";
 

diff --git a/src/bin/pg_combinebackup/t/008_promote.pl b/src/bin/pg_combinebackup/t/008_promote.pl
index 2145e75e44b8d61cb78a441dffec6160d8d42cb2..7835364a9b0d13dbae591c3ed2bdbaf70880f68b 100644 (file)
--- a/src/bin/pg_combinebackup/t/008_promote.pl
+++ b/src/bin/pg_combinebackup/t/008_promote.pl
@@ -55,7 +55,8 @@ EOM
 $node2->start();
 
 # Wait until recovery pauses, then promote.
-$node2->poll_query_until('postgres', "SELECT pg_get_wal_replay_pause_state() = 'paused';");
+$node2->poll_query_until('postgres',
+   "SELECT pg_get_wal_replay_pause_state() = 'paused';");
 $node2->safe_psql('postgres', "SELECT pg_promote()");
 
 # Once promotion occurs, insert a second row on the new node.
@@ -68,14 +69,16 @@ EOM
 # timeline change correctly, something should break at this point.
 my $backup2path = $node1->backup_dir . '/backup2';
 $node2->command_ok(
-   [ 'pg_basebackup', '-D', $backup2path, '--no-sync', '-cfast',
-     '--incremental', $backup1path . '/backup_manifest' ],
+   [
+       'pg_basebackup', '-D', $backup2path, '--no-sync', '-cfast',
+       '--incremental', $backup1path . '/backup_manifest'
+   ],
    "incremental backup from node2");
 
 # Restore the incremental backup and use it to create a new node.
 my $node3 = PostgreSQL::Test::Cluster->new('node3');
 $node3->init_from_backup($node1, 'backup2',
-                        combine_with_prior => [ 'backup1' ]);
+   combine_with_prior => ['backup1']);
 $node3->start();
 
 done_testing();

diff --git a/src/bin/pg_combinebackup/t/009_no_full_file.pl b/src/bin/pg_combinebackup/t/009_no_full_file.pl
index ff4f035b38606cf2aa85f796b9029b382e6410b1..18218ad7a60cef8cfd5a9e559c080b98a7fd5f15 100644 (file)
--- a/src/bin/pg_combinebackup/t/009_no_full_file.pl
+++ b/src/bin/pg_combinebackup/t/009_no_full_file.pl
@@ -46,9 +46,9 @@ for my $iname (@filelist)
    if (-f "$backup1path/base/1/$name")
    {
        copy("$backup2path/base/1/$iname", "$backup1path/base/1/$iname")
-           || die "copy $backup2path/base/1/$iname: $!";
+         || die "copy $backup2path/base/1/$iname: $!";
        unlink("$backup1path/base/1/$name")
-           || die "unlink $backup1path/base/1/$name: $!";
+         || die "unlink $backup1path/base/1/$name: $!";
        $success = 1;
        last;
    }
@@ -57,9 +57,7 @@ for my $iname (@filelist)
 # pg_combinebackup should fail.
 my $outpath = $primary->backup_dir . '/out';
 $primary->command_fails_like(
-   [
-       'pg_combinebackup', $backup1path, $backup2path, '-o', $outpath,
-   ],
+   [ 'pg_combinebackup', $backup1path, $backup2path, '-o', $outpath, ],
    qr/full backup contains unexpected incremental file/,
    "pg_combinebackup fails");
 

diff --git a/src/bin/pg_verifybackup/t/002_algorithm.pl b/src/bin/pg_verifybackup/t/002_algorithm.pl
index 36edad8cd02599a735f3b5aac69f45caddff0b33..71aaa8d881f733bb483aee5676e898f1ea195008 100644 (file)
--- a/src/bin/pg_verifybackup/t/002_algorithm.pl
+++ b/src/bin/pg_verifybackup/t/002_algorithm.pl
@@ -42,7 +42,8 @@ sub test_checksums
    }
 
    # A backup with a valid algorithm should work.
-   $primary->command_ok(\@backup, "$format format backup ok with algorithm \"$algorithm\"");
+   $primary->command_ok(\@backup,
+       "$format format backup ok with algorithm \"$algorithm\"");
 
    # We expect each real checksum algorithm to be mentioned on every line of
    # the backup manifest file except the first and last; for simplicity, we
@@ -50,7 +51,8 @@ sub test_checksums
    # is none, we just check that the manifest exists.
    if ($algorithm eq 'none')
    {
-       ok(-f "$backup_path/backup_manifest", "$format format backup manifest exists");
+       ok( -f "$backup_path/backup_manifest",
+           "$format format backup manifest exists");
    }
    else
    {

diff --git a/src/bin/pg_verifybackup/t/003_corruption.pl b/src/bin/pg_verifybackup/t/003_corruption.pl
index 1111b09637dfd5aa92e2ead4e455ae080db65509..a2aa767cff600217f421395251474ce8aa33a11b 100644 (file)
--- a/src/bin/pg_verifybackup/t/003_corruption.pl
+++ b/src/bin/pg_verifybackup/t/003_corruption.pl
@@ -60,12 +60,14 @@ my @scenario = (
    {
        'name' => 'append_to_file',
        'mutilate' => \&mutilate_append_to_file,
-       'fails_like' => qr/has size \d+ (on disk|in "[^"]+") but size \d+ in the manifest/
+       'fails_like' =>
+         qr/has size \d+ (on disk|in "[^"]+") but size \d+ in the manifest/
    },
    {
        'name' => 'truncate_file',
        'mutilate' => \&mutilate_truncate_file,
-       'fails_like' => qr/has size 0 (on disk|in "[^"]+") but size \d+ in the manifest/
+       'fails_like' =>
+         qr/has size 0 (on disk|in "[^"]+") but size \d+ in the manifest/
    },
    {
        'name' => 'replace_file',
@@ -147,8 +149,9 @@ for my $scenario (@scenario)
        # same problem, unless the scenario needs UNIX permissions or we don't
        # have a TAR program available. Note that this destructively modifies
        # the backup directory.
-       if (! $scenario->{'needs_unix_permissions'} ||
-           !defined $tar || $tar eq '')
+       if (   !$scenario->{'needs_unix_permissions'}
+           || !defined $tar
+           || $tar eq '')
        {
            my $tar_backup_path = $primary->backup_dir . '/tar_' . $name;
            mkdir($tar_backup_path) || die "mkdir $tar_backup_path: $!";
@@ -156,14 +159,15 @@ for my $scenario (@scenario)
            # tar and then remove each tablespace. We remove the original files
            # so that they don't also end up in base.tar.
            my @tsoid = grep { $_ ne '.' && $_ ne '..' }
-               slurp_dir("$backup_path/pg_tblspc");
+             slurp_dir("$backup_path/pg_tblspc");
            my $cwd = getcwd;
            for my $tsoid (@tsoid)
            {
                my $tspath = $backup_path . '/pg_tblspc/' . $tsoid;
 
                chdir($tspath) || die "chdir: $!";
-               command_ok([ $tar, '-cf', "$tar_backup_path/$tsoid.tar", '.' ]);
+               command_ok(
+                   [ $tar, '-cf', "$tar_backup_path/$tsoid.tar", '.' ]);
                chdir($cwd) || die "chdir: $!";
                rmtree($tspath);
            }
@@ -175,9 +179,10 @@ for my $scenario (@scenario)
            rmtree($backup_path . '/pg_wal');
 
            # move the backup manifest
-           move($backup_path . '/backup_manifest',
-               $tar_backup_path . '/backup_manifest')
-               or die "could not copy manifest to $tar_backup_path";
+           move(
+               $backup_path . '/backup_manifest',
+               $tar_backup_path . '/backup_manifest'
+           ) or die "could not copy manifest to $tar_backup_path";
 
            # Construct base.tar with what's left.
            chdir($backup_path) || die "chdir: $!";

diff --git a/src/bin/pg_verifybackup/t/004_options.pl b/src/bin/pg_verifybackup/t/004_options.pl
index 908a7992b80fded03d62277dcd1c331fd3d353b2..e6d94b9ad518530ab3c00674aea460e1071fb43c 100644 (file)
--- a/src/bin/pg_verifybackup/t/004_options.pl
+++ b/src/bin/pg_verifybackup/t/004_options.pl
@@ -29,8 +29,7 @@ is($stdout, '', "-q succeeds: no stdout");
 is($stderr, '', "-q succeeds: no stderr");
 
 # Should still work if we specify -Fp.
-$primary->command_ok(
-   [ 'pg_verifybackup', '-Fp', $backup_path ],
+$primary->command_ok([ 'pg_verifybackup', '-Fp', $backup_path ],
    "verifies with -Fp");
 
 # Should not work if we specify -Fy because that's invalid.

diff --git a/src/bin/pg_verifybackup/t/008_untar.pl b/src/bin/pg_verifybackup/t/008_untar.pl
index 480c07f3828049c0f12830321ead4d72a0933194..590c497503ccf23cbc2587d2d323bb0e69bf9e36 100644 (file)
--- a/src/bin/pg_verifybackup/t/008_untar.pl
+++ b/src/bin/pg_verifybackup/t/008_untar.pl
@@ -20,12 +20,14 @@ $primary->start;
 my $source_ts_path = PostgreSQL::Test::Utils::tempdir_short();
 
 # Create a tablespace with table in it.
-$primary->safe_psql('postgres', qq(
+$primary->safe_psql(
+   'postgres', qq(
        CREATE TABLESPACE regress_ts1 LOCATION '$source_ts_path';
        SELECT oid FROM pg_tablespace WHERE spcname = 'regress_ts1';
        CREATE TABLE regress_tbl1(i int) TABLESPACE regress_ts1;
        INSERT INTO regress_tbl1 VALUES(generate_series(1,5));));
-my $tsoid = $primary->safe_psql('postgres', qq(
+my $tsoid = $primary->safe_psql(
+   'postgres', qq(
        SELECT oid FROM pg_tablespace WHERE spcname = 'regress_ts1'));
 
 my $backup_path = $primary->backup_dir . '/server-backup';
@@ -35,7 +37,7 @@ my @test_configuration = (
    {
        'compression_method' => 'none',
        'backup_flags' => [],
-       'backup_archive' => ['base.tar', "$tsoid.tar"],
+       'backup_archive' => [ 'base.tar', "$tsoid.tar" ],
        'enabled' => 1
    },
    {
@@ -47,7 +49,7 @@ my @test_configuration = (
    {
        'compression_method' => 'lz4',
        'backup_flags' => [ '--compress', 'server-lz4' ],
-       'backup_archive' => ['base.tar.lz4', "$tsoid.tar.lz4" ],
+       'backup_archive' => [ 'base.tar.lz4', "$tsoid.tar.lz4" ],
        'enabled' => check_pg_config("#define USE_LZ4 1")
    },
    {
@@ -95,7 +97,7 @@ for my $tc (@test_configuration)
            "found expected backup files, compression $method");
 
        # Verify tar backup.
-       $primary->command_ok(['pg_verifybackup', '-n', '-e', $backup_path],
+       $primary->command_ok([ 'pg_verifybackup', '-n', '-e', $backup_path ],
            "verify backup, compression $method");
 
        # Cleanup.

diff --git a/src/bin/pg_verifybackup/t/010_client_untar.pl b/src/bin/pg_verifybackup/t/010_client_untar.pl
index 46a598943a758ae63717ee4df0cd4e793969d954..723f5f16c109ae3a5959c2d8a8e05dc577294987 100644 (file)
--- a/src/bin/pg_verifybackup/t/010_client_untar.pl
+++ b/src/bin/pg_verifybackup/t/010_client_untar.pl
@@ -108,7 +108,7 @@ for my $tc (@test_configuration)
            "found expected backup files, compression $method");
 
        # Verify tar backup.
-       $primary->command_ok( [ 'pg_verifybackup', '-n', '-e', $backup_path ],
+       $primary->command_ok([ 'pg_verifybackup', '-n', '-e', $backup_path ],
            "verify backup, compression $method");
 
        # Cleanup.

diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm
index a92944e0d9cf318d2530042d704d5fe04d0ecf48..f521ad0b12ffd16e899db3c61c6ee47a1592ffdd 100644 (file)
--- a/src/test/perl/PostgreSQL/Test/Cluster.pm
+++ b/src/test/perl/PostgreSQL/Test/Cluster.pm
@@ -1214,7 +1214,8 @@ sub stop
 
    print "### Stopping node \"$name\" using mode $mode\n";
    my @cmd = ('pg_ctl', '-D', $pgdata, '-m', $mode, 'stop');
-   if ($params{timeout}) {
+   if ($params{timeout})
+   {
        push(@cmd, ('--timeout', $params{timeout}));
    }
    $ret = PostgreSQL::Test::Utils::system_log(@cmd);

diff --git a/src/test/recovery/t/035_standby_logical_decoding.pl b/src/test/recovery/t/035_standby_logical_decoding.pl
index c810610328f1d4b327d360998d81e2a5b813ab80..16ac929928397ef656566df4fedeb40cfec50feb 100644 (file)
--- a/src/test/recovery/t/035_standby_logical_decoding.pl
+++ b/src/test/recovery/t/035_standby_logical_decoding.pl
@@ -529,12 +529,14 @@ check_slots_conflict_reason('vacuum_full_', 'rows_removed');
 
 # Attempting to alter an invalidated slot should result in an error
 ($result, $stdout, $stderr) = $node_standby->psql(
-    'postgres',
-    qq[ALTER_REPLICATION_SLOT vacuum_full_inactiveslot (failover);],
-    replication => 'database');
-ok($stderr =~ /ERROR:  cannot alter invalid replication slot "vacuum_full_inactiveslot"/ &&
-   $stderr =~ /DETAIL:  This replication slot has been invalidated due to "rows_removed"./,
-    "invalidated slot cannot be altered");
+   'postgres',
+   qq[ALTER_REPLICATION_SLOT vacuum_full_inactiveslot (failover);],
+   replication => 'database');
+ok( $stderr =~
+     /ERROR:  cannot alter invalid replication slot "vacuum_full_inactiveslot"/
+     && $stderr =~
+     /DETAIL:  This replication slot has been invalidated due to "rows_removed"./,
+   "invalidated slot cannot be altered");
 
 # Ensure that replication slot stats are not removed after invalidation.
 is( $node_standby->safe_psql(

diff --git a/src/test/recovery/t/040_standby_failover_slots_sync.pl b/src/test/recovery/t/040_standby_failover_slots_sync.pl
index 55d7956b188cd06e3bfb394e57441f05cb42d256..50388a494d6250a3270763d309166702699aea94 100644 (file)
--- a/src/test/recovery/t/040_standby_failover_slots_sync.pl
+++ b/src/test/recovery/t/040_standby_failover_slots_sync.pl
@@ -95,7 +95,8 @@ $subscriber1->safe_psql('postgres',
 # Disable failover for enabled subscription
 my ($result, $stdout, $stderr) = $subscriber1->psql('postgres',
    "ALTER SUBSCRIPTION regress_mysub1 SET (failover = false)");
-ok( $stderr =~ /ERROR:  cannot set option "failover" for enabled subscription/,
+ok( $stderr =~
+     /ERROR:  cannot set option "failover" for enabled subscription/,
    "altering failover is not allowed for enabled subscription");
 
 ##################################################
@@ -280,7 +281,8 @@ $standby1->safe_psql('postgres', "SELECT pg_sync_replication_slots();");
 
 # Confirm that the invalidated slot has been dropped.
 $standby1->wait_for_log(
-   qr/dropped replication slot "lsub1_slot" of database with OID [0-9]+/, $log_offset);
+   qr/dropped replication slot "lsub1_slot" of database with OID [0-9]+/,
+   $log_offset);
 
 # Confirm that the logical slot has been re-created on the standby and is
 # flagged as 'synced'

diff --git a/src/test/ssl/t/SSL/Server.pm b/src/test/ssl/t/SSL/Server.pm
index 01bc4175585add20d95a5b222340ec0926f2dea7..447469d893731be859af0d43b85f9d5b5c8ae150 100644 (file)
--- a/src/test/ssl/t/SSL/Server.pm
+++ b/src/test/ssl/t/SSL/Server.pm
@@ -302,7 +302,8 @@ sub switch_server_cert
    $node->append_conf('sslconfig.conf', $backend->set_server_cert(\%params));
    # use lists of ECDH curves and cipher suites for syntax testing
    $node->append_conf('sslconfig.conf', 'ssl_groups=prime256v1:secp521r1');
-   $node->append_conf('sslconfig.conf', 'ssl_tls13_ciphers=TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256');
+   $node->append_conf('sslconfig.conf',
+       'ssl_tls13_ciphers=TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256');
 
    $node->append_conf('sslconfig.conf',
        "ssl_passphrase_command='" . $params{passphrase_cmd} . "'")

diff --git a/src/tools/add_commit_links.pl b/src/tools/add_commit_links.pl
index 34c4d7ad8983b63d5865683aaad05bf2035e7275..710a6492032096ba5129a88e0616f15c0558acdb 100755 (executable)
--- a/src/tools/add_commit_links.pl
+++ b/src/tools/add_commit_links.pl
@@ -62,8 +62,9 @@ sub process_file
 
        # skip over commit links because we will add them below
        next
-         if (!$in_comment &&
-           m{^\s*<ulink url="&commit_baseurl;[[:xdigit:]]+">&sect;</ulink>\s*$});
+         if (!$in_comment
+           && m{^\s*<ulink url="&commit_baseurl;[[:xdigit:]]+">&sect;</ulink>\s*$}
+         );
 
        if ($in_comment && m/\[([[:xdigit:]]+)\]/)
        {
@@ -73,10 +74,10 @@ sub process_file
            (!m/^Branch:/) && push(@hashes, $hash);
 
            # minor release item
-           m/^Branch:/ &&
-             defined($major_version) &&
-             m/_${major_version}_/ &&
-             push(@hashes, $hash);
+           m/^Branch:/
+             && defined($major_version)
+             && m/_${major_version}_/
+             && push(@hashes, $hash);
        }
 
        if (!$in_comment && m{</para>})

diff --git a/src/tools/pg_bsd_indent/t/001_pg_bsd_indent.pl b/src/tools/pg_bsd_indent/t/001_pg_bsd_indent.pl
index cbb5769d0041f7dfb27f2b9ba29b2608ad49e411..c329d7b06d49989945105aab603df2a4fd1fb91f 100644 (file)
--- a/src/tools/pg_bsd_indent/t/001_pg_bsd_indent.pl
+++ b/src/tools/pg_bsd_indent/t/001_pg_bsd_indent.pl
@@ -49,7 +49,8 @@ while (my $test_src = glob("$src_dir/tests/*.0"))
        ],
        "pg_bsd_indent succeeds on $test");
    # check result matches, adding any diff to $diffs_file
-   my $result = run_log([ 'diff', @diffopts, "$test_src.stdout", "$test.out" ],
+   my $result =
+     run_log([ 'diff', @diffopts, "$test_src.stdout", "$test.out" ],
        '>>', $diffs_file);
    ok($result, "pg_bsd_indent output matches for $test");
 }