NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitfeb4f44

committed

Message editing: remove gratuitous variations in message wording, standardize

terms, add some clarifications, fix some untranslatable attempts at dynamicmessage building.

1 parent42013ca commitfeb4f44Copy full SHA for feb4f44

File tree

159 files changed

+1418

-1408

lines changed

src
- backend
  - access
    - common
    - hash
      - hashinsert.c
      - hashutil.c
    - heap
      - heapam.c
      - hio.c
    - index
      - indexam.c
    - nbtree
    - rtree
      - rtree.c
    - transam
  - catalog
  - commands
  - executor
  - libpq
  - main
    - main.c
  - optimizer
    - path
      - allpaths.c
      - joinpath.c
    - plan
      - initsplan.c
      - planner.c
    - prep
      - prepjointree.c
  - parser
  - postmaster
    - pgstat.c
    - postmaster.c
  - rewrite
  - storage
    - buffer
      - bufmgr.c
    - file
      - fd.c
    - freespace
      - freespace.c
    - ipc
      - shmem.c
    - lmgr
      - deadlock.c
    - smgr
      - smgr.c
  - tcop
    - fastpath.c
    - postgres.c
  - utils
    - adt
    - cache
      - relcache.c
    - error
      - elog.c
    - fmgr
      - dfmgr.c
      - fmgr.c
    - init
      - miscinit.c
      - postinit.c
    - mb
      - mbutils.c
      - wchar.c
    - misc
- test/regress/expected

Some content is hidden

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

159 files changed

+1418

-1408

lines changed

`‎src/backend/access/common/heaptuple.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.86 2003/08/04 02:39:56momjian Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.87 2003/09/25 06:57:56petere Exp $`
`13`	`13`	`*`
`14`	`14`	`* NOTES`
`15`	`15`	`* The old interface functions have been converted to macros`
`@@ -581,7 +581,7 @@ heap_formtuple(TupleDesc tupleDescriptor,`
`581`	`581`	`if (numberOfAttributes>MaxTupleAttributeNumber)`
`582`	`582`	`ereport(ERROR,`
`583`	`583`	`(errcode(ERRCODE_TOO_MANY_COLUMNS),`
`584`		`-errmsg("number ofattributes %d exceeds limit, %d",`
	`584`	`+errmsg("number ofcolumns (%d) exceeds limit (%d)",`
`585`	`585`	`numberOfAttributes,MaxTupleAttributeNumber)));`
`586`	`586`
`587`	`587`	`for (i=0;i<numberOfAttributes;i++)`

`‎src/backend/access/common/indextuple.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.67 2003/08/04 02:39:56momjian Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.68 2003/09/25 06:57:56petere Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -54,7 +54,7 @@ index_formtuple(TupleDesc tupleDescriptor,`
`54`	`54`	`if (numberOfAttributes>INDEX_MAX_KEYS)`
`55`	`55`	`ereport(ERROR,`
`56`	`56`	`(errcode(ERRCODE_TOO_MANY_COLUMNS),`
`57`		`-errmsg("number of indexattributes %d exceeds limit, %d",`
	`57`	`+errmsg("number of indexcolumns (%d) exceeds limit (%d)",`
`58`	`58`	`numberOfAttributes,INDEX_MAX_KEYS)));`
`59`	`59`
`60`	`60`	`#ifdefTOAST_INDEX_HACK`
`@@ -162,7 +162,7 @@ index_formtuple(TupleDesc tupleDescriptor,`
`162`	`162`	`if ((size&INDEX_SIZE_MASK)!=size)`
`163`	`163`	`ereport(ERROR,`
`164`	`164`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`165`		`-errmsg("indextuple requires %lu bytes, maximum size is %lu",`
	`165`	`+errmsg("indexrow requires %lu bytes, maximum size is %lu",`
`166`	`166`	`(unsigned long)size,`
`167`	`167`	`(unsigned long)INDEX_SIZE_MASK)));`
`168`	`168`

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

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.99 2003/08/11 23:04:49 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.100 2003/09/25 06:57:56 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* some of the executor utility code such as "ExecTypeFromTL" should be`
`@@ -657,7 +657,7 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)`
`657`	`657`	`if (length(colaliases)!=natts)`
`658`	`658`	`ereport(ERROR,`
`659`	`659`	`(errcode(ERRCODE_DATATYPE_MISMATCH),`
`660`		`-errmsg("number of aliases does not match number ofattributes")));`
	`660`	`+errmsg("number of aliases does not match number ofcolumns")));`
`661`	`661`
`662`	`662`	`/* OK, use the aliases instead */`
`663`	`663`	`for (varattno=0;varattno<natts;varattno++)`
`@@ -684,7 +684,7 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)`
`684`	`684`	`if (length(colaliases)!=1)`
`685`	`685`	`ereport(ERROR,`
`686`	`686`	`(errcode(ERRCODE_DATATYPE_MISMATCH),`
`687`		`-errmsg("number of aliases does not match number ofattributes")));`
	`687`	`+errmsg("number of aliases does not match number ofcolumns")));`
`688`	`688`
`689`	`689`	`/* OK, get the column alias */`
`690`	`690`	`attname=strVal(lfirst(colaliases));`
`@@ -701,7 +701,7 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)`
`701`	`701`	`elseif (functyptype=='p'&&typeoid==RECORDOID)`
`702`	`702`	`ereport(ERROR,`
`703`	`703`	`(errcode(ERRCODE_DATATYPE_MISMATCH),`
`704`		`-errmsg("could not determinetuple description for function returning record")));`
	`704`	`+errmsg("could not determinerow description for function returning record")));`
`705`	`705`	`else`
`706`	`706`	`{`
`707`	`707`	`/* crummy error message, but parser should have caught this */`

`‎src/backend/access/hash/hashinsert.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.30 2003/09/04 22:06:27 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashinsert.c,v 1.31 2003/09/2506:57:56 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -87,7 +87,7 @@ _hash_doinsert(Relation rel, HashItem hitem)`
`87`	`87`	`if (itemsz>HashMaxItemSize((Page)metap))`
`88`	`88`	`ereport(ERROR,`
`89`	`89`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`90`		`-errmsg("indextuple size %lu exceeds hash maximum, %lu",`
	`90`	`+errmsg("indexrow size %lu exceeds hash maximum %lu",`
`91`	`91`	`(unsigned long)itemsz,`
`92`	`92`	`(unsigned long)HashMaxItemSize((Page)metap))));`
`93`	`93`

`‎src/backend/access/hash/hashutil.c`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.36 2003/09/04 22:06:27 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/hash/hashutil.c,v 1.37 2003/09/2506:57:56 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -43,7 +43,7 @@ _hash_formitem(IndexTuple itup)`
`43`	`43`	`if (IndexTupleHasNulls(itup))`
`44`	`44`	`ereport(ERROR,`
`45`	`45`	`(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
`46`		`-errmsg("hash indexes cannotinclude null keys")));`
	`46`	`+errmsg("hash indexes cannotcontain null keys")));`
`47`	`47`
`48`	`48`	`/*`
`49`	`49`	`* make a copy of the index tuple (XXX do we still need to copy?)`
`@@ -129,8 +129,8 @@ _hash_checkpage(Relation rel, Page page, int flags)`
`129`	`129`	`if (metap->hashm_version!=HASH_VERSION)`
`130`	`130`	`ereport(ERROR,`
`131`	`131`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`132`		`-errmsg("index \"%s\" has wrong hash version, please REINDEX it",`
`133`		`-RelationGetRelationName(rel))));`
	`132`	`+errmsg("index \"%s\" has wrong hash version",RelationGetRelationName(rel)),`
	`133`	`+errhint("Please REINDEX it.")));`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`/*`

`‎src/backend/access/heap/heapam.c`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.155 2003/09/15 23:33:38 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.156 2003/09/25 06:57:56 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -577,7 +577,7 @@ heap_open(Oid relationId, LOCKMODE lockmode)`
`577`	`577`	`if (r->rd_rel->relkind==RELKIND_INDEX)`
`578`	`578`	`ereport(ERROR,`
`579`	`579`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`580`		`-errmsg("\"%s\" is an index relation",`
	`580`	`+errmsg("\"%s\" is an index",`
`581`	`581`	`RelationGetRelationName(r))));`
`582`	`582`	`elseif (r->rd_rel->relkind==RELKIND_SPECIAL)`
`583`	`583`	`ereport(ERROR,`
`@@ -612,7 +612,7 @@ heap_openrv(const RangeVar *relation, LOCKMODE lockmode)`
`612`	`612`	`if (r->rd_rel->relkind==RELKIND_INDEX)`
`613`	`613`	`ereport(ERROR,`
`614`	`614`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`615`		`-errmsg("\"%s\" is an index relation",`
	`615`	`+errmsg("\"%s\" is an index",`
`616`	`616`	`RelationGetRelationName(r))));`
`617`	`617`	`elseif (r->rd_rel->relkind==RELKIND_SPECIAL)`
`618`	`618`	`ereport(ERROR,`
`@@ -647,7 +647,7 @@ heap_openr(const char *sysRelationName, LOCKMODE lockmode)`
`647`	`647`	`if (r->rd_rel->relkind==RELKIND_INDEX)`
`648`	`648`	`ereport(ERROR,`
`649`	`649`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`650`		`-errmsg("\"%s\" is an index relation",`
	`650`	`+errmsg("\"%s\" is an index",`
`651`	`651`	`RelationGetRelationName(r))));`
`652`	`652`	`elseif (r->rd_rel->relkind==RELKIND_SPECIAL)`
`653`	`653`	`ereport(ERROR,`

`‎src/backend/access/heap/hio.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Id: hio.c,v 1.49 2003/08/04 02:39:57momjian Exp $`
	`11`	`+ * $Id: hio.c,v 1.50 2003/09/25 06:57:57petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -106,7 +106,7 @@ RelationGetBufferForTuple(Relation relation, Size len,`
`106`	`106`	`if (len>MaxTupleSize)`
`107`	`107`	`ereport(ERROR,`
`108`	`108`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`109`		`-errmsg("tuple is too big: size %lu, maximum size %lu",`
	`109`	`+errmsg("row is too big: size %lu, maximum size %lu",`
`110`	`110`	`(unsigned long)len,`
`111`	`111`	`(unsigned long)MaxTupleSize)));`
`112`	`112`

`‎src/backend/access/index/indexam.c`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.70 2003/08/08 21:41:25 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.71 2003/09/25 06:57:57 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`* INTERFACE ROUTINES`
`14`	`14`	`*index_open- open an index relation by relation OID`
`@@ -131,7 +131,7 @@ index_open(Oid relationId)`
`131`	`131`	`if (r->rd_rel->relkind!=RELKIND_INDEX)`
`132`	`132`	`ereport(ERROR,`
`133`	`133`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`134`		`-errmsg("\"%s\" is not an index relation",`
	`134`	`+errmsg("\"%s\" is not an index",`
`135`	`135`	`RelationGetRelationName(r))));`
`136`	`136`
`137`	`137`	`pgstat_initstats(&r->pgstat_info,r);`
`@@ -156,7 +156,7 @@ index_openrv(const RangeVar *relation)`
`156`	`156`	`if (r->rd_rel->relkind!=RELKIND_INDEX)`
`157`	`157`	`ereport(ERROR,`
`158`	`158`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`159`		`-errmsg("\"%s\" is not an index relation",`
	`159`	`+errmsg("\"%s\" is not an index",`
`160`	`160`	`RelationGetRelationName(r))));`
`161`	`161`
`162`	`162`	`pgstat_initstats(&r->pgstat_info,r);`
`@@ -181,7 +181,7 @@ index_openr(const char *sysRelationName)`
`181`	`181`	`if (r->rd_rel->relkind!=RELKIND_INDEX)`
`182`	`182`	`ereport(ERROR,`
`183`	`183`	`(errcode(ERRCODE_WRONG_OBJECT_TYPE),`
`184`		`-errmsg("\"%s\" is not an index relation",`
	`184`	`+errmsg("\"%s\" is not an index",`
`185`	`185`	`RelationGetRelationName(r))));`
`186`	`186`
`187`	`187`	`pgstat_initstats(&r->pgstat_info,r);`

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

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.105 2003/09/02 22:10:16 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtinsert.c,v 1.106 2003/09/25 06:57:57 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -251,7 +251,7 @@ _bt_check_unique(Relation rel, BTItem btitem, Relation heapRel,`
`251`	`251`	`*/`
`252`	`252`	`ereport(ERROR,`
`253`	`253`	`(errcode(ERRCODE_UNIQUE_VIOLATION),`
`254`		`-errmsg("duplicate key violatesUNIQUE constraint \"%s\"",`
	`254`	`+errmsg("duplicate key violatesunique constraint \"%s\"",`
`255`	`255`	`RelationGetRelationName(rel))));`
`256`	`256`	`}`
`257`	`257`	`elseif (htup.t_data!=NULL)`
`@@ -403,7 +403,7 @@ _bt_insertonpg(Relation rel,`
`403`	`403`	`if (itemsz>BTMaxItemSize(page))`
`404`	`404`	`ereport(ERROR,`
`405`	`405`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`406`		`-errmsg("indextuple size %lu exceeds btree maximum, %lu",`
	`406`	`+errmsg("indexrow size %lu exceeds btree maximum, %lu",`
`407`	`407`	`(unsigned long)itemsz,`
`408`	`408`	`(unsigned long)BTMaxItemSize(page))));`
`409`	`409`

`‎src/backend/access/nbtree/nbtpage.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`*`
`11`	`11`	`* IDENTIFICATION`
`12`		`- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.70 2003/08/10 19:48:08 tgl Exp $`
	`12`	`+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtpage.c,v 1.71 2003/09/25 06:57:57 petere Exp $`
`13`	`13`	`*`
`14`	`14`	`*NOTES`
`15`	`15`	`* Postgres btree pages look like ordinary relation pages.The opaque`
`@@ -153,7 +153,7 @@ _bt_getroot(Relation rel, int access)`
`153`	`153`	`if (metad->btm_version!=BTREE_VERSION)`
`154`	`154`	`ereport(ERROR,`
`155`	`155`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`156`		`-errmsg("version mismatch in \"%s\": file version %d, code version %d",`
	`156`	`+errmsg("version mismatch inindex\"%s\": file version %d, code version %d",`
`157`	`157`	`RelationGetRelationName(rel),`
`158`	`158`	`metad->btm_version,BTREE_VERSION)));`
`159`	`159`
`@@ -332,7 +332,7 @@ _bt_gettrueroot(Relation rel)`
`332`	`332`	`if (metad->btm_version!=BTREE_VERSION)`
`333`	`333`	`ereport(ERROR,`
`334`	`334`	`(errcode(ERRCODE_INDEX_CORRUPTED),`
`335`		`-errmsg("version mismatch in \"%s\": file version %d, code version %d",`
	`335`	`+errmsg("version mismatch inindex\"%s\": file version %d, code version %d",`
`336`	`336`	`RelationGetRelationName(rel),`
`337`	`337`	`metad->btm_version,BTREE_VERSION)));`
`338`	`338`

`‎src/backend/access/nbtree/nbtsort.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`* Portions Copyright (c) 1994, Regents of the University of California`
`37`	`37`	`*`
`38`	`38`	`* IDENTIFICATION`
`39`		`- * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.75 2003/08/04 02:39:57momjian Exp $`
	`39`	`+ * $Header: /cvsroot/pgsql/src/backend/access/nbtree/nbtsort.c,v 1.76 2003/09/25 06:57:57petere Exp $`
`40`	`40`	`*`
`41`	`41`	`*-------------------------------------------------------------------------`
`42`	`42`	`*/`
`@@ -399,7 +399,7 @@ _bt_buildadd(Relation index, BTPageState *state, BTItem bti)`
`399`	`399`	`if (btisz>BTMaxItemSize(npage))`
`400`	`400`	`ereport(ERROR,`
`401`	`401`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`402`		`-errmsg("indextuple size %lu exceeds btree maximum, %lu",`
	`402`	`+errmsg("indexrow size %lu exceeds btree maximum, %lu",`
`403`	`403`	`(unsigned long)btisz,`
`404`	`404`	`(unsigned long)BTMaxItemSize(npage))));`
`405`	`405`

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.79 2003/08/04 02:39:57momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/rtree/Attic/rtree.c,v 1.80 2003/09/25 06:57:57petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -782,7 +782,7 @@ rtpicksplit(Relation r,`
`782`	`782`	`if (newitemsz>RTPageAvailSpace)`
`783`	`783`	`ereport(ERROR,`
`784`	`784`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`785`		`-errmsg("indextuple size %lu exceeds rtree maximum, %lu",`
	`785`	`+errmsg("indexrow size %lu exceeds rtree maximum, %lu",`
`786`	`786`	`(unsigned long)newitemsz,`
`787`	`787`	`(unsigned long)RTPageAvailSpace)));`
`788`	`788`

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

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/access/transam/slru.c,v 1.6 2003/08/08 21:41:27 momjian Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/access/transam/slru.c,v 1.7 2003/09/25 06:57:57 petere Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -611,35 +611,35 @@ SlruReportIOError(SlruCtl ctl, int pageno, TransactionId xid)`
`611`	`611`	`ereport(ERROR,`
`612`	`612`	`(errcode_for_file_access(),`
`613`	`613`	`errmsg("could not access status of transaction %u",xid),`
`614`		`-errdetail("open offile \"%s\" failed: %m",`
	`614`	`+errdetail("could not openfile \"%s\": %m",`
`615`	`615`	`path)));`
`616`	`616`	`break;`
`617`	`617`	`caseSLRU_CREATE_FAILED:`
`618`	`618`	`ereport(ERROR,`
`619`	`619`	`(errcode_for_file_access(),`
`620`	`620`	`errmsg("could not access status of transaction %u",xid),`
`621`		`-errdetail("creation offile \"%s\" failed: %m",`
	`621`	`+errdetail("could not createfile \"%s\": %m",`
`622`	`622`	`path)));`
`623`	`623`	`break;`
`624`	`624`	`caseSLRU_SEEK_FAILED:`
`625`	`625`	`ereport(ERROR,`
`626`	`626`	`(errcode_for_file_access(),`
`627`	`627`	`errmsg("could not access status of transaction %u",xid),`
`628`		`-errdetail("lseek offile \"%s\",offset %u failed: %m",`
	`628`	`+errdetail("could not seek infile \"%s\" tooffset %u: %m",`
`629`	`629`	`path,offset)));`
`630`	`630`	`break;`
`631`	`631`	`caseSLRU_READ_FAILED:`
`632`	`632`	`ereport(ERROR,`
`633`	`633`	`(errcode_for_file_access(),`
`634`	`634`	`errmsg("could not access status of transaction %u",xid),`
`635`		`-errdetail("readof file \"%s\",offset %u failed: %m",`
	`635`	`+errdetail("could notreadfrom file \"%s\" atoffset %u: %m",`
`636`	`636`	`path,offset)));`
`637`	`637`	`break;`
`638`	`638`	`caseSLRU_WRITE_FAILED:`
`639`	`639`	`ereport(ERROR,`
`640`	`640`	`(errcode_for_file_access(),`
`641`	`641`	`errmsg("could not access status of transaction %u",xid),`
`642`		`-errdetail("writeof file \"%s\",offset %u failed: %m",`
	`642`	`+errdetail("could notwriteto file \"%s\" atoffset %u: %m",`
`643`	`643`	`path,offset)));`
`644`	`644`	`break;`
`645`	`645`	`default:`
`@@ -817,7 +817,7 @@ restart:;`
`817`	`817`	`{`
`818`	`818`	`LWLockRelease(ctl->locks->ControlLock);`
`819`	`819`	`ereport(LOG,`
`820`		`-(errmsg("could not truncate \"%s\": apparent wraparound",`
	`820`	`+(errmsg("could not truncatedirectory\"%s\": apparent wraparound",`
`821`	`821`	`ctl->Dir)));`
`822`	`822`	`return;`
`823`	`823`	`}`

`‎src/backend/access/transam/xact.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.153 2003/09/24 18:54:01 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.154 2003/09/25 06:57:57 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`*Transaction aborts can now occur two ways:`
`@@ -1425,7 +1425,7 @@ RequireTransactionChain(void stmtNode, const char stmtType)`
`1425`	`1425`	`ereport(ERROR,`
`1426`	`1426`	`(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),`
`1427`	`1427`	`/* translator: %s represents an SQL statement name */`
`1428`		`-errmsg("%s may only be used inBEGIN/ENDtransaction blocks",`
	`1428`	`+errmsg("%s may only be used in transaction blocks",`
`1429`	`1429`	`stmtType)));`
`1430`	`1430`	`}`
`1431`	`1431`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitfeb4f44

File tree

159 files changed

Some content is hidden

159 files changed

`‎src/backend/access/common/heaptuple.c`

`‎src/backend/access/common/indextuple.c`

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

`‎src/backend/access/hash/hashinsert.c`

`‎src/backend/access/hash/hashutil.c`

`‎src/backend/access/heap/heapam.c`

`‎src/backend/access/heap/hio.c`

`‎src/backend/access/index/indexam.c`

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

`‎src/backend/access/nbtree/nbtpage.c`

`‎src/backend/access/nbtree/nbtsort.c`

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

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

`‎src/backend/access/transam/xact.c`

0 commit comments