Skip to content

Commit 7dcc6f8

Browse files
michaelpqmichaelpq
committed
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.
1 parent 5450820 commit 7dcc6f8

File tree

8 files changed

+50
-24
lines changed

8 files changed

+50
-24
lines changed

‎src/bin/pg_basebackup/t/040_pg_createsubscriber.pl‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,10 +289,13 @@ sub generate_db
289289
# Create failover slot to test its removal
290290
my $fslotname = 'failover_slot';
291291
$node_p->safe_psql($db1,
292-
"SELECT pg_create_logical_replication_slot('$fslotname', 'pgoutput', false, false, true)");
292+
"SELECT pg_create_logical_replication_slot('$fslotname', 'pgoutput', false, false, true)"
293+
);
293294
$node_s->start;
294295
$node_s->safe_psql('postgres', "SELECT pg_sync_replication_slots()");
295-
my $result = $node_s->safe_psql('postgres', "SELECT slot_name FROM pg_replication_slots WHERE slot_name = '$fslotname' AND synced AND NOT temporary");
296+
my $result = $node_s->safe_psql('postgres',
297+
"SELECT slot_name FROM pg_replication_slots WHERE slot_name = '$fslotname' AND synced AND NOT temporary"
298+
);
296299
is($result, 'failover_slot', 'failover slot is synced');
297300
$node_s->stop;
298301

@@ -381,7 +384,8 @@ sub generate_db
381384

382385
# Confirm the failover slot has been removed
383386
$result = $node_s->safe_psql($db1,
384-
"SELECT count(*) FROM pg_replication_slots WHERE slot_name = '$fslotname'");
387+
"SELECT count(*) FROM pg_replication_slots WHERE slot_name = '$fslotname'"
388+
);
385389
is($result, qq(0), 'failover slot was removed');
386390

387391
# Check result on database $db1

‎src/bin/pg_combinebackup/t/003_timeline.pl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@
7272

7373
# Restore the incremental backup and use it to create a new node.
7474
my $node3 = PostgreSQL::Test::Cluster->new('node3');
75-
$node3->init_from_backup($node1, 'backup3',
75+
$node3->init_from_backup(
76+
$node1, 'backup3',
7677
combine_with_prior => [ 'backup1', 'backup2' ],
7778
combine_mode => $mode);
7879
$node3->start();

‎src/bin/pg_combinebackup/t/004_manifest.pl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ sub combine_and_test_one_backup
5858
combine_and_test_one_backup('nomanifest',
5959
qr/could not open file.*backup_manifest/,
6060
'--no-manifest');
61-
combine_and_test_one_backup('csum_none', undef, '--manifest-checksums=NONE', $mode);
61+
combine_and_test_one_backup('csum_none', undef, '--manifest-checksums=NONE',
62+
$mode);
6263
combine_and_test_one_backup('csum_sha224',
6364
undef, '--manifest-checksums=SHA224', $mode);
6465

‎src/bin/pg_combinebackup/t/005_integrity.pl‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,19 @@
8484

8585
# Can't combine 2 full backups.
8686
$node1->command_fails_like(
87-
[ 'pg_combinebackup', $backup1path, $backup1path, '-o', $resultpath, $mode ],
87+
[
88+
'pg_combinebackup', $backup1path, $backup1path, '-o',
89+
$resultpath, $mode
90+
],
8891
qr/is a full backup, but only the first backup should be a full backup/,
8992
"can't combine full backups");
9093

9194
# Can't combine 2 incremental backups.
9295
$node1->command_fails_like(
93-
[ 'pg_combinebackup', $backup2path, $backup2path, '-o', $resultpath, $mode ],
96+
[
97+
'pg_combinebackup', $backup2path, $backup2path, '-o',
98+
$resultpath, $mode
99+
],
94100
qr/is an incremental backup, but the first backup should be a full backup/,
95101
"can't combine full backups");
96102

@@ -121,7 +127,10 @@
121127

122128
# Can't omit a required backup.
123129
$node1->command_fails_like(
124-
[ 'pg_combinebackup', $backup1path, $backup3path, '-o', $resultpath, $mode ],
130+
[
131+
'pg_combinebackup', $backup1path, $backup3path, '-o',
132+
$resultpath, $mode
133+
],
125134
qr/starts at LSN.*but expected/,
126135
"can't omit a required backup");
127136

@@ -154,13 +163,21 @@
154163

155164
# Can combine result of previous step with second incremental.
156165
$node1->command_ok(
157-
[ 'pg_combinebackup', $synthetic12path, $backup3path, '-o', $resultpath, $mode ],
166+
[
167+
'pg_combinebackup', $synthetic12path,
168+
$backup3path, '-o',
169+
$resultpath, $mode
170+
],
158171
"can combine synthetic backup with later incremental");
159172
rmtree($resultpath);
160173

161174
# Can't combine result of 1+2 with 2.
162175
$node1->command_fails_like(
163-
[ 'pg_combinebackup', $synthetic12path, $backup2path, '-o', $resultpath, $mode ],
176+
[
177+
'pg_combinebackup', $synthetic12path,
178+
$backup2path, '-o',
179+
$resultpath, $mode
180+
],
164181
qr/starts at LSN.*but expected/,
165182
"can't combine synthetic backup with included incremental");
166183

‎src/bin/pg_combinebackup/t/006_db_file_copy.pl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949

5050
# Recover the incremental backup.
5151
my $restore = PostgreSQL::Test::Cluster->new('restore');
52-
$restore->init_from_backup($primary, 'backup2',
52+
$restore->init_from_backup(
53+
$primary, 'backup2',
5354
combine_with_prior => ['backup1'],
5455
combine_mode => $mode);
5556
$restore->start();

‎src/bin/pg_rewind/t/003_extrafiles.pl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ sub run_test
5555
"$test_standby_datadir/tst_standby_dir/standby_subdir/standby_file4",
5656
"in standby4";
5757
# Skip testing .DS_Store files on macOS to avoid risk of side effects
58-
append_to_file
59-
"$test_standby_datadir/tst_standby_dir/.DS_Store", "macOS system file"
58+
append_to_file "$test_standby_datadir/tst_standby_dir/.DS_Store",
59+
"macOS system file"
6060
unless ($Config{osname} eq 'darwin');
6161

6262
mkdir "$test_primary_datadir/tst_primary_dir";

‎src/bin/pg_verifybackup/t/003_corruption.pl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@
108108
SKIP:
109109
{
110110
skip "unix-style permissions not supported on Windows", 4
111-
if ($scenario->{'skip_on_windows'} &&
112-
($windows_os || $Config::Config{osname} eq 'cygwin'));
111+
if ($scenario->{'skip_on_windows'}
112+
&& ($windows_os || $Config::Config{osname} eq 'cygwin'));
113113

114114
# Take a backup and check that it verifies OK.
115115
my $backup_path = $primary->backup_dir . '/' . $name;

‎src/test/recovery/t/009_twophase.pl‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -330,32 +330,34 @@ sub configure_and_reload
330330
$cur_standby->restart;
331331

332332
# Acquire a snapshot in standby, before we commit the prepared transaction
333-
my $standby_session = $cur_standby->background_psql('postgres', on_error_die => 1);
333+
my $standby_session =
334+
$cur_standby->background_psql('postgres', on_error_die => 1);
334335
$standby_session->query_safe("BEGIN ISOLATION LEVEL REPEATABLE READ");
335-
$psql_out = $standby_session->query_safe(
336-
"SELECT count(*) FROM t_009_tbl_standby_mvcc");
336+
$psql_out =
337+
$standby_session->query_safe("SELECT count(*) FROM t_009_tbl_standby_mvcc");
337338
is($psql_out, '0',
338339
"Prepared transaction not visible in standby before commit");
339340

340341
# Commit the transaction in primary
341342
$cur_primary->start;
342-
$cur_primary->psql('postgres', "
343+
$cur_primary->psql(
344+
'postgres', "
343345
SET synchronous_commit='remote_apply'; -- To ensure the standby is caught up
344346
COMMIT PREPARED 'xact_009_standby_mvcc';
345347
");
346348

347349
# Still not visible to the old snapshot
348-
$psql_out = $standby_session->query_safe(
349-
"SELECT count(*) FROM t_009_tbl_standby_mvcc");
350+
$psql_out =
351+
$standby_session->query_safe("SELECT count(*) FROM t_009_tbl_standby_mvcc");
350352
is($psql_out, '0',
351353
"Committed prepared transaction not visible to old snapshot in standby");
352354

353355
# Is visible to a new snapshot
354356
$standby_session->query_safe("COMMIT");
355-
$psql_out = $standby_session->query_safe(
356-
"SELECT count(*) FROM t_009_tbl_standby_mvcc");
357+
$psql_out =
358+
$standby_session->query_safe("SELECT count(*) FROM t_009_tbl_standby_mvcc");
357359
is($psql_out, '2',
358-
"Committed prepared transaction is visible to new snapshot in standby");
360+
"Committed prepared transaction is visible to new snapshot in standby");
359361
$standby_session->quit;
360362

361363
###############################################################################

0 commit comments

Comments
 (0)