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

Commitb9b4f10

Browse files
committed
Message style improvements
1 parent378c79d commitb9b4f10

File tree

31 files changed

+115
-114
lines changed

31 files changed

+115
-114
lines changed

‎src/backend/access/gin/ginarrayproc.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-
* $PostgreSQL: pgsql/src/backend/access/gin/ginarrayproc.c,v 1.6 2006/10/04 00:29:47 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/gin/ginarrayproc.c,v 1.7 2006/10/06 17:13:58 petere Exp $
1212
*-------------------------------------------------------------------------
1313
*/
1414
#include"postgres.h"
@@ -27,7 +27,7 @@
2727
if ( ARR_HASNULL(x) )\
2828
ereport(ERROR,\
2929
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),\
30-
errmsg("array must not containnulls")));\
30+
errmsg("array must not containnull values")));\
3131
} while(0)
3232

3333

‎src/backend/access/gin/ginscan.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-
*$PostgreSQL: pgsql/src/backend/access/gin/ginscan.c,v 1.6 2006/10/04 00:29:48 momjian Exp $
11+
*$PostgreSQL: pgsql/src/backend/access/gin/ginscan.c,v 1.7 2006/10/06 17:13:58 petere Exp $
1212
*-------------------------------------------------------------------------
1313
*/
1414

@@ -176,7 +176,7 @@ newScanKey(IndexScanDesc scan)
176176
if (so->nkeys==0)
177177
ereport(ERROR,
178178
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
179-
errmsg("GIN indexdoesn't support search with void query")));
179+
errmsg("GIN indexdoes not support search with void query")));
180180

181181
pgstat_count_index_scan(&scan->xs_pgstat_info);
182182
}

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
99
* IDENTIFICATION
10-
*$PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.24 2006/10/04 00:29:49 momjian Exp $
10+
*$PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.25 2006/10/06 17:13:58 petere Exp $
1111
*
1212
* NOTES
1313
*Each global transaction is associated with a global transaction
@@ -866,7 +866,7 @@ EndPrepare(GlobalTransaction gxact)
866866
if (fd<0)
867867
ereport(ERROR,
868868
(errcode_for_file_access(),
869-
errmsg("could not createtwophase state file \"%s\": %m",
869+
errmsg("could not createtwo-phase state file \"%s\": %m",
870870
path)));
871871

872872
/* Write data to file, and calculate CRC as we pass over it */
@@ -880,7 +880,7 @@ EndPrepare(GlobalTransaction gxact)
880880
close(fd);
881881
ereport(ERROR,
882882
(errcode_for_file_access(),
883-
errmsg("could not writetwophase state file: %m")));
883+
errmsg("could not writetwo-phase state file: %m")));
884884
}
885885
}
886886

@@ -897,7 +897,7 @@ EndPrepare(GlobalTransaction gxact)
897897
close(fd);
898898
ereport(ERROR,
899899
(errcode_for_file_access(),
900-
errmsg("could not writetwophase state file: %m")));
900+
errmsg("could not writetwo-phase state file: %m")));
901901
}
902902

903903
/* Back up to prepare for rewriting the CRC */
@@ -906,7 +906,7 @@ EndPrepare(GlobalTransaction gxact)
906906
close(fd);
907907
ereport(ERROR,
908908
(errcode_for_file_access(),
909-
errmsg("could not seek intwophase state file: %m")));
909+
errmsg("could not seek intwo-phase state file: %m")));
910910
}
911911

912912
/*
@@ -946,13 +946,13 @@ EndPrepare(GlobalTransaction gxact)
946946
close(fd);
947947
ereport(ERROR,
948948
(errcode_for_file_access(),
949-
errmsg("could not writetwophase state file: %m")));
949+
errmsg("could not writetwo-phase state file: %m")));
950950
}
951951

952952
if (close(fd)!=0)
953953
ereport(ERROR,
954954
(errcode_for_file_access(),
955-
errmsg("could not closetwophase state file: %m")));
955+
errmsg("could not closetwo-phase state file: %m")));
956956

957957
/*
958958
* Mark the prepared transaction as valid.As soon as xact.c marks MyProc
@@ -1022,7 +1022,7 @@ ReadTwoPhaseFile(TransactionId xid)
10221022
{
10231023
ereport(WARNING,
10241024
(errcode_for_file_access(),
1025-
errmsg("could not opentwophase state file \"%s\": %m",
1025+
errmsg("could not opentwo-phase state file \"%s\": %m",
10261026
path)));
10271027
returnNULL;
10281028
}
@@ -1036,7 +1036,7 @@ ReadTwoPhaseFile(TransactionId xid)
10361036
close(fd);
10371037
ereport(WARNING,
10381038
(errcode_for_file_access(),
1039-
errmsg("could not stattwophase state file \"%s\": %m",
1039+
errmsg("could not stattwo-phase state file \"%s\": %m",
10401040
path)));
10411041
returnNULL;
10421042
}
@@ -1067,7 +1067,7 @@ ReadTwoPhaseFile(TransactionId xid)
10671067
close(fd);
10681068
ereport(WARNING,
10691069
(errcode_for_file_access(),
1070-
errmsg("could not readtwophase state file \"%s\": %m",
1070+
errmsg("could not readtwo-phase state file \"%s\": %m",
10711071
path)));
10721072
pfree(buf);
10731073
returnNULL;
@@ -1128,7 +1128,7 @@ FinishPreparedTransaction(const char *gid, bool isCommit)
11281128
if (buf==NULL)
11291129
ereport(ERROR,
11301130
(errcode(ERRCODE_DATA_CORRUPTED),
1131-
errmsg("twophase state file for transaction %u is corrupt",
1131+
errmsg("two-phase state file for transaction %u is corrupt",
11321132
xid)));
11331133

11341134
/*
@@ -1250,7 +1250,7 @@ RemoveTwoPhaseFile(TransactionId xid, bool giveWarning)
12501250
if (errno!=ENOENT||giveWarning)
12511251
ereport(WARNING,
12521252
(errcode_for_file_access(),
1253-
errmsg("could not removetwophase state file \"%s\": %m",
1253+
errmsg("could not removetwo-phase state file \"%s\": %m",
12541254
path)));
12551255
}
12561256

@@ -1279,7 +1279,7 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len)
12791279
if (fd<0)
12801280
ereport(ERROR,
12811281
(errcode_for_file_access(),
1282-
errmsg("could not recreatetwophase state file \"%s\": %m",
1282+
errmsg("could not recreatetwo-phase state file \"%s\": %m",
12831283
path)));
12841284

12851285
/* Write content and CRC */
@@ -1288,14 +1288,14 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len)
12881288
close(fd);
12891289
ereport(ERROR,
12901290
(errcode_for_file_access(),
1291-
errmsg("could not writetwophase state file: %m")));
1291+
errmsg("could not writetwo-phase state file: %m")));
12921292
}
12931293
if (write(fd,&statefile_crc,sizeof(pg_crc32))!=sizeof(pg_crc32))
12941294
{
12951295
close(fd);
12961296
ereport(ERROR,
12971297
(errcode_for_file_access(),
1298-
errmsg("could not writetwophase state file: %m")));
1298+
errmsg("could not writetwo-phase state file: %m")));
12991299
}
13001300

13011301
/*
@@ -1307,13 +1307,13 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len)
13071307
close(fd);
13081308
ereport(ERROR,
13091309
(errcode_for_file_access(),
1310-
errmsg("could not fsynctwophase state file: %m")));
1310+
errmsg("could not fsynctwo-phase state file: %m")));
13111311
}
13121312

13131313
if (close(fd)!=0)
13141314
ereport(ERROR,
13151315
(errcode_for_file_access(),
1316-
errmsg("could not closetwophase state file: %m")));
1316+
errmsg("could not closetwo-phase state file: %m")));
13171317
}
13181318

13191319
/*
@@ -1390,7 +1390,7 @@ CheckPointTwoPhase(XLogRecPtr redo_horizon)
13901390
}
13911391
ereport(ERROR,
13921392
(errcode_for_file_access(),
1393-
errmsg("could not opentwophase state file \"%s\": %m",
1393+
errmsg("could not opentwo-phase state file \"%s\": %m",
13941394
path)));
13951395
}
13961396

@@ -1399,14 +1399,14 @@ CheckPointTwoPhase(XLogRecPtr redo_horizon)
13991399
close(fd);
14001400
ereport(ERROR,
14011401
(errcode_for_file_access(),
1402-
errmsg("could not fsynctwophase state file \"%s\": %m",
1402+
errmsg("could not fsynctwo-phase state file \"%s\": %m",
14031403
path)));
14041404
}
14051405

14061406
if (close(fd)!=0)
14071407
ereport(ERROR,
14081408
(errcode_for_file_access(),
1409-
errmsg("could not closetwophase state file \"%s\": %m",
1409+
errmsg("could not closetwo-phase state file \"%s\": %m",
14101410
path)));
14111411
}
14121412

@@ -1462,7 +1462,7 @@ PrescanPreparedTransactions(void)
14621462
if (TransactionIdFollowsOrEquals(xid,origNextXid))
14631463
{
14641464
ereport(WARNING,
1465-
(errmsg("removing futuretwophase state file \"%s\"",
1465+
(errmsg("removing futuretwo-phase state file \"%s\"",
14661466
clde->d_name)));
14671467
RemoveTwoPhaseFile(xid, true);
14681468
continue;
@@ -1478,7 +1478,7 @@ PrescanPreparedTransactions(void)
14781478
if (buf==NULL)
14791479
{
14801480
ereport(WARNING,
1481-
(errmsg("removing corrupttwophase state file \"%s\"",
1481+
(errmsg("removing corrupttwo-phase state file \"%s\"",
14821482
clde->d_name)));
14831483
RemoveTwoPhaseFile(xid, true);
14841484
continue;
@@ -1489,7 +1489,7 @@ PrescanPreparedTransactions(void)
14891489
if (!TransactionIdEquals(hdr->xid,xid))
14901490
{
14911491
ereport(WARNING,
1492-
(errmsg("removing corrupttwophase state file \"%s\"",
1492+
(errmsg("removing corrupttwo-phase state file \"%s\"",
14931493
clde->d_name)));
14941494
RemoveTwoPhaseFile(xid, true);
14951495
pfree(buf);
@@ -1566,7 +1566,7 @@ RecoverPreparedTransactions(void)
15661566
if (TransactionIdDidCommit(xid)||TransactionIdDidAbort(xid))
15671567
{
15681568
ereport(WARNING,
1569-
(errmsg("removing staletwophase state file \"%s\"",
1569+
(errmsg("removing staletwo-phase state file \"%s\"",
15701570
clde->d_name)));
15711571
RemoveTwoPhaseFile(xid, true);
15721572
continue;
@@ -1577,7 +1577,7 @@ RecoverPreparedTransactions(void)
15771577
if (buf==NULL)
15781578
{
15791579
ereport(WARNING,
1580-
(errmsg("removing corrupttwophase state file \"%s\"",
1580+
(errmsg("removing corrupttwo-phase state file \"%s\"",
15811581
clde->d_name)));
15821582
RemoveTwoPhaseFile(xid, true);
15831583
continue;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
10-
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.250 2006/10/04 00:29:49 momjian Exp $
10+
* $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.251 2006/10/06 17:13:58 petere Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -6421,7 +6421,7 @@ pg_switch_xlog(PG_FUNCTION_ARGS)
64216421
if (!superuser())
64226422
ereport(ERROR,
64236423
(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
6424-
(errmsg("must be superuser to switchxlog files"))));
6424+
(errmsg("must be superuser to switchtransaction log files"))));
64256425

64266426
switchpoint=RequestXLogSwitch();
64276427

@@ -6529,7 +6529,7 @@ pg_xlogfile_name_offset(PG_FUNCTION_ARGS)
65296529
if (sscanf(locationstr,"%X/%X",&uxlogid,&uxrecoff)!=2)
65306530
ereport(ERROR,
65316531
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
6532-
errmsg("could not parsexlog location \"%s\"",
6532+
errmsg("could not parsetransaction log location \"%s\"",
65336533
locationstr)));
65346534

65356535
locationpoint.xlogid=uxlogid;

‎src/backend/commands/copy.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.272 2006/10/04 00:29:50 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/copy.c,v 1.273 2006/10/06 17:13:58 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -872,7 +872,7 @@ DoCopy(const CopyStmt *stmt)
872872
strchr(cstate->null_print,'\n')!=NULL)
873873
ereport(ERROR,
874874
(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
875-
errmsg("COPY null cannot use newline or carriage return")));
875+
errmsg("COPY nullrepresentationcannot use newline or carriage return")));
876876

877877
/* Disallow backslash in non-CSV mode */
878878
if (!cstate->csv_mode&&strchr(cstate->delim,'\\')!=NULL)
@@ -1549,7 +1549,7 @@ copy_in_error_callback(void *arg)
15491549
elseif (cstate->cur_attname)
15501550
{
15511551
/* error is relevant to a particular column, value is NULL */
1552-
errcontext("COPY %s, line %d, column %s:NULL input",
1552+
errcontext("COPY %s, line %d, column %s:null input",
15531553
cstate->cur_relname,cstate->cur_lineno,
15541554
cstate->cur_attname);
15551555
}

‎src/backend/commands/define.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/commands/define.c,v 1.98 2006/10/04 00:29:51 momjian Exp $
12+
* $PostgreSQL: pgsql/src/backend/commands/define.c,v 1.99 2006/10/06 17:13:58 petere Exp $
1313
*
1414
* DESCRIPTION
1515
* The "DefineFoo" routines take the parse tree and pick out the
@@ -163,7 +163,7 @@ defGetBoolean(DefElem *def)
163163
}
164164
ereport(ERROR,
165165
(errcode(ERRCODE_SYNTAX_ERROR),
166-
errmsg("%s requires aboolean value",
166+
errmsg("%s requires aBoolean value",
167167
def->defname)));
168168
return false;/* keep compiler quiet */
169169
}

‎src/backend/commands/functioncmds.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.79 2006/10/04 00:29:51 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/commands/functioncmds.c,v 1.80 2006/10/06 17:13:58 petere Exp $
1414
*
1515
* DESCRIPTION
1616
* These routines take the parse tree and pick out the
@@ -1402,7 +1402,7 @@ DropCast(DropCastStmt *stmt)
14021402
TypeNameToString(stmt->targettype))));
14031403
else
14041404
ereport(NOTICE,
1405-
(errmsg("cast from type %s to type %s does not exist ... skipping",
1405+
(errmsg("cast from type %s to type %s does not exist, skipping",
14061406
TypeNameToString(stmt->sourcetype),
14071407
TypeNameToString(stmt->targettype))));
14081408

‎src/backend/commands/sequence.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.140 2006/10/04 00:29:51 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/sequence.c,v 1.141 2006/10/06 17:13:58 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1209,11 +1209,11 @@ process_owned_by(Relation seqrel, List *owned_by)
12091209
if (seqrel->rd_rel->relowner!=tablerel->rd_rel->relowner)
12101210
ereport(ERROR,
12111211
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1212-
errmsg("sequence must have same owner as table it isowned by")));
1212+
errmsg("sequence must have same owner as table it islinked to")));
12131213
if (RelationGetNamespace(seqrel)!=RelationGetNamespace(tablerel))
12141214
ereport(ERROR,
12151215
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
1216-
errmsg("sequence must be in same schema as table it isowned by")));
1216+
errmsg("sequence must be in same schema as table it islinked to")));
12171217

12181218
/* Now, fetch the attribute number from the system cache */
12191219
attnum=get_attnum(RelationGetRelid(tablerel),attrname);

0 commit comments

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