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

Commitc729082

Browse files
committed
Mark some untranslatable messages with errmsg_internal
1 parent082befb commitc729082

File tree

1 file changed

+31
-25
lines changed
  • src/backend/access/transam

1 file changed

+31
-25
lines changed

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

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5259,22 +5259,22 @@ readRecoveryCommandFile(void)
52595259
{
52605260
recoveryRestoreCommand=pstrdup(item->value);
52615261
ereport(DEBUG2,
5262-
(errmsg("restore_command = '%s'",
5263-
recoveryRestoreCommand)));
5262+
(errmsg_internal("restore_command = '%s'",
5263+
recoveryRestoreCommand)));
52645264
}
52655265
elseif (strcmp(item->name,"recovery_end_command")==0)
52665266
{
52675267
recoveryEndCommand=pstrdup(item->value);
52685268
ereport(DEBUG2,
5269-
(errmsg("recovery_end_command = '%s'",
5270-
recoveryEndCommand)));
5269+
(errmsg_internal("recovery_end_command = '%s'",
5270+
recoveryEndCommand)));
52715271
}
52725272
elseif (strcmp(item->name,"archive_cleanup_command")==0)
52735273
{
52745274
archiveCleanupCommand=pstrdup(item->value);
52755275
ereport(DEBUG2,
5276-
(errmsg("archive_cleanup_command = '%s'",
5277-
archiveCleanupCommand)));
5276+
(errmsg_internal("archive_cleanup_command = '%s'",
5277+
archiveCleanupCommand)));
52785278
}
52795279
elseif (strcmp(item->name,"pause_at_recovery_target")==0)
52805280
{
@@ -5283,7 +5283,8 @@ readRecoveryCommandFile(void)
52835283
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
52845284
errmsg("parameter \"%s\" requires a Boolean value","pause_at_recovery_target")));
52855285
ereport(DEBUG2,
5286-
(errmsg("pause_at_recovery_target = '%s'",item->value)));
5286+
(errmsg_internal("pause_at_recovery_target = '%s'",
5287+
item->value)));
52875288
}
52885289
elseif (strcmp(item->name,"recovery_target_timeline")==0)
52895290
{
@@ -5301,10 +5302,10 @@ readRecoveryCommandFile(void)
53015302
}
53025303
if (rtli)
53035304
ereport(DEBUG2,
5304-
(errmsg("recovery_target_timeline = %u",rtli)));
5305+
(errmsg_internal("recovery_target_timeline = %u",rtli)));
53055306
else
53065307
ereport(DEBUG2,
5307-
(errmsg("recovery_target_timeline = latest")));
5308+
(errmsg_internal("recovery_target_timeline = latest")));
53085309
}
53095310
elseif (strcmp(item->name,"recovery_target_xid")==0)
53105311
{
@@ -5315,8 +5316,8 @@ readRecoveryCommandFile(void)
53155316
(errmsg("recovery_target_xid is not a valid number: \"%s\"",
53165317
item->value)));
53175318
ereport(DEBUG2,
5318-
(errmsg("recovery_target_xid = %u",
5319-
recoveryTargetXid)));
5319+
(errmsg_internal("recovery_target_xid = %u",
5320+
recoveryTargetXid)));
53205321
recoveryTarget=RECOVERY_TARGET_XID;
53215322
}
53225323
elseif (strcmp(item->name,"recovery_target_time")==0)
@@ -5339,8 +5340,8 @@ readRecoveryCommandFile(void)
53395340
ObjectIdGetDatum(InvalidOid),
53405341
Int32GetDatum(-1)));
53415342
ereport(DEBUG2,
5342-
(errmsg("recovery_target_time = '%s'",
5343-
timestamptz_to_str(recoveryTargetTime))));
5343+
(errmsg_internal("recovery_target_time = '%s'",
5344+
timestamptz_to_str(recoveryTargetTime))));
53445345
}
53455346
elseif (strcmp(item->name,"recovery_target_name")==0)
53465347
{
@@ -5356,11 +5357,12 @@ readRecoveryCommandFile(void)
53565357
if (strlen(recoveryTargetName) >=MAXFNAMELEN)
53575358
ereport(FATAL,
53585359
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
5359-
errmsg("recovery_target_name is too long (maximum %d characters)",MAXFNAMELEN-1)));
5360+
errmsg("recovery_target_name is too long (maximum %d characters)",
5361+
MAXFNAMELEN-1)));
53605362

53615363
ereport(DEBUG2,
5362-
(errmsg("recovery_target_name = '%s'",
5363-
recoveryTargetName)));
5364+
(errmsg_internal("recovery_target_name = '%s'",
5365+
recoveryTargetName)));
53645366
}
53655367
elseif (strcmp(item->name,"recovery_target_inclusive")==0)
53665368
{
@@ -5370,32 +5372,35 @@ readRecoveryCommandFile(void)
53705372
if (!parse_bool(item->value,&recoveryTargetInclusive))
53715373
ereport(ERROR,
53725374
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
5373-
errmsg("parameter \"%s\" requires a Boolean value","recovery_target_inclusive")));
5375+
errmsg("parameter \"%s\" requires a Boolean value",
5376+
"recovery_target_inclusive")));
53745377
ereport(DEBUG2,
5375-
(errmsg("recovery_target_inclusive = %s",item->value)));
5378+
(errmsg_internal("recovery_target_inclusive = %s",
5379+
item->value)));
53765380
}
53775381
elseif (strcmp(item->name,"standby_mode")==0)
53785382
{
53795383
if (!parse_bool(item->value,&StandbyMode))
53805384
ereport(ERROR,
53815385
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
5382-
errmsg("parameter \"%s\" requires a Boolean value","standby_mode")));
5386+
errmsg("parameter \"%s\" requires a Boolean value",
5387+
"standby_mode")));
53835388
ereport(DEBUG2,
5384-
(errmsg("standby_mode = '%s'",item->value)));
5389+
(errmsg_internal("standby_mode = '%s'",item->value)));
53855390
}
53865391
elseif (strcmp(item->name,"primary_conninfo")==0)
53875392
{
53885393
PrimaryConnInfo=pstrdup(item->value);
53895394
ereport(DEBUG2,
5390-
(errmsg("primary_conninfo = '%s'",
5391-
PrimaryConnInfo)));
5395+
(errmsg_internal("primary_conninfo = '%s'",
5396+
PrimaryConnInfo)));
53925397
}
53935398
elseif (strcmp(item->name,"trigger_file")==0)
53945399
{
53955400
TriggerFile=pstrdup(item->value);
53965401
ereport(DEBUG2,
5397-
(errmsg("trigger_file = '%s'",
5398-
TriggerFile)));
5402+
(errmsg_internal("trigger_file = '%s'",
5403+
TriggerFile)));
53995404
}
54005405
else
54015406
ereport(FATAL,
@@ -7988,7 +7993,8 @@ RecoveryRestartPoint(const CheckPoint *checkPoint)
79887993
if (RmgrTable[rmid].rm_safe_restartpoint!=NULL)
79897994
if (!(RmgrTable[rmid].rm_safe_restartpoint()))
79907995
{
7991-
elog(trace_recovery(DEBUG2),"RM %d not safe to record restart point at %X/%X",
7996+
elog(trace_recovery(DEBUG2),
7997+
"RM %d not safe to record restart point at %X/%X",
79927998
rmid,
79937999
checkPoint->redo.xlogid,
79948000
checkPoint->redo.xrecoff);

0 commit comments

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