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

Commit55a70a0

Browse files
committed
Assorted translatable string fixes
Mark our rusage reportage string translatable; remove quotes from typenames; unify formatting of very similar messages.
1 parent5936d25 commit55a70a0

File tree

9 files changed

+21
-29
lines changed

9 files changed

+21
-29
lines changed

‎src/backend/access/brin/brin_pageops.c‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,8 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
7373
{
7474
ereport(ERROR,
7575
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
76-
errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",
77-
(unsigned long)newsz,
78-
(unsigned long)BrinMaxItemSize,
79-
RelationGetRelationName(idxrel))));
76+
errmsg("index row size %zu exceeds maximum %zu for index \"%s\"",
77+
newsz,BrinMaxItemSize,RelationGetRelationName(idxrel))));
8078
return false;/* keep compiler quiet */
8179
}
8280

@@ -357,10 +355,8 @@ brin_doinsert(Relation idxrel, BlockNumber pagesPerRange,
357355
{
358356
ereport(ERROR,
359357
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
360-
errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",
361-
(unsigned long)itemsz,
362-
(unsigned long)BrinMaxItemSize,
363-
RelationGetRelationName(idxrel))));
358+
errmsg("index row size %zu exceeds maximum %zu for index \"%s\"",
359+
itemsz,BrinMaxItemSize,RelationGetRelationName(idxrel))));
364360
returnInvalidOffsetNumber;/* keep compiler quiet */
365361
}
366362

@@ -669,7 +665,7 @@ brin_getinsertbuffer(Relation irel, Buffer oldbuf, Size itemsz,
669665
BlockNumberoldblk;
670666
BlockNumbernewblk;
671667
Pagepage;
672-
intfreespace;
668+
Sizefreespace;
673669

674670
/* callers must have checked */
675671
Assert(itemsz <=BrinMaxItemSize);
@@ -825,10 +821,8 @@ brin_getinsertbuffer(Relation irel, Buffer oldbuf, Size itemsz,
825821

826822
ereport(ERROR,
827823
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
828-
errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",
829-
(unsigned long)itemsz,
830-
(unsigned long)freespace,
831-
RelationGetRelationName(irel))));
824+
errmsg("index row size %zu exceeds maximum %zu for index \"%s\"",
825+
itemsz,freespace,RelationGetRelationName(irel))));
832826
returnInvalidBuffer;/* keep compiler quiet */
833827
}
834828

‎src/backend/catalog/index.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3462,7 +3462,7 @@ reindex_index(Oid indexId, bool skip_constraint_checks, char persistence,
34623462
ereport(INFO,
34633463
(errmsg("index \"%s\" was reindexed",
34643464
get_rel_name(indexId)),
3465-
errdetail("%s.",
3465+
errdetail_internal("%s",
34663466
pg_rusage_show(&ru0))));
34673467

34683468
/* Close rels, but keep locks */

‎src/backend/catalog/namespace.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3793,7 +3793,7 @@ InitTempTableNamespace(void)
37933793
if (IsParallelWorker())
37943794
ereport(ERROR,
37953795
(errcode(ERRCODE_READ_ONLY_SQL_TRANSACTION),
3796-
errmsg("cannot create temporary tablesinparallelmode")));
3796+
errmsg("cannot create temporary tablesduring aparalleloperation")));
37973797

37983798
snprintf(namespaceName,sizeof(namespaceName),"pg_temp_%d",MyBackendId);
37993799

‎src/backend/commands/vacuumlazy.c‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,8 +1353,7 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
13531353
"%u pages are entirely empty.\n",
13541354
empty_pages),
13551355
empty_pages);
1356-
appendStringInfo(&buf,_("%s."),
1357-
pg_rusage_show(&ru0));
1356+
appendStringInfo(&buf,"%s.",pg_rusage_show(&ru0));
13581357

13591358
ereport(elevel,
13601359
(errmsg("\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u pages",
@@ -1429,8 +1428,7 @@ lazy_vacuum_heap(Relation onerel, LVRelStats *vacrelstats)
14291428
(errmsg("\"%s\": removed %d row versions in %d pages",
14301429
RelationGetRelationName(onerel),
14311430
tupindex,npages),
1432-
errdetail("%s.",
1433-
pg_rusage_show(&ru0))));
1431+
errdetail_internal("%s",pg_rusage_show(&ru0))));
14341432
}
14351433

14361434
/*
@@ -1618,7 +1616,7 @@ lazy_vacuum_index(Relation indrel,
16181616
(errmsg("scanned index \"%s\" to remove %d row versions",
16191617
RelationGetRelationName(indrel),
16201618
vacrelstats->num_dead_tuples),
1621-
errdetail("%s.",pg_rusage_show(&ru0))));
1619+
errdetail_internal("%s",pg_rusage_show(&ru0))));
16221620
}
16231621

16241622
/*
@@ -1828,7 +1826,7 @@ lazy_truncate_heap(Relation onerel, LVRelStats *vacrelstats)
18281826
(errmsg("\"%s\": truncated %u to %u pages",
18291827
RelationGetRelationName(onerel),
18301828
old_rel_pages,new_rel_pages),
1831-
errdetail("%s.",
1829+
errdetail_internal("%s",
18321830
pg_rusage_show(&ru0))));
18331831
old_rel_pages=new_rel_pages;
18341832
}while (new_rel_pages>vacrelstats->nonempty_pages&&

‎src/backend/commands/variable.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ assign_client_encoding(const char *newval, void *extra)
773773
*/
774774
ereport(ERROR,
775775
(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
776-
errmsg("cannot change client_encodingin a parallelworker")));
776+
errmsg("cannot change client_encodingduring a paralleloperation")));
777777
}
778778

779779
/* We do not expect an error if PrepareClientEncoding succeeded */

‎src/backend/storage/page/bufpage.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ PageIndexMultiDelete(Page page, OffsetNumber *itemnos, int nitems)
902902
offset!=MAXALIGN(offset))
903903
ereport(ERROR,
904904
(errcode(ERRCODE_DATA_CORRUPTED),
905-
errmsg("corrupted item pointer: offset = %u,size = %u",
905+
errmsg("corrupted item pointer: offset = %u,length = %u",
906906
offset, (unsignedint)size)));
907907

908908
if (nextitm<nitems&&offnum==itemnos[nextitm])

‎src/backend/utils/adt/json.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2008,7 +2008,7 @@ json_object_agg_transfn(PG_FUNCTION_ARGS)
20082008
if (arg_type==InvalidOid)
20092009
ereport(ERROR,
20102010
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
2011-
errmsg("could not determine data type for argument1")));
2011+
errmsg("could not determine data type for argument%d",1)));
20122012

20132013
json_categorize_type(arg_type,&state->key_category,
20142014
&state->key_output_func);
@@ -2018,7 +2018,7 @@ json_object_agg_transfn(PG_FUNCTION_ARGS)
20182018
if (arg_type==InvalidOid)
20192019
ereport(ERROR,
20202020
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
2021-
errmsg("could not determine data type for argument2")));
2021+
errmsg("could not determine data type for argument%d",2)));
20222022

20232023
json_categorize_type(arg_type,&state->val_category,
20242024
&state->val_output_func);

‎src/backend/utils/adt/jsonb.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,7 +1212,7 @@ jsonb_build_object(PG_FUNCTION_ARGS)
12121212
if (val_type==InvalidOid||val_type==UNKNOWNOID)
12131213
ereport(ERROR,
12141214
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
1215-
errmsg("argument %d:could not determine data type",i+1)));
1215+
errmsg("could not determine data type for argument %d",i+1)));
12161216

12171217
add_jsonb(arg, false,&result,val_type, true);
12181218

@@ -1235,7 +1235,7 @@ jsonb_build_object(PG_FUNCTION_ARGS)
12351235
if (val_type==InvalidOid||val_type==UNKNOWNOID)
12361236
ereport(ERROR,
12371237
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
1238-
errmsg("argument %d:could not determine data type",i+2)));
1238+
errmsg("could not determine data type for argument %d",i+2)));
12391239
add_jsonb(arg,PG_ARGISNULL(i+1),&result,val_type, false);
12401240
}
12411241

@@ -1295,7 +1295,7 @@ jsonb_build_array(PG_FUNCTION_ARGS)
12951295
if (val_type==InvalidOid||val_type==UNKNOWNOID)
12961296
ereport(ERROR,
12971297
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
1298-
errmsg("argument %d:could not determine data type",i+1)));
1298+
errmsg("could not determine data type for argument %d",i+1)));
12991299
add_jsonb(arg,PG_ARGISNULL(i),&result,val_type, false);
13001300
}
13011301

‎src/backend/utils/misc/pg_rusage.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ pg_rusage_show(const PGRUsage *ru0)
6161
}
6262

6363
snprintf(result,sizeof(result),
64-
"CPU: user: %d.%02d s, system: %d.%02d s, elapsed: %d.%02d s",
64+
_("CPU: user: %d.%02d s, system: %d.%02d s, elapsed: %d.%02d s"),
6565
(int) (ru1.ru.ru_utime.tv_sec-ru0->ru.ru_utime.tv_sec),
6666
(int) (ru1.ru.ru_utime.tv_usec-ru0->ru.ru_utime.tv_usec) /10000,
6767
(int) (ru1.ru.ru_stime.tv_sec-ru0->ru.ru_stime.tv_sec),

0 commit comments

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