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

Commit7ff9812

Browse files
committed
Put new command-line options in alphabetical order
1 parent0eac8e7 commit7ff9812

File tree

6 files changed

+50
-50
lines changed

6 files changed

+50
-50
lines changed

‎doc/src/sgml/ref/pg_dumpall.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -333,23 +333,23 @@ PostgreSQL documentation
333333
</varlistentry>
334334

335335
<varlistentry>
336-
<term><option>--no-role-passwords</option></term>
336+
<term><option>--no-publications</option></term>
337337
<listitem>
338338
<para>
339-
Do not dump passwords for roles. When restored, roles will have a NULL
340-
password and authentication will always fail until the password is reset.
341-
Since password values aren't needed when this option is specified we
342-
use the catalog view pg_roles in preference to pg_authid, since access
343-
to pg_authid may be restricted by security policy.
339+
Do not dump publications.
344340
</para>
345341
</listitem>
346342
</varlistentry>
347343

348344
<varlistentry>
349-
<term><option>--no-publications</option></term>
345+
<term><option>--no-role-passwords</option></term>
350346
<listitem>
351347
<para>
352-
Do not dump publications.
348+
Do not dump passwords for roles. When restored, roles will have a NULL
349+
password and authentication will always fail until the password is reset.
350+
Since password values aren't needed when this option is specified we
351+
use the catalog view pg_roles in preference to pg_authid, since access
352+
to pg_authid may be restricted by security policy.
353353
</para>
354354
</listitem>
355355
</varlistentry>

‎doc/src/sgml/ref/pg_recvlogical.sgml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,32 @@ PostgreSQL documentation
113113
output and other replication behavior:
114114

115115
<variablelist>
116+
<varlistentry>
117+
<term><option>-E <replaceable>lsn</replaceable></option></term>
118+
<term><option>--endpos=<replaceable>lsn</replaceable></option></term>
119+
<listitem>
120+
<para>
121+
In <option>--start</option> mode, automatically stop replication
122+
and exit with normal exit status 0 when receiving reaches the
123+
specified LSN. If specified when not in <option>--start</option>
124+
mode, an error is raised.
125+
</para>
126+
127+
<para>
128+
If there's a record with LSN exactly equal to <replaceable>lsn</>,
129+
the record will be output.
130+
</para>
131+
132+
<para>
133+
The <option>--endpos</option> option is not aware of transaction
134+
boundaries and may truncate output partway through a transaction.
135+
Any partially output transaction will not be consumed and will be
136+
replayed again when the slot is next read from. Individual messages
137+
are never truncated.
138+
</para>
139+
</listitem>
140+
</varlistentry>
141+
116142
<varlistentry>
117143
<term><option>-f <replaceable>filename</replaceable></option></term>
118144
<term><option>--file=<replaceable>filename</replaceable></option></term>
@@ -162,32 +188,6 @@ PostgreSQL documentation
162188
</listitem>
163189
</varlistentry>
164190

165-
<varlistentry>
166-
<term><option>-E <replaceable>lsn</replaceable></option></term>
167-
<term><option>--endpos=<replaceable>lsn</replaceable></option></term>
168-
<listitem>
169-
<para>
170-
In <option>--start</option> mode, automatically stop replication
171-
and exit with normal exit status 0 when receiving reaches the
172-
specified LSN. If specified when not in <option>--start</option>
173-
mode, an error is raised.
174-
</para>
175-
176-
<para>
177-
If there's a record with LSN exactly equal to <replaceable>lsn</>,
178-
the record will be output.
179-
</para>
180-
181-
<para>
182-
The <option>--endpos</option> option is not aware of transaction
183-
boundaries and may truncate output partway through a transaction.
184-
Any partially output transaction will not be consumed and will be
185-
replayed again when the slot is next read from. Individual messages
186-
are never truncated.
187-
</para>
188-
</listitem>
189-
</varlistentry>
190-
191191
<varlistentry>
192192
<term><option>--if-not-exists</option></term>
193193
<listitem>

‎doc/src/sgml/ref/pgbench.sgml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,16 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
579579
</listitem>
580580
</varlistentry>
581581

582+
<varlistentry>
583+
<term><option>--log-prefix=<replaceable>prefix</></option></term>
584+
<listitem>
585+
<para>
586+
Set the filename prefix for the log files created by
587+
<option>--log</>. The default is <literal>pgbench_log</>.
588+
</para>
589+
</listitem>
590+
</varlistentry>
591+
582592
<varlistentry>
583593
<term><option>--progress-timestamp</option></term>
584594
<listitem>
@@ -610,16 +620,6 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
610620
</listitem>
611621
</varlistentry>
612622

613-
<varlistentry>
614-
<term><option>--log-prefix=<replaceable>prefix</></option></term>
615-
<listitem>
616-
<para>
617-
Set the filename prefix for the log files created by
618-
<option>--log</>. The default is <literal>pgbench_log</>.
619-
</para>
620-
</listitem>
621-
</varlistentry>
622-
623623
</variablelist>
624624
</para>
625625

‎src/bin/pg_basebackup/pg_recvlogical.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ usage(void)
8181
printf(_(" --drop-slot drop the replication slot (for the slot's name see --slot)\n"));
8282
printf(_(" --start start streaming in a replication slot (for the slot's name see --slot)\n"));
8383
printf(_("\nOptions:\n"));
84+
printf(_(" -E, --endpos=LSN exit after receiving the specified LSN\n"));
8485
printf(_(" -f, --file=FILE receive log into this file, - for stdout\n"));
8586
printf(_(" -F --fsync-interval=SECS\n"
8687
" time between fsyncs to the output file (default: %d)\n"), (fsync_interval /1000));
8788
printf(_(" --if-not-exists do not error if slot already exists when creating a slot\n"));
8889
printf(_(" -I, --startpos=LSN where in an existing slot should the streaming start\n"));
89-
printf(_(" -E, --endpos=LSN exit after receiving the specified LSN\n"));
9090
printf(_(" -n, --no-loop do not loop on connection lost\n"));
9191
printf(_(" -o, --option=NAME[=VALUE]\n"
9292
" pass option NAME with optional value VALUE to the\n"
@@ -725,7 +725,7 @@ main(int argc, char **argv)
725725
}
726726
}
727727

728-
while ((c=getopt_long(argc,argv,"f:F:nvd:h:p:U:wWI:E:o:P:s:S:",
728+
while ((c=getopt_long(argc,argv,"E:f:F:nvd:h:p:U:wWI:o:P:s:S:",
729729
long_options,&option_index))!=-1)
730730
{
731731
switch (c)

‎src/bin/pg_dump/pg_dumpall.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@ main(int argc, char *argv[])
131131
{"role",required_argument,NULL,3},
132132
{"use-set-session-authorization",no_argument,&use_setsessauth,1},
133133
{"no-publications",no_argument,&no_publications,1},
134+
{"no-role-passwords",no_argument,&no_role_passwords,1},
134135
{"no-security-labels",no_argument,&no_security_labels,1},
135136
{"no-subscriptions",no_argument,&no_subscriptions,1},
136137
{"no-sync",no_argument,NULL,4},
137138
{"no-unlogged-table-data",no_argument,&no_unlogged_table_data,1},
138-
{"no-role-passwords",no_argument,&no_role_passwords,1},
139139

140140
{NULL,0,NULL,0}
141141
};
@@ -599,12 +599,12 @@ help(void)
599599
printf(_(" --if-exists use IF EXISTS when dropping objects\n"));
600600
printf(_(" --inserts dump data as INSERT commands, rather than COPY\n"));
601601
printf(_(" --no-publications do not dump publications\n"));
602+
printf(_(" --no-role-passwords do not dump passwords for roles\n"));
602603
printf(_(" --no-security-labels do not dump security label assignments\n"));
603604
printf(_(" --no-subscriptions do not dump subscriptions\n"));
604605
printf(_(" --no-sync do not wait for changes to be written safely to disk\n"));
605606
printf(_(" --no-tablespaces do not dump tablespace assignments\n"));
606607
printf(_(" --no-unlogged-table-data do not dump unlogged table data\n"));
607-
printf(_(" --no-role-passwords do not dump passwords for roles\n"));
608608
printf(_(" --quote-all-identifiers quote all identifiers, even if not key words\n"));
609609
printf(_(" --use-set-session-authorization\n"
610610
" use SET SESSION AUTHORIZATION commands instead of\n"

‎src/bin/pgbench/pgbench.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,10 +511,10 @@ usage(void)
511511
" -T, --time=NUM duration of benchmark test in seconds\n"
512512
" -v, --vacuum-all vacuum all four standard tables before tests\n"
513513
" --aggregate-interval=NUM aggregate data over NUM seconds\n"
514-
" --progress-timestamp use Unix epoch timestamps for progress\n"
515-
" --sampling-rate=NUM fraction of transactions to log (e.g., 0.01 for 1%%)\n"
516514
" --log-prefix=PREFIX prefix for transaction time log file\n"
517515
" (default: \"pgbench_log\")\n"
516+
" --progress-timestamp use Unix epoch timestamps for progress\n"
517+
" --sampling-rate=NUM fraction of transactions to log (e.g., 0.01 for 1%%)\n"
518518
"\nCommon options:\n"
519519
" -d, --debug print debugging output\n"
520520
" -h, --host=HOSTNAME database server host or socket directory\n"

0 commit comments

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