Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd4f16d5

Browse files
committed
perltidy: Add option --nooutdent-long-quotes
1 parenta2ada08 commitd4f16d5

File tree

64 files changed

+294
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+294
-287
lines changed

‎contrib/bloom/t/001_wal.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ sub test_index_replay
1616
# Wait for standby to catch up
1717
my$applname =$node_standby->name;
1818
my$caughtup_query =
19-
"SELECT pg_current_wal_lsn() <= write_lsn FROM pg_stat_replication WHERE application_name = '$applname';";
19+
"SELECT pg_current_wal_lsn() <= write_lsn FROM pg_stat_replication WHERE application_name = '$applname';";
2020
$node_master->poll_query_until('postgres',$caughtup_query)
2121
ordie"Timed out while waiting for standby 1 to catch up";
2222

@@ -57,7 +57,7 @@ sub test_index_replay
5757
$node_master->safe_psql("postgres","CREATE EXTENSION bloom;");
5858
$node_master->safe_psql("postgres","CREATE TABLE tst (i int4, t text);");
5959
$node_master->safe_psql("postgres",
60-
"INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,100000) i;"
60+
"INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,100000) i;"
6161
);
6262
$node_master->safe_psql("postgres",
6363
"CREATE INDEX bloomidx ON tst USING bloom (i, t) WITH (col1 = 3);");
@@ -74,7 +74,7 @@ sub test_index_replay
7474
test_index_replay("vacuum$i");
7575
my ($start,$end) = (100001 + ($i - 1) * 10000, 100000 +$i * 10000);
7676
$node_master->safe_psql("postgres",
77-
"INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series($start,$end) i;"
77+
"INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series($start,$end) i;"
7878
);
7979
test_index_replay("insert$i");
8080
}

‎src/backend/parser/check_keywords.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,14 @@ sub error
177177
if ($kwstring !~/^[a-z_]+$/)
178178
{
179179
error
180-
"'$kwstring' is not a valid keyword string, must be all lower-case ASCII chars";
180+
"'$kwstring' is not a valid keyword string, must be all lower-case ASCII chars";
181181
}
182182

183183
# Check that the keyword name is valid: all upper-case ASCII chars
184184
if ($kwname !~/^[A-Z_]+$/)
185185
{
186186
error
187-
"'$kwname' is not a valid keyword name, must be all upper-case ASCII chars";
187+
"'$kwname' is not a valid keyword name, must be all upper-case ASCII chars";
188188
}
189189

190190
# Check that the keyword string matches keyword name
@@ -193,7 +193,7 @@ sub error
193193
if ($bare_kwnameneuc($kwstring))
194194
{
195195
error
196-
"keyword name '$kwname' doesn't match keyword string '$kwstring'";
196+
"keyword name '$kwname' doesn't match keyword string '$kwstring'";
197197
}
198198

199199
# Check that the keyword is present in the grammar

‎src/backend/storage/lmgr/generate-lwlocknames.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
openmy$c,'>',$ctmpordie"Could not open$ctmp:$!";
1919

2020
my$autogen =
21-
"/* autogenerated from src/backend/storage/lmgr/lwlocknames.txt, do not edit */\n";
21+
"/* autogenerated from src/backend/storage/lmgr/lwlocknames.txt, do not edit */\n";
2222
print$h$autogen;
2323
print$h"/* there is deliberately not an #ifndef LWLOCKNAMES_H here */\n\n";
2424
print$c$autogen,"\n";

‎src/backend/utils/Gen_dummy_probes.pl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,35 +100,35 @@ ()
100100
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4)/
101101
{
102102
$s =
103-
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4)/s;
103+
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4)/s;
104104
$CondReg ||=$s;
105105
}
106106

107107
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5)/
108108
{
109109
$s =
110-
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5)/s;
110+
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5)/s;
111111
$CondReg ||=$s;
112112
}
113113

114114
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6)/
115115
{
116116
$s =
117-
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6)/s;
117+
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6)/s;
118118
$CondReg ||=$s;
119119
}
120120

121121
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/
122122
{
123123
$s =
124-
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/s;
124+
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6, INT7)/s;
125125
$CondReg ||=$s;
126126
}
127127

128128
# s/([^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\}, [^,)]\{1,\})/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/
129129
{
130130
$s =
131-
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/s;
131+
s /\([^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+, [^,)]+\)/(INT1, INT2, INT3, INT4, INT5, INT6, INT7, INT8)/s;
132132
$CondReg ||=$s;
133133
}
134134

‎src/backend/utils/Gen_fmgrtab.pl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
ordie"Could not open$tabfile$tmpext:$!";
121121

122122
print$ofh
123-
qq|/*-------------------------------------------------------------------------
123+
qq|/*-------------------------------------------------------------------------
124124
*
125125
* fmgroids.h
126126
* Macros that define the OIDs of built-in functions.
@@ -157,7 +157,7 @@
157157
|;
158158

159159
print$pfh
160-
qq|/*-------------------------------------------------------------------------
160+
qq|/*-------------------------------------------------------------------------
161161
*
162162
* fmgrprotos.h
163163
* Prototypes for built-in functions.
@@ -183,7 +183,7 @@
183183
|;
184184

185185
print$tfh
186-
qq|/*-------------------------------------------------------------------------
186+
qq|/*-------------------------------------------------------------------------
187187
*
188188
* fmgrtab.c
189189
* The function manager's table of internal functions.
@@ -230,7 +230,7 @@
230230
foreachmy$s (sort {$a->{oid}<=>$b->{oid} }@fmgr)
231231
{
232232
print$tfh
233-
" {$s->{oid},\"$s->{prosrc}\",$s->{nargs},$bmap{$s->{strict}},$bmap{$s->{retset}},$s->{prosrc} }";
233+
" {$s->{oid},\"$s->{prosrc}\",$s->{nargs},$bmap{$s->{strict}},$bmap{$s->{retset}},$s->{prosrc} }";
234234

235235
$fmgr_builtin_oid_index[$s->{oid} ] =$fmgr_count++;
236236

‎src/backend/utils/mb/Unicode/convutils.pm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ sub print_from_utf8_combined_map
168168

169169
printf$out"\n/* Combined character map */\n";
170170
printf$out
171-
"static const pg_utf_to_local_combined ULmap${charset}_combined[%d ] = {",
171+
"static const pg_utf_to_local_combined ULmap${charset}_combined[%d ] = {",
172172
scalar(@$table);
173173
my$first = 1;
174174
foreachmy$i (sort {$a->{utf8}<=>$b->{utf8} }@$table)
@@ -202,7 +202,7 @@ sub print_to_utf8_combined_map
202202

203203
printf$out"\n/* Combined character map */\n";
204204
printf$out
205-
"static const pg_local_to_utf_combined LUmap${charset}_combined[%d ] = {",
205+
"static const pg_local_to_utf_combined LUmap${charset}_combined[%d ] = {",
206206
scalar(@$table);
207207

208208
my$first = 1;
@@ -613,7 +613,7 @@ sub print_radix_table
613613
if ($seg->{overlaid_trail_zeros})
614614
{
615615
printf$out
616-
" /*$seg->{overlaid_trail_zeros} trailing zero values shared with next segment */\n";
616+
" /*$seg->{overlaid_trail_zeros} trailing zero values shared with next segment */\n";
617617
}
618618
}
619619

@@ -728,7 +728,7 @@ sub make_charmap
728728
if (defined$charmap{$src})
729729
{
730730
printfSTDERR
731-
"Error: duplicate source code on%s:%d: 0x%04x => 0x%04x, 0x%04x\n",
731+
"Error: duplicate source code on%s:%d: 0x%04x => 0x%04x, 0x%04x\n",
732732
$c->{f},$c->{l},$src,$charmap{$src},$dst;
733733
exit;
734734
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -420,13 +420,15 @@
420420

421421
is($node->safe_psql(
422422
'postgres',
423-
q{SELECT slot_name FROM pg_replication_slots WHERE slot_name = 'slot0'}),
423+
q{SELECT slot_name FROM pg_replication_slots WHERE slot_name = 'slot0'}
424+
),
424425
'slot0',
425426
'replication slot was created');
426427
isnt(
427428
$node->safe_psql(
428429
'postgres',
429-
q{SELECT restart_lsn FROM pg_replication_slots WHERE slot_name = 'slot0'}),
430+
q{SELECT restart_lsn FROM pg_replication_slots WHERE slot_name = 'slot0'}
431+
),
430432
'',
431433
'restart LSN of new slot is not null');
432434

@@ -468,10 +470,10 @@
468470

469471
# create tables to corrupt and get their relfilenodes
470472
my$file_corrupt1 =$node->safe_psql('postgres',
471-
q{SELECT a INTO corrupt1 FROM generate_series(1,10000) AS a; ALTER TABLE corrupt1 SET (autovacuum_enabled=false); SELECT pg_relation_filepath('corrupt1')}
473+
q{SELECT a INTO corrupt1 FROM generate_series(1,10000) AS a; ALTER TABLE corrupt1 SET (autovacuum_enabled=false); SELECT pg_relation_filepath('corrupt1')}
472474
);
473475
my$file_corrupt2 =$node->safe_psql('postgres',
474-
q{SELECT b INTO corrupt2 FROM generate_series(1,2) AS b; ALTER TABLE corrupt2 SET (autovacuum_enabled=false); SELECT pg_relation_filepath('corrupt2')}
476+
q{SELECT b INTO corrupt2 FROM generate_series(1,2) AS b; ALTER TABLE corrupt2 SET (autovacuum_enabled=false); SELECT pg_relation_filepath('corrupt2')}
475477
);
476478

477479
# set page header and block sizes

‎src/bin/pg_controldata/t/001_pg_controldata.pl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
command_checks_all(
3434
['pg_controldata',$node->data_dir ],
3535
0,
36-
[
37-
qr/WARNING: Calculated CRC checksum does not match value stored in file/,
36+
[qr/WARNING: Calculated CRC checksum does not match value stored in file/,
3837
qr/WARNING: invalid WAL segment size/ ],
3938
[qr/^$/],
4039
'pg_controldata with corrupted pg_control');

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

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,35 +45,36 @@
4545

4646
command_fails_like(
4747
['pg_dump','-s','-a' ],
48-
qr/\Qpg_dump: options -s\/--schema-only and -a\/--data-only cannot be used together\E/,
49-
'pg_dump: options -s/--schema-only and -a/--data-only cannot be used together'
48+
qr/\Qpg_dump: options -s\/--schema-only and -a\/--data-only cannot be used together\E/,
49+
'pg_dump: options -s/--schema-only and -a/--data-only cannot be used together'
5050
);
5151

5252
command_fails_like(
5353
['pg_restore','-s','-a' ],
54-
qr/\Qpg_restore: options -s\/--schema-only and -a\/--data-only cannot be used together\E/,
55-
'pg_restore: options -s/--schema-only and -a/--data-only cannot be used together'
54+
qr/\Qpg_restore: options -s\/--schema-only and -a\/--data-only cannot be used together\E/,
55+
'pg_restore: options -s/--schema-only and -a/--data-only cannot be used together'
5656
);
5757

5858
command_fails_like(
5959
['pg_restore','-d','xxx','-f','xxx' ],
60-
qr/\Qpg_restore: options -d\/--dbname and -f\/--file cannot be used together\E/,
60+
qr/\Qpg_restore: options -d\/--dbname and -f\/--file cannot be used together\E/,
6161
'pg_restore: options -d/--dbname and -f/--file cannot be used together');
6262

6363
command_fails_like(
6464
['pg_dump','-c','-a' ],
65-
qr/\Qpg_dump: options -c\/--clean and -a\/--data-only cannot be used together\E/,
65+
qr/\Qpg_dump: options -c\/--clean and -a\/--data-only cannot be used together\E/,
6666
'pg_dump: options -c/--clean and -a/--data-only cannot be used together');
6767

6868
command_fails_like(
6969
['pg_restore','-c','-a' ],
70-
qr/\Qpg_restore: options -c\/--clean and -a\/--data-only cannot be used together\E/,
71-
'pg_restore: options -c/--clean and -a/--data-only cannot be used together');
70+
qr/\Qpg_restore: options -c\/--clean and -a\/--data-only cannot be used together\E/,
71+
'pg_restore: options -c/--clean and -a/--data-only cannot be used together'
72+
);
7273

7374
command_fails_like(
7475
['pg_dump','--inserts','-o' ],
75-
qr/\Qpg_dump: options --inserts\/--column-inserts and -o\/--oids cannot be used together\E/,
76-
'pg_dump: options --inserts/--column-inserts and -o/--oids cannot be used together'
76+
qr/\Qpg_dump: options --inserts\/--column-inserts and -o\/--oids cannot be used together\E/,
77+
'pg_dump: options --inserts/--column-inserts and -o/--oids cannot be used together'
7778
);
7879

7980
command_fails_like(
@@ -103,7 +104,7 @@
103104

104105
command_fails_like(
105106
['pg_restore','--single-transaction','-j3' ],
106-
qr/\Qpg_restore: cannot specify both --single-transaction and multiple jobs\E/,
107+
qr/\Qpg_restore: cannot specify both --single-transaction and multiple jobs\E/,
107108
'pg_restore: cannot specify both --single-transaction and multiple jobs');
108109

109110
command_fails_like(
@@ -124,20 +125,20 @@
124125
# pg_dumpall command-line argument checks
125126
command_fails_like(
126127
['pg_dumpall','-g','-r' ],
127-
qr/\Qpg_dumpall: options -g\/--globals-only and -r\/--roles-only cannot be used together\E/,
128-
'pg_dumpall: options -g/--globals-only and -r/--roles-only cannot be used together'
128+
qr/\Qpg_dumpall: options -g\/--globals-only and -r\/--roles-only cannot be used together\E/,
129+
'pg_dumpall: options -g/--globals-only and -r/--roles-only cannot be used together'
129130
);
130131

131132
command_fails_like(
132133
['pg_dumpall','-g','-t' ],
133-
qr/\Qpg_dumpall: options -g\/--globals-only and -t\/--tablespaces-only cannot be used together\E/,
134-
'pg_dumpall: options -g/--globals-only and -t/--tablespaces-only cannot be used together'
134+
qr/\Qpg_dumpall: options -g\/--globals-only and -t\/--tablespaces-only cannot be used together\E/,
135+
'pg_dumpall: options -g/--globals-only and -t/--tablespaces-only cannot be used together'
135136
);
136137

137138
command_fails_like(
138139
['pg_dumpall','-r','-t' ],
139-
qr/\Qpg_dumpall: options -r\/--roles-only and -t\/--tablespaces-only cannot be used together\E/,
140-
'pg_dumpall: options -r/--roles-only and -t/--tablespaces-only cannot be used together'
140+
qr/\Qpg_dumpall: options -r\/--roles-only and -t\/--tablespaces-only cannot be used together\E/,
141+
'pg_dumpall: options -r/--roles-only and -t/--tablespaces-only cannot be used together'
141142
);
142143

143144
command_fails_like(

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp