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

Commitff810b4

Browse files
committed
Misc message style and doc fixes.
Euler Taveira
1 parenta82a174 commitff810b4

File tree

5 files changed

+25
-26
lines changed

5 files changed

+25
-26
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -226,13 +226,12 @@ PostgreSQL documentation
226226
<term><option>--fsync-interval=<replaceable>interval_seconds</replaceable></option></term>
227227
<listitem>
228228
<para>
229-
How often should
230-
<link linkend="app-pgreceivexlog"><application>pg_receivexlog</application></link>
231-
issue sync commands to ensure the <parameter>--outputfile</parameter>
232-
is safely flushed to disk without being asked by the server to do
233-
so. Specifying an interval of <literal>0</literal> disables issuing
234-
fsyncs altogether, while still reporting progress the server.
235-
In this case, data may be lost in the event of a crash.
229+
How often should <application>pg_recvlogical</application> issue sync
230+
commands to ensure the <parameter>--outputfile</parameter> is safely
231+
flushed to disk without being asked by the server to do so. Specifying
232+
an interval of <literal>0</literal> disables issuing fsyncs altogether,
233+
while still reporting progress the server. In this case, data may be
234+
lost in the event of a crash.
236235
</para>
237236
</listitem>
238237
</varlistentry>

‎src/backend/replication/libpqwalreceiver/libpqwalreceiver.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ libpqrcv_identify_system(TimeLineID *primary_tli)
139139
PQclear(res);
140140
ereport(ERROR,
141141
(errmsg("invalid response from primary server"),
142-
errdetail("Could not identify system:Got %d rows and %d fields, expected %d rows and %d or more fields.",
142+
errdetail("Could not identify system:got %d rows and %d fields, expected %d rows and %d or more fields.",
143143
ntuples,nfields,3,1)));
144144
}
145145
primary_sysid=PQgetvalue(res,0,0);

‎src/bin/pg_basebackup/pg_basebackup.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,14 +187,14 @@ tablespace_list_append(const char *arg)
187187
*/
188188
if (!is_absolute_path(cell->old_dir))
189189
{
190-
fprintf(stderr,_("%s: old directory not absolute in tablespace mapping: %s\n"),
190+
fprintf(stderr,_("%s: old directoryisnotanabsolute path in tablespace mapping: %s\n"),
191191
progname,cell->old_dir);
192192
exit(1);
193193
}
194194

195195
if (!is_absolute_path(cell->new_dir))
196196
{
197-
fprintf(stderr,_("%s: new directory not absolute in tablespace mapping: %s\n"),
197+
fprintf(stderr,_("%s: new directoryisnotanabsolute path in tablespace mapping: %s\n"),
198198
progname,cell->new_dir);
199199
exit(1);
200200
}
@@ -676,7 +676,7 @@ parse_max_rate(char *src)
676676
if (*after_num!='\0')
677677
{
678678
fprintf(stderr,
679-
_("%s: invalid --max-rateunits: \"%s\"\n"),
679+
_("%s: invalid --max-rateunit: \"%s\"\n"),
680680
progname,suffix);
681681
exit(1);
682682
}

‎src/bin/pg_basebackup/pg_recvlogical.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ usage(void)
8080
printf(_(" -w, --no-password never prompt for password\n"));
8181
printf(_(" -W, --password force password prompt (should happen automatically)\n"));
8282
printf(_("\nReplication options:\n"));
83-
printf(_(" -F --fsync-interval=INTERVAL\n"
84-
" frequency of syncs to the output file (in seconds, defaults to 10)\n"));
83+
printf(_(" -F --fsync-interval=SECS\n"
84+
" frequency of syncs to the output file (default: %d)\n"), (fsync_interval /1000));
8585
printf(_(" -o, --option=NAME[=VALUE]\n"
8686
" Specify option NAME with optional value VALUE, to be passed\n"
8787
" to the output plugin\n"));
88-
printf(_(" -P, --plugin=PLUGIN use output plugin PLUGIN (defaults to test_decoding)\n"));
89-
printf(_(" -s, --status-interval=INTERVAL\n"
90-
" time between status packets sent to server (in seconds, defaults to 10)\n"));
88+
printf(_(" -P, --plugin=PLUGIN use output plugin PLUGIN (default: %s)\n"),plugin);
89+
printf(_(" -s, --status-interval=SECS\n"
90+
" time between status packets sent to server (default: %d)\n"), (standby_message_timeout /1000));
9191
printf(_(" -S, --slot=SLOT use existing replication slot SLOT instead of starting a new one\n"));
9292
printf(_(" -I, --startpos=PTR Where in an existing slot should the streaming start\n"));
9393
printf(_("\nAction to be performed:\n"));
@@ -253,7 +253,7 @@ StreamLog(void)
253253
res=PQexec(conn,query->data);
254254
if (PQresultStatus(res)!=PGRES_COPY_BOTH)
255255
{
256-
fprintf(stderr,_("%s: could not send replication command \"%s\": %s\n"),
256+
fprintf(stderr,_("%s: could not send replication command \"%s\": %s"),
257257
progname,query->data,PQresultErrorMessage(res));
258258
PQclear(res);
259259
gotoerror;
@@ -263,7 +263,7 @@ StreamLog(void)
263263

264264
if (verbose)
265265
fprintf(stderr,
266-
_("%s:initiatedstreaming\n"),
266+
_("%s: streaming initiated\n"),
267267
progname);
268268

269269
while (!time_to_abort)
@@ -817,15 +817,15 @@ main(int argc, char **argv)
817817

818818
if (do_drop_slot&& (do_create_slot||do_start_slot))
819819
{
820-
fprintf(stderr,_("%s:--stopcannotbe combined with--init or --start\n"),progname);
820+
fprintf(stderr,_("%s: cannotuse--init or --start together with --stop\n"),progname);
821821
fprintf(stderr,_("Try \"%s --help\" for more information.\n"),
822822
progname);
823823
exit(1);
824824
}
825825

826826
if (startpos&& (do_create_slot||do_drop_slot))
827827
{
828-
fprintf(stderr,_("%s:--startposcannotbe combined with--init or --stop\n"),progname);
828+
fprintf(stderr,_("%s: cannotuse--init or --stop together with --startpos\n"),progname);
829829
fprintf(stderr,_("Try \"%s --help\" for more information.\n"),
830830
progname);
831831
exit(1);
@@ -895,7 +895,7 @@ main(int argc, char **argv)
895895
if (PQntuples(res)!=0||PQnfields(res)!=0)
896896
{
897897
fprintf(stderr,
898-
_("%s: could not stop logicalrep: got %d rows and %d fields, expected %d rows and %d fields\n"),
898+
_("%s: could not stop logicalreplication: got %d rows and %d fields, expected %d rows and %d fields\n"),
899899
progname,PQntuples(res),PQnfields(res),0,0);
900900
disconnect_and_exit(1);
901901
}
@@ -930,7 +930,7 @@ main(int argc, char **argv)
930930
if (PQntuples(res)!=1||PQnfields(res)!=4)
931931
{
932932
fprintf(stderr,
933-
_("%s: could not init logicalrep: got %d rows and %d fields, expected %d rows and %d fields\n"),
933+
_("%s: could not init logicalreplication: got %d rows and %d fields, expected %d rows and %d fields\n"),
934934
progname,PQntuples(res),PQnfields(res),1,4);
935935
disconnect_and_exit(1);
936936
}
@@ -965,14 +965,14 @@ main(int argc, char **argv)
965965
}
966966
elseif (noloop)
967967
{
968-
fprintf(stderr,_("%s: disconnected.\n"),progname);
968+
fprintf(stderr,_("%s: disconnected\n"),progname);
969969
exit(1);
970970
}
971971
else
972972
{
973973
fprintf(stderr,
974974
/* translator: check source for value for %d */
975-
_("%s: disconnected. Waiting %d seconds to try again.\n"),
975+
_("%s: disconnected; waiting %d seconds to try again\n"),
976976
progname,RECONNECT_SLEEP_TIME);
977977
pg_usleep(RECONNECT_SLEEP_TIME*1000000);
978978
}

‎src/bin/psql/command.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2552,7 +2552,7 @@ printPsetInfo(const char *param, struct printQueryOpt *popt)
25522552
elseif (popt->topt.pager==2)
25532553
printf(_("Pager (%s) is always used.\n"),param);
25542554
else
2555-
printf(_("Pager (%s) usage is off.\n"),param);
2555+
printf(_("Pagerusage(%s) is off.\n"),param);
25562556
}
25572557

25582558
/* show record separator for unaligned text */
@@ -2576,7 +2576,7 @@ printPsetInfo(const char *param, struct printQueryOpt *popt)
25762576
elseif (strcmp(param,"T")==0||strcmp(param,"tableattr")==0)
25772577
{
25782578
if (popt->topt.tableAttr)
2579-
printf(_("Tableattribute (%s)is \"%s\".\n"),param,
2579+
printf(_("Tableattributes (%s)are \"%s\".\n"),param,
25802580
popt->topt.tableAttr);
25812581
else
25822582
printf(_("Table attributes (%s) unset.\n"),param);

0 commit comments

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