open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Message style improvements

Browse Source
pull/31/head
Peter Eisentraut 10 years ago
parent 9492cf86e4
commit ef5d4a3cfa
9 changed files with 61 additions and 58 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      src/backend/access/brin/brin_validate.c
  2. 16
      src/backend/access/gin/ginvalidate.c
  3. 16
      src/backend/access/gist/gistvalidate.c
  4. 20
      src/backend/access/hash/hashvalidate.c
  5. 18
      src/backend/access/nbtree/nbtvalidate.c
  6. 18
      src/backend/access/spgist/spgvalidate.c
  7. 9
      src/backend/access/transam/twophase.c
  8. 2
      src/backend/executor/tqueue.c
  9. 2
      src/backend/tsearch/spell.c

18
src/backend/access/brin/brin_validate.c
Unescape View File

@ -112,7 +112,7 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin opfamily %s contains function %s with invalid support number %d",
errmsg("brin operator family \"%s\" contains function %s with invalid support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -128,7 +128,7 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin opfamily %s contains function %s with wrong signature for support number %d",
errmsg("brin operator family \"%s\" contains function %s with wrong signature for support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -150,7 +150,7 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin opfamily %s contains operator %s with invalid strategy number %d",
errmsg("brin operator family \"%s\" contains operator %s with invalid strategy number %d",
opfamilyname,
format_operator(oprform->amopopr),
oprform->amopstrategy)));
@ -179,7 +179,7 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin opfamily %s contains invalid ORDER BY specification for operator %s",
errmsg("brin operator family \"%s\" contains invalid ORDER BY specification for operator %s",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -192,7 +192,7 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin opfamily %s contains operator %s with wrong signature",
errmsg("brin operator family \"%s\" contains operator %s with wrong signature",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -230,7 +230,7 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin opfamily %s is missing operator(s) for types %s and %s",
errmsg("brin operator family \"%s\" is missing operator(s) for types %s and %s",
opfamilyname,
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
@ -240,7 +240,7 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin opfamily %s is missing support function(s) for types %s and %s",
errmsg("brin operator family \"%s\" is missing support function(s) for types %s and %s",
opfamilyname,
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
@ -253,7 +253,7 @@ brinvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin opclass %s is missing operator(s)",
errmsg("brin operator class \"%s\" is missing operator(s)",
opclassname)));
result = false;
}
@ -264,7 +264,7 @@ brinvalidate(Oid opclassoid)
continue; /* got it */
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("brin opclass %s is missing support function %d",
errmsg("brin operator class \"%s\" is missing support function %d",
opclassname, i)));
result = false;
}

16
src/backend/access/gin/ginvalidate.c
Unescape View File

@ -89,7 +89,7 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin opfamily %s contains support procedure %s with cross-type registration",
errmsg("gin operator family \"%s\" contains support procedure %s with cross-type registration",
opfamilyname,
format_procedure(procform->amproc))));
result = false;
@ -145,7 +145,7 @@ ginvalidate(Oid opclassoid)
default:
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin opfamily %s contains function %s with invalid support number %d",
errmsg("gin operator family \"%s\" contains function %s with invalid support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -157,7 +157,7 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin opfamily %s contains function %s with wrong signature for support number %d",
errmsg("gin operator family \"%s\" contains function %s with wrong signature for support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -176,7 +176,7 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin opfamily %s contains operator %s with invalid strategy number %d",
errmsg("gin operator family \"%s\" contains operator %s with invalid strategy number %d",
opfamilyname,
format_operator(oprform->amopopr),
oprform->amopstrategy)));
@ -189,7 +189,7 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin opfamily %s contains invalid ORDER BY specification for operator %s",
errmsg("gin operator family \"%s\" contains invalid ORDER BY specification for operator %s",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -202,7 +202,7 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin opfamily %s contains operator %s with wrong signature",
errmsg("gin operator family \"%s\" contains operator %s with wrong signature",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -243,7 +243,7 @@ ginvalidate(Oid opclassoid)
continue; /* don't need both, see check below loop */
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin opclass %s is missing support function %d",
errmsg("gin operator class \"%s\" is missing support function %d",
opclassname, i)));
result = false;
}
@ -253,7 +253,7 @@ ginvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gin opclass %s is missing support function %d or %d",
errmsg("gin operator class \"%s\" is missing support function %d or %d",
opclassname,
GIN_CONSISTENT_PROC, GIN_TRICONSISTENT_PROC)));
result = false;

16
src/backend/access/gist/gistvalidate.c
Unescape View File

@ -89,7 +89,7 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist opfamily %s contains support procedure %s with cross-type registration",
errmsg("gist operator family \"%s\" contains support procedure %s with cross-type registration",
opfamilyname,
format_procedure(procform->amproc))));
result = false;
@ -142,7 +142,7 @@ gistvalidate(Oid opclassoid)
default:
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist opfamily %s contains function %s with invalid support number %d",
errmsg("gist operator family \"%s\" contains function %s with invalid support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -154,7 +154,7 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist opfamily %s contains function %s with wrong signature for support number %d",
errmsg("gist operator family \"%s\" contains function %s with wrong signature for support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -174,7 +174,7 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist opfamily %s contains operator %s with invalid strategy number %d",
errmsg("gist operator family \"%s\" contains operator %s with invalid strategy number %d",
opfamilyname,
format_operator(oprform->amopopr),
oprform->amopstrategy)));
@ -192,7 +192,7 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist opfamily %s contains unsupported ORDER BY specification for operator %s",
errmsg("gist operator family \"%s\" contains unsupported ORDER BY specification for operator %s",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -203,7 +203,7 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist opfamily %s contains incorrect ORDER BY opfamily specification for operator %s",
errmsg("gist operator family \"%s\" contains incorrect ORDER BY opfamily specification for operator %s",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -222,7 +222,7 @@ gistvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist opfamily %s contains operator %s with wrong signature",
errmsg("gist operator family \"%s\" contains operator %s with wrong signature",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -261,7 +261,7 @@ gistvalidate(Oid opclassoid)
continue; /* optional methods */
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("gist opclass %s is missing support function %d",
errmsg("gist operator class \"%s\" is missing support function %d",
opclassname, i)));
result = false;
}

20
src/backend/access/hash/hashvalidate.c
Unescape View File

@ -95,7 +95,7 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash opfamily %s contains support procedure %s with cross-type registration",
errmsg("hash operator family \"%s\" contains support procedure %s with cross-type registration",
opfamilyname,
format_procedure(procform->amproc))));
result = false;
@ -110,7 +110,7 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash opfamily %s contains function %s with wrong signature for support number %d",
errmsg("hash operator family \"%s\" contains function %s with wrong signature for support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -127,7 +127,7 @@ hashvalidate(Oid opclassoid)
default:
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash opfamily %s contains function %s with invalid support number %d",
errmsg("hash operator family \"%s\" contains function %s with invalid support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -148,7 +148,7 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash opfamily %s contains operator %s with invalid strategy number %d",
errmsg("hash operator family \"%s\" contains operator %s with invalid strategy number %d",
opfamilyname,
format_operator(oprform->amopopr),
oprform->amopstrategy)));
@ -161,7 +161,7 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash opfamily %s contains invalid ORDER BY specification for operator %s",
errmsg("hash operator family \"%s\" contains invalid ORDER BY specification for operator %s",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -174,7 +174,7 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash opfamily %s contains operator %s with wrong signature",
errmsg("hash operator family \"%s\" contains operator %s with wrong signature",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -186,7 +186,7 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash opfamily %s lacks support function for operator %s",
errmsg("hash operator family \"%s\" lacks support function for operator %s",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -214,7 +214,7 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash opfamily %s is missing operator(s) for types %s and %s",
errmsg("hash operator family \"%s\" is missing operator(s) for types %s and %s",
opfamilyname,
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
@ -228,7 +228,7 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash opclass %s is missing operator(s)",
errmsg("hash operator class \"%s\" is missing operator(s)",
opclassname)));
result = false;
}
@ -244,7 +244,7 @@ hashvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("hash opfamily %s is missing cross-type operator(s)",
errmsg("hash operator family \"%s\" is missing cross-type operator(s)",
opfamilyname)));
result = false;
}

18
src/backend/access/nbtree/nbtvalidate.c
Unescape View File

@ -97,7 +97,7 @@ btvalidate(Oid opclassoid)
default:
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree opfamily %s contains function %s with invalid support number %d",
errmsg("btree operator family \"%s\" contains function %s with invalid support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -109,7 +109,7 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree opfamily %s contains function %s with wrong signature for support number %d",
errmsg("btree operator family \"%s\" contains function %s with wrong signature for support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -129,7 +129,7 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree opfamily %s contains operator %s with invalid strategy number %d",
errmsg("btree operator family \"%s\" contains operator %s with invalid strategy number %d",
opfamilyname,
format_operator(oprform->amopopr),
oprform->amopstrategy)));
@ -142,7 +142,7 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree opfamily %s contains invalid ORDER BY specification for operator %s",
errmsg("btree operator family \"%s\" contains invalid ORDER BY specification for operator %s",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -155,7 +155,7 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree opfamily %s contains operator %s with wrong signature",
errmsg("btree operator family \"%s\" contains operator %s with wrong signature",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -197,7 +197,7 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree opfamily %s is missing operator(s) for types %s and %s",
errmsg("btree operator family \"%s\" is missing operator(s) for types %s and %s",
opfamilyname,
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
@ -207,7 +207,7 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree opfamily %s is missing support function for types %s and %s",
errmsg("btree operator family \"%s\" is missing support function for types %s and %s",
opfamilyname,
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
@ -221,7 +221,7 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree opclass %s is missing operator(s)",
errmsg("btree operator class \"%s\" is missing operator(s)",
opclassname)));
result = false;
}
@ -238,7 +238,7 @@ btvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("btree opfamily %s is missing cross-type operator(s)",
errmsg("btree operator family \"%s\" is missing cross-type operator(s)",
opfamilyname)));
result = false;
}

18
src/backend/access/spgist/spgvalidate.c
Unescape View File

@ -89,7 +89,7 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist opfamily %s contains support procedure %s with cross-type registration",
errmsg("spgist operator family \"%s\" contains support procedure %s with cross-type registration",
opfamilyname,
format_procedure(procform->amproc))));
result = false;
@ -112,7 +112,7 @@ spgvalidate(Oid opclassoid)
default:
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist opfamily %s contains function %s with invalid support number %d",
errmsg("spgist operator family \"%s\" contains function %s with invalid support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -124,7 +124,7 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist opfamily %s contains function %s with wrong signature for support number %d",
errmsg("spgist operator family \"%s\" contains function %s with wrong signature for support number %d",
opfamilyname,
format_procedure(procform->amproc),
procform->amprocnum)));
@ -143,7 +143,7 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist opfamily %s contains operator %s with invalid strategy number %d",
errmsg("spgist operator family \"%s\" contains operator %s with invalid strategy number %d",
opfamilyname,
format_operator(oprform->amopopr),
oprform->amopstrategy)));
@ -156,7 +156,7 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist opfamily %s contains invalid ORDER BY specification for operator %s",
errmsg("spgist operator family \"%s\" contains invalid ORDER BY specification for operator %s",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -169,7 +169,7 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist opfamily %s contains operator %s with wrong signature",
errmsg("spgist operator family \"%s\" contains operator %s with wrong signature",
opfamilyname,
format_operator(oprform->amopopr))));
result = false;
@ -197,7 +197,7 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist opfamily %s is missing operator(s) for types %s and %s",
errmsg("spgist operator family \"%s\" is missing operator(s) for types %s and %s",
opfamilyname,
format_type_be(thisgroup->lefttype),
format_type_be(thisgroup->righttype))));
@ -217,7 +217,7 @@ spgvalidate(Oid opclassoid)
continue; /* got it */
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist opfamily %s is missing support function %d for type %s",
errmsg("spgist operator family \"%s\" is missing support function %d for type %s",
opfamilyname, i,
format_type_be(thisgroup->lefttype))));
result = false;
@ -230,7 +230,7 @@ spgvalidate(Oid opclassoid)
{
ereport(INFO,
(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
errmsg("spgist opclass %s is missing operator(s)",
errmsg("spgist operator class \"%s\" is missing operator(s)",
opclassname)));
result = false;
}

9
src/backend/access/transam/twophase.c
Unescape View File

@ -1645,9 +1645,12 @@ CheckPointTwoPhase(XLogRecPtr redo_horizon)
if (log_checkpoints && serialized_xacts > 0)
ereport(LOG,
(errmsg("%u two-phase state files were written "
"for long-running prepared transactions",
serialized_xacts)));
(errmsg_plural("%u two-phase state file was written "
"for long-running prepared transactions",
"%u two-phase state files were written "
"for long-running prepared transactions",
serialized_xacts,
serialized_xacts)));
}
/*

2
src/backend/executor/tqueue.c
Unescape View File

@ -203,7 +203,7 @@ tqueueReceiveSlot(TupleTableSlot *slot, DestReceiver *self)
else if (result != SHM_MQ_SUCCESS)
ereport(ERROR,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
errmsg("unable to send tuples")));
errmsg("could not send tuples")));
return true;
}

2
src/backend/tsearch/spell.c
Unescape View File

@ -433,7 +433,7 @@ getNextFlagFromString(IspellDict *Conf, char **sflagset, char *sflag)
if (Conf->flagMode == FM_LONG && maxstep > 0)
ereport(ERROR,
(errcode(ERRCODE_CONFIG_FILE_ERROR),
errmsg("invalid affix flag \"%s\" with long flag value", sbuf)));
errmsg("invalid affix flag \"%s\" with \"long\" flag value", sbuf)));
*sflag = '\0';
}

Write Preview
Loading…
Cancel
Save