Skip to content

Commit 82d0ffa

Browse files
tglsfdctglsfdc
committed
pgindent run prior to branching v15.
pgperltidy and reformat-dat-files too. Not many changes.
1 parent f5135d2 commit 82d0ffa

File tree

8 files changed

+37
-17
lines changed

8 files changed

+37
-17
lines changed

‎src/backend/access/transam/xact.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ bool bsysscan = false;
122122
* lookups as fast as possible.
123123
*/
124124
static FullTransactionId XactTopFullTransactionId = {InvalidTransactionId};
125-
static int nParallelCurrentXids = 0;
125+
static int nParallelCurrentXids = 0;
126126
static TransactionId *ParallelCurrentXids;
127127

128128
/*

‎src/bin/pg_dump/t/010_dump_connstr.pl

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
. generate_ascii_string(1, 9)
3131
. generate_ascii_string(11, 12)
3232
. generate_ascii_string(14, 33)
33-
. ($PostgreSQL::Test::Utils::windows_os
33+
. (
34+
$PostgreSQL::Test::Utils::windows_os
3435
? ''
3536
: '"x"') # IPC::Run mishandles '"' on Windows
3637
. generate_ascii_string(35, 43) # skip ','

‎src/bin/pg_upgrade/t/002_pg_upgrade.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ sub generate_db
244244
'-P', $newnode->port, '--check'
245245
],
246246
'run of pg_upgrade --check for new instance');
247-
ok( !-d $newnode->data_dir . "/pg_upgrade_output.d",
247+
ok(!-d $newnode->data_dir . "/pg_upgrade_output.d",
248248
"pg_upgrade_output.d/ not removed after pg_upgrade --check success");
249249

250250
# Actual run, pg_upgrade_output.d is removed at the end.

‎src/bin/psql/t/001_basic.pl

+10-3
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,17 @@ sub psql_fails_like
9090

9191
# test \timing with query that fails
9292
{
93-
my ($ret, $stdout, $stderr) = $node->psql('postgres', "\\timing on\nSELECT error");
93+
my ($ret, $stdout, $stderr) =
94+
$node->psql('postgres', "\\timing on\nSELECT error");
9495
isnt($ret, 0, '\timing with query error: query failed');
95-
like($stdout, qr/^Time: \d+[.,]\d\d\d ms/m, '\timing with query error: timing output appears');
96-
unlike($stdout, qr/^Time: 0[.,]000 ms/m, '\timing with query error: timing was updated');
96+
like(
97+
$stdout,
98+
qr/^Time: \d+[.,]\d\d\d ms/m,
99+
'\timing with query error: timing output appears');
100+
unlike(
101+
$stdout,
102+
qr/^Time: 0[.,]000 ms/m,
103+
'\timing with query error: timing was updated');
97104
}
98105

99106
# test that ENCODING variable is set and that it is updated when

‎src/include/catalog/pg_proc.dat

+3-2
Original file line numberDiff line numberDiff line change
@@ -11676,8 +11676,9 @@
1167611676
{ oid => '6119', descr => 'get information of tables in a publication',
1167711677
proname => 'pg_get_publication_tables', prorows => '1000', proretset => 't',
1167811678
provolatile => 's', prorettype => 'record', proargtypes => 'text',
11679-
proallargtypes => '{text,oid,int2vector,pg_node_tree}', proargmodes => '{i,o,o,o}',
11680-
proargnames => '{pubname,relid,attrs,qual}', prosrc => 'pg_get_publication_tables' },
11679+
proallargtypes => '{text,oid,int2vector,pg_node_tree}',
11680+
proargmodes => '{i,o,o,o}', proargnames => '{pubname,relid,attrs,qual}',
11681+
prosrc => 'pg_get_publication_tables' },
1168111682
{ oid => '6121',
1168211683
descr => 'returns whether a relation can be part of a publication',
1168311684
proname => 'pg_relation_is_publishable', provolatile => 's',

‎src/test/subscription/t/013_partition.pl

+5-2
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,9 @@ BEGIN
851851

852852
$result = $node_subscriber2->safe_psql('postgres',
853853
"SELECT a, b, c FROM tab5 ORDER BY 1");
854-
is($result, qq(3|1|), 'updates of tab5 replicated correctly after altering table on subscriber');
854+
is($result, qq(3|1|),
855+
'updates of tab5 replicated correctly after altering table on subscriber'
856+
);
855857

856858
# Test that replication into the partitioned target table continues to
857859
# work correctly when the published table is altered.
@@ -866,7 +868,8 @@ BEGIN
866868

867869
$result = $node_subscriber2->safe_psql('postgres',
868870
"SELECT a, b, c FROM tab5 ORDER BY 1");
869-
is($result, qq(3||1), 'updates of tab5 replicated correctly after altering table on publisher');
871+
is($result, qq(3||1),
872+
'updates of tab5 replicated correctly after altering table on publisher');
870873

871874
# Test that replication works correctly as long as the leaf partition
872875
# has the necessary REPLICA IDENTITY, even though the actual target

‎src/test/subscription/t/027_nosuperuser.pl

+4-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,10 @@ sub grant_bypassrls
178178
revoke_superuser("regress_admin");
179179
publish_update("alice.unpartitioned", 5 => 9);
180180
expect_failure(
181-
"alice.unpartitioned", 2, 5, 7,
181+
"alice.unpartitioned",
182+
2,
183+
5,
184+
7,
182185
qr/ERROR: ( [A-Z0-9]+:)? permission denied for table unpartitioned/msi,
183186
"non-superuser admin fails to replicate update");
184187
grant_superuser("regress_admin");

‎src/test/subscription/t/031_column_list.pl

+11-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
$node_subscriber->start;
2121

2222
my $publisher_connstr = $node_publisher->connstr . ' dbname=postgres';
23-
my $offset = 0;
23+
my $offset = 0;
2424

2525
sub wait_for_subscription_sync
2626
{
@@ -1169,13 +1169,15 @@ sub wait_for_subscription_sync
11691169
# TEST: With a table included in multiple publications with different column
11701170
# lists, we should catch the error when creating the subscription.
11711171

1172-
$node_publisher->safe_psql('postgres', qq(
1172+
$node_publisher->safe_psql(
1173+
'postgres', qq(
11731174
CREATE TABLE test_mix_1 (a int PRIMARY KEY, b int, c int);
11741175
CREATE PUBLICATION pub_mix_1 FOR TABLE test_mix_1 (a, b);
11751176
CREATE PUBLICATION pub_mix_2 FOR TABLE test_mix_1 (a, c);
11761177
));
11771178

1178-
$node_subscriber->safe_psql('postgres', qq(
1179+
$node_subscriber->safe_psql(
1180+
'postgres', qq(
11791181
DROP SUBSCRIPTION sub1;
11801182
CREATE TABLE test_mix_1 (a int PRIMARY KEY, b int, c int);
11811183
));
@@ -1192,17 +1194,20 @@ sub wait_for_subscription_sync
11921194
# TEST: If the column list is changed after creating the subscription, we
11931195
# should catch the error reported by walsender.
11941196

1195-
$node_publisher->safe_psql('postgres', qq(
1197+
$node_publisher->safe_psql(
1198+
'postgres', qq(
11961199
ALTER PUBLICATION pub_mix_1 SET TABLE test_mix_1 (a, c);
11971200
));
11981201

1199-
$node_subscriber->safe_psql('postgres', qq(
1202+
$node_subscriber->safe_psql(
1203+
'postgres', qq(
12001204
CREATE SUBSCRIPTION sub1 CONNECTION '$publisher_connstr' PUBLICATION pub_mix_1, pub_mix_2;
12011205
));
12021206

12031207
$node_publisher->wait_for_catchup('sub1');
12041208

1205-
$node_publisher->safe_psql('postgres', qq(
1209+
$node_publisher->safe_psql(
1210+
'postgres', qq(
12061211
ALTER PUBLICATION pub_mix_1 SET TABLE test_mix_1 (a, b);
12071212
INSERT INTO test_mix_1 VALUES(1, 1, 1);
12081213
));

0 commit comments

Comments
 (0)