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

Commit81b5c8a

Browse files
committed
A visit from the message-style police ...
1 parentb556e82 commit81b5c8a

File tree

55 files changed

+161
-158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+161
-158
lines changed

‎contrib/tsearch2/tsvector.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,8 @@ tsearch2(PG_FUNCTION_ARGS)
762762
if (numidxattr==SPI_ERROR_NOATTRIBUTE)
763763
ereport(ERROR,
764764
(errcode(ERRCODE_UNDEFINED_COLUMN),
765-
errmsg("cannot find tsvector_field")));
765+
errmsg("tsvector column \"%s\" does not exist",
766+
trigger->tgargs[0])));
766767

767768
prs.lenwords=32;
768769
prs.curwords=0;
@@ -785,7 +786,7 @@ tsearch2(PG_FUNCTION_ARGS)
785786
if (funcoid==InvalidOid )
786787
ereport(ERROR,
787788
(errcode(ERRCODE_UNDEFINED_COLUMN),
788-
errmsg("cannot find function or field \"%s\"",
789+
errmsg("could not find function or field \"%s\"",
789790
trigger->tgargs[i])));
790791

791792
continue;

‎src/backend/access/common/tupdesc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.96 2003/07/21 20:29:38 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.97 2003/07/28 00:09:13 tgl Exp $
1212
*
1313
* NOTES
1414
* some of the executor utility code such as "ExecTypeFromTL" should be
@@ -703,7 +703,7 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)
703703
elseif (functyptype=='p'&&typeoid==RECORDOID)
704704
ereport(ERROR,
705705
(errcode(ERRCODE_DATATYPE_MISMATCH),
706-
errmsg("unable to determine tuple description for function returning record")));
706+
errmsg("could not determine tuple description for function returning record")));
707707
else
708708
{
709709
/* crummy error message, but parser should have caught this */

‎src/backend/access/gist/gistscan.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.44 2003/03/23 23:01:02 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/gist/gistscan.c,v 1.45 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -243,7 +243,8 @@ gistdropscan(IndexScanDesc s)
243243
prev=l;
244244

245245
if (l== (GISTScanList)NULL)
246-
elog(ERROR,"GiST scan list corrupted -- cannot find 0x%p", (void*)s);
246+
elog(ERROR,"GiST scan list corrupted -- could not find 0x%p",
247+
(void*)s);
247248

248249
if (prev== (GISTScanList)NULL)
249250
GISTScans=l->gsl_next;

‎src/backend/access/nbtree/nbtinsert.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.101 2003/07/21 20:29:39 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.102 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1064,7 +1064,7 @@ _bt_findsplitloc(Relation rel,
10641064
* just in case ...
10651065
*/
10661066
if (!state.have_split)
1067-
elog(ERROR,"cannot find a feasible split point for \"%s\"",
1067+
elog(ERROR,"could not find a feasible split point for \"%s\"",
10681068
RelationGetRelationName(rel));
10691069

10701070
*newitemonleft=state.newitemonleft;

‎src/backend/access/nbtree/nbtsearch.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.75 2003/07/21 20:29:39 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsearch.c,v 1.76 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1015,7 +1015,7 @@ _bt_walk_left(Relation rel, Buffer buf)
10151015
* if there's anything wrong.
10161016
*/
10171017
if (opaque->btpo_prev==lblkno)
1018-
elog(ERROR,"cannot find left sibling in \"%s\"",
1018+
elog(ERROR,"could not find left sibling in \"%s\"",
10191019
RelationGetRelationName(rel));
10201020
/* Okay to try again with new lblkno value */
10211021
}

‎src/backend/access/nbtree/nbtutils.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.52 2003/07/21 20:29:39 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtutils.c,v 1.53 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -461,7 +461,7 @@ _bt_getstrategynumber(RegProcedure sk_procedure, StrategyMap map)
461461
if (sk_procedure==map->entry[j].sk_procedure)
462462
returnj;
463463
}
464-
elog(ERROR,"unable to identify operator %u",sk_procedure);
464+
elog(ERROR,"could not identify operator %u",sk_procedure);
465465
return-1;/* keep compiler quiet */
466466
}
467467

‎src/backend/access/rtree/rtscan.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.44 2003/07/21 20:29:39 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtscan.c,v 1.45 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -248,7 +248,8 @@ rtdropscan(IndexScanDesc s)
248248
prev=l;
249249

250250
if (l== (RTScanList)NULL)
251-
elog(ERROR,"rtree scan list corrupted -- cannot find 0x%p", (void*)s);
251+
elog(ERROR,"rtree scan list corrupted -- could not find 0x%p",
252+
(void*)s);
252253

253254
if (prev== (RTScanList)NULL)
254255
RTScans=l->rtsl_next;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $Header: /cvsroot/pgsql/src/backend/access/transam/slru.c,v 1.2 2003/07/19 21:37:37 tgl Exp $
9+
* $Header: /cvsroot/pgsql/src/backend/access/transam/slru.c,v 1.3 2003/07/28 00:09:14 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -811,7 +811,7 @@ restart:;
811811
{
812812
LWLockRelease(ctl->locks->ControlLock);
813813
ereport(LOG,
814-
(errmsg("unable to truncate \"%s\": apparent wraparound",
814+
(errmsg("could not truncate \"%s\": apparent wraparound",
815815
ctl->Dir)));
816816
return;
817817
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.119 2003/07/21 20:29:39 tgl Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.120 2003/07/28 00:09:14 tgl Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -2642,7 +2642,7 @@ StartupXLOG(void)
26422642
}
26432643
else
26442644
ereport(PANIC,
2645-
(errmsg("unable to locate a valid checkpoint record")));
2645+
(errmsg("could not locate a valid checkpoint record")));
26462646
}
26472647
LastRec=RecPtr=checkPointLoc;
26482648
memcpy(&checkPoint,XLogRecGetData(record),sizeof(CheckPoint));

‎src/backend/catalog/dependency.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.27 2003/07/21 01:59:07 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/dependency.c,v 1.28 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1725,7 +1725,7 @@ getObjectDescription(const ObjectAddress *object)
17251725
}
17261726

17271727
default:
1728-
appendStringInfo(&buffer,"unknown object %u %u %d",
1728+
appendStringInfo(&buffer,"unrecognized object %u %u %d",
17291729
object->classId,
17301730
object->objectId,
17311731
object->objectSubId);

‎src/backend/catalog/pg_conversion.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_conversion.c,v 1.11 2003/07/21 01:59:10 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_conversion.c,v 1.12 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -76,7 +76,7 @@ ConversionCreate(const char *conname, Oid connamespace,
7676
contoencoding))
7777
ereport(ERROR,
7878
(errcode(ERRCODE_DUPLICATE_OBJECT),
79-
errmsg("default conversion for\"%s\" to\"%s\" already exists",
79+
errmsg("default conversion for%s to%s already exists",
8080
pg_encoding_to_char(conforencoding),
8181
pg_encoding_to_char(contoencoding))));
8282
}

‎src/backend/commands/dbcommands.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.117 2003/07/18 23:20:32 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.118 2003/07/28 00:09:14 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -334,12 +334,12 @@ createdb(const CreatedbStmt *stmt)
334334
if (mkdir(target_dir,S_IRWXU)!=0)
335335
ereport(ERROR,
336336
(errcode_for_file_access(),
337-
errmsg("unable to create database directory \"%s\": %m",
337+
errmsg("could not create database directory \"%s\": %m",
338338
target_dir)));
339339
if (rmdir(target_dir)!=0)
340340
ereport(ERROR,
341341
(errcode_for_file_access(),
342-
errmsg("unable to remove temp directory \"%s\": %m",
342+
errmsg("could not remove temp directory \"%s\": %m",
343343
target_dir)));
344344

345345
/* Make the symlink, if needed */

‎src/backend/commands/functioncmds.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.29 2003/07/20 21:56:32 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/functioncmds.c,v 1.30 2003/07/28 00:09:14 tgl Exp $
1313
*
1414
* DESCRIPTION
1515
* These routines take the parse tree and pick out the
@@ -106,12 +106,12 @@ compute_return_type(TypeName *returnType, Oid languageOid,
106106
languageOid!=ClanguageId)
107107
ereport(ERROR,
108108
(errcode(ERRCODE_UNDEFINED_OBJECT),
109-
errmsg("type%s does not exist",typnam)));
109+
errmsg("type\"%s\" does not exist",typnam)));
110110

111111
/* Otherwise, go ahead and make a shell type */
112112
ereport(NOTICE,
113113
(errcode(ERRCODE_UNDEFINED_OBJECT),
114-
errmsg("type%s is not yet defined",typnam),
114+
errmsg("type\"%s\" is not yet defined",typnam),
115115
errdetail("Creating a shell type definition.")));
116116
namespaceId=QualifiedNameGetCreationNamespace(returnType->names,
117117
&typname);
@@ -862,7 +862,7 @@ CreateCast(CreateCastStmt *stmt)
862862
if (procstruct->pronargs!=1)
863863
ereport(ERROR,
864864
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
865-
errmsg("cast function must take1 argument")));
865+
errmsg("cast function must takeone argument")));
866866
if (procstruct->proargtypes[0]!=sourcetypeid)
867867
ereport(ERROR,
868868
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
@@ -962,7 +962,7 @@ CreateCast(CreateCastStmt *stmt)
962962
if (HeapTupleIsValid(tuple))
963963
ereport(ERROR,
964964
(errcode(ERRCODE_DUPLICATE_OBJECT),
965-
errmsg("cast fromdatatype %s to data type %s already exists",
965+
errmsg("cast from type %s to type %s already exists",
966966
TypeNameToString(stmt->sourcetype),
967967
TypeNameToString(stmt->targettype))));
968968

‎src/backend/commands/opclasscmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.13 2003/07/20 21:56:32 tgl Exp $
12+
* $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.14 2003/07/28 00:09:14 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -278,10 +278,10 @@ DefineOpClass(CreateOpClassStmt *stmt)
278278
if (opclass->opcintype==typeoid&&opclass->opcdefault)
279279
ereport(ERROR,
280280
(errcode(ERRCODE_DUPLICATE_OBJECT),
281-
errmsg("cannot make class \"%s\" be default for type %s",
281+
errmsg("could not make class \"%s\" be default for type %s",
282282
opcname,
283283
TypeNameToString(stmt->datatype)),
284-
errdetail("class \"%s\" already is the default",
284+
errdetail("Class \"%s\" already is the default.",
285285
NameStr(opclass->opcname))));
286286
}
287287

‎src/backend/commands/portalcmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*
1515
*
1616
* IDENTIFICATION
17-
* $Header: /cvsroot/pgsql/src/backend/commands/portalcmds.c,v 1.17 2003/07/20 21:56:32 tgl Exp $
17+
* $Header: /cvsroot/pgsql/src/backend/commands/portalcmds.c,v 1.18 2003/07/28 00:09:14 tgl Exp $
1818
*
1919
*-------------------------------------------------------------------------
2020
*/
@@ -365,7 +365,7 @@ PersistHoldablePortal(Portal portal)
365365
if (portal->posOverflow)/* oops, cannot trust portalPos */
366366
ereport(ERROR,
367367
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
368-
errmsg("unable to reposition held cursor")));
368+
errmsg("could not reposition held cursor")));
369369

370370
tuplestore_rescan(portal->holdStore);
371371

‎src/backend/commands/prepare.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Copyright (c) 2002-2003, PostgreSQL Global Development Group
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/commands/prepare.c,v 1.20 2003/07/20 21:56:32 tgl Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/commands/prepare.c,v 1.21 2003/07/28 00:09:14 tgl Exp $
1414
*
1515
*-------------------------------------------------------------------------
1616
*/
@@ -264,7 +264,7 @@ InitQueryHashTable(void)
264264
HASH_ELEM);
265265

266266
if (!prepared_queries)
267-
elog(ERROR,"unable to create hash table");
267+
elog(ERROR,"could not create hash table");
268268
}
269269

270270
/*
@@ -336,7 +336,7 @@ StorePreparedStatement(const char *stmt_name,
336336

337337
/* Shouldn't get a failure, nor a duplicate entry */
338338
if (!entry||found)
339-
elog(ERROR,"unable to store prepared statement \"%s\"",
339+
elog(ERROR,"could not store prepared statement \"%s\"",
340340
stmt_name);
341341

342342
/* Fill in the hash table entry with copied data */

‎src/backend/commands/schemacmds.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/schemacmds.c,v 1.12 2003/07/18 23:20:32 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/schemacmds.c,v 1.13 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -97,7 +97,7 @@ CreateSchemaCommand(CreateSchemaStmt *stmt)
9797
ereport(ERROR,
9898
(errcode(ERRCODE_RESERVED_NAME),
9999
errmsg("unacceptable schema name \"%s\"",schemaName),
100-
errdetail("The prefix pg_ is reserved for system schemas.")));
100+
errdetail("The prefix\"pg_\" is reserved for system schemas.")));
101101

102102
/* Create the schema's namespace */
103103
namespaceId=NamespaceCreate(schemaName,owner_userid);
@@ -214,7 +214,7 @@ RemoveSchemaById(Oid schemaOid)
214214
ObjectIdGetDatum(schemaOid),
215215
0,0,0);
216216
if (!HeapTupleIsValid(tup))/* should not happen */
217-
elog(ERROR,"cache lookup failed forschema %u",schemaOid);
217+
elog(ERROR,"cache lookup failed fornamespace %u",schemaOid);
218218

219219
simple_heap_delete(relation,&tup->t_self);
220220

@@ -266,7 +266,7 @@ RenameSchema(const char *oldname, const char *newname)
266266
ereport(ERROR,
267267
(errcode(ERRCODE_RESERVED_NAME),
268268
errmsg("unacceptable schema name \"%s\"",newname),
269-
errdetail("The prefix pg_ is reserved for system schemas.")));
269+
errdetail("The prefix\"pg_\" is reserved for system schemas.")));
270270

271271
/* rename */
272272
namestrcpy(&(((Form_pg_namespace)GETSTRUCT(tup))->nspname),newname);

‎src/backend/commands/sequence.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.97 2003/07/20 21:56:32 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/sequence.c,v 1.98 2003/07/28 00:09:14 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -856,8 +856,8 @@ read_info(SeqTable elm, Relation rel, Buffer *buf)
856856
sm= (sequence_magic*)PageGetSpecialPointer(page);
857857

858858
if (sm->magic!=SEQ_MAGIC)
859-
elog(ERROR,"bad magic number(%08X)in sequence \"%s\"",
860-
sm->magic,RelationGetRelationName(rel));
859+
elog(ERROR,"bad magic number in sequence \"%s\": %08X",
860+
RelationGetRelationName(rel),sm->magic);
861861

862862
lp=PageGetItemId(page,FirstOffsetNumber);
863863
Assert(ItemIdIsUsed(lp));
@@ -954,7 +954,7 @@ init_params(List *options, Form_pg_sequence new)
954954
if (new->increment_by==0)
955955
ereport(ERROR,
956956
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
957-
errmsg("can't INCREMENT by zero")));
957+
errmsg("cannot increment by zero")));
958958
}
959959

960960
/* MAXVALUE */

0 commit comments

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