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

Commit83737ef

Browse files
committed
pg_createsubscriber: Rename option --socket-directory to --socketdir
For consistency with the equivalent option in pg_upgrade.Reviewed-by: Hayato Kuroda <kuroda.hayato@fujitsu.com>Reviewed-by: Euler Taveira <euler@eulerto.com>Discussion:https://www.postgresql.org/message-id/flat/1ed82b9b-8e20-497d-a2f8-aebdd793d595%40eisentraut.org
1 parenteb39497 commit83737ef

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

‎doc/src/sgml/ref/pg_createsubscriber.sgml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ PostgreSQL documentation
139139

140140
<varlistentry>
141141
<term><option>-s <replaceable class="parameter">dir</replaceable></option></term>
142-
<term><option>--socket-directory=<replaceable class="parameter">dir</replaceable></option></term>
142+
<term><option>--socketdir=<replaceable class="parameter">dir</replaceable></option></term>
143143
<listitem>
144144
<para>
145145
The directory to use for postmaster sockets on target server. The

‎src/bin/pg_basebackup/pg_createsubscriber.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ usage(void)
226226
printf(_(" -n, --dry-run dry run, just show what would be done\n"));
227227
printf(_(" -p, --subscriber-port=PORT subscriber port number (default %s)\n"),DEFAULT_SUB_PORT);
228228
printf(_(" -P, --publisher-server=CONNSTR publisher connection string\n"));
229-
printf(_(" -s, --socket-directory=DIR socket directory to use (default currentdirectory)\n"));
229+
printf(_(" -s, --socketdir=DIRsocket directory to use (default currentdir.)\n"));
230230
printf(_(" -t, --recovery-timeout=SECS seconds to wait for recovery to end\n"));
231231
printf(_(" -U, --subscriber-username=NAME subscriber username\n"));
232232
printf(_(" -v, --verbose output verbose messages\n"));
@@ -1871,7 +1871,7 @@ main(int argc, char **argv)
18711871
{"dry-run",no_argument,NULL,'n'},
18721872
{"subscriber-port",required_argument,NULL,'p'},
18731873
{"publisher-server",required_argument,NULL,'P'},
1874-
{"socket-directory",required_argument,NULL,'s'},
1874+
{"socketdir",required_argument,NULL,'s'},
18751875
{"recovery-timeout",required_argument,NULL,'t'},
18761876
{"subscriber-username",required_argument,NULL,'U'},
18771877
{"verbose",no_argument,NULL,'v'},

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ sub generate_db
171171
'pg_createsubscriber','--verbose',
172172
'--dry-run','--pgdata',
173173
$node_t->data_dir,'--publisher-server',
174-
$node_p->connstr($db1),'--socket-directory',
174+
$node_p->connstr($db1),'--socketdir',
175175
$node_t->host,'--subscriber-port',
176176
$node_t->port,'--database',
177177
$db1,'--database',
@@ -185,7 +185,7 @@ sub generate_db
185185
'pg_createsubscriber','--verbose',
186186
'--dry-run','--pgdata',
187187
$node_s->data_dir,'--publisher-server',
188-
$node_p->connstr($db1),'--socket-directory',
188+
$node_p->connstr($db1),'--socketdir',
189189
$node_s->host,'--subscriber-port',
190190
$node_s->port,'--database',
191191
$db1,'--database',
@@ -199,7 +199,7 @@ sub generate_db
199199
'pg_createsubscriber','--verbose',
200200
'--pgdata',$node_f->data_dir,
201201
'--publisher-server',$node_p->connstr($db1),
202-
'--socket-directory',$node_f->host,
202+
'--socketdir',$node_f->host,
203203
'--subscriber-port',$node_f->port,
204204
'--database',$db1,
205205
'--database',$db2
@@ -219,7 +219,7 @@ sub generate_db
219219
'pg_createsubscriber','--verbose',
220220
'--dry-run','--pgdata',
221221
$node_c->data_dir,'--publisher-server',
222-
$node_s->connstr($db1),'--socket-directory',
222+
$node_s->connstr($db1),'--socketdir',
223223
$node_c->host,'--subscriber-port',
224224
$node_c->port,'--database',
225225
$db1,'--database',
@@ -242,7 +242,7 @@ sub generate_db
242242
'pg_createsubscriber','--verbose',
243243
'--dry-run','--pgdata',
244244
$node_s->data_dir,'--publisher-server',
245-
$node_p->connstr($db1),'--socket-directory',
245+
$node_p->connstr($db1),'--socketdir',
246246
$node_s->host,'--subscriber-port',
247247
$node_s->port,'--database',
248248
$db1,'--database',
@@ -271,7 +271,7 @@ sub generate_db
271271
'pg_createsubscriber','--verbose',
272272
'--dry-run','--pgdata',
273273
$node_s->data_dir,'--publisher-server',
274-
$node_p->connstr($db1),'--socket-directory',
274+
$node_p->connstr($db1),'--socketdir',
275275
$node_s->host,'--subscriber-port',
276276
$node_s->port,'--database',
277277
$db1,'--database',
@@ -325,7 +325,7 @@ sub generate_db
325325
'--recovery-timeout',"$PostgreSQL::Test::Utils::timeout_default",
326326
'--dry-run','--pgdata',
327327
$node_s->data_dir,'--publisher-server',
328-
$node_p->connstr($db1),'--socket-directory',
328+
$node_p->connstr($db1),'--socketdir',
329329
$node_s->host,'--subscriber-port',
330330
$node_s->port,'--publication',
331331
'pub1','--publication',
@@ -349,7 +349,7 @@ sub generate_db
349349
'pg_createsubscriber','--verbose',
350350
'--dry-run','--pgdata',
351351
$node_s->data_dir,'--publisher-server',
352-
$node_p->connstr($db1),'--socket-directory',
352+
$node_p->connstr($db1),'--socketdir',
353353
$node_s->host,'--subscriber-port',
354354
$node_s->port,'--replication-slot',
355355
'replslot1'
@@ -363,7 +363,7 @@ sub generate_db
363363
'--recovery-timeout',"$PostgreSQL::Test::Utils::timeout_default",
364364
'--verbose','--pgdata',
365365
$node_s->data_dir,'--publisher-server',
366-
$node_p->connstr($db1),'--socket-directory',
366+
$node_p->connstr($db1),'--socketdir',
367367
$node_s->host,'--subscriber-port',
368368
$node_s->port,'--publication',
369369
'pub1','--publication',

0 commit comments

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