A visit from the message-style police ...

diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c
index 8ddce5c9211abca38a7e7b4587e692c41a4603fc..7c258f1305f445a2301bd22b6ffa20f3b4ba3885 100644 (file)
--- a/contrib/tsearch2/tsvector.c
+++ b/contrib/tsearch2/tsvector.c
@@ -762,7 +762,8 @@ tsearch2(PG_FUNCTION_ARGS)
        if (numidxattr == SPI_ERROR_NOATTRIBUTE)
                ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_COLUMN),
-                                errmsg("cannot find tsvector_field")));
+                                errmsg("tsvector column \"%s\" does not exist",
+                                               trigger->tgargs[0])));
 
        prs.lenwords = 32;
        prs.curwords = 0;
@@ -785,7 +786,7 @@ tsearch2(PG_FUNCTION_ARGS)
                        if ( funcoid==InvalidOid )
                                ereport(ERROR,
                                                (errcode(ERRCODE_UNDEFINED_COLUMN),
-                                                errmsg("cannot find function or field \"%s\"",
+                                                errmsg("could not find function or field \"%s\"",
                                                                trigger->tgargs[i])));
 
                        continue;

diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 874b8b81f2b157200810aa32355fe2f68fceec29..c98f325ea2f3767b4b01bfb81d88f93f6b31304f 100644 (file)
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -703,7 +703,7 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)
        else if (functyptype == 'p' && typeoid == RECORDOID)
                ereport(ERROR,
                                (errcode(ERRCODE_DATATYPE_MISMATCH),
-                                errmsg("unable to determine tuple description for function returning record")));
+                                errmsg("could not determine tuple description for function returning record")));
        else
        {
                /* crummy error message, but parser should have caught this */

diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 65dcb128df002a62ac8fd47416d96176c50b473c..476d835173e2c5a94e7b845be1d2eb139e8d2872 100644 (file)
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -243,7 +243,8 @@ gistdropscan(IndexScanDesc s)
                prev = l;
 
        if (l == (GISTScanList) NULL)
-               elog(ERROR, "GiST scan list corrupted -- cannot find 0x%p", (void *) s);
+               elog(ERROR, "GiST scan list corrupted -- could not find 0x%p",
+                        (void *) s);
 
        if (prev == (GISTScanList) NULL)
                GISTScans = l->gsl_next;

diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 0bccbe070f3a0342875eab0da583123c16c33617..a61d919386165f231dbdbe3a7292890ad807a8ce 100644 (file)
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -1064,7 +1064,7 @@ _bt_findsplitloc(Relation rel,
         * just in case ...
         */
        if (!state.have_split)
-               elog(ERROR, "cannot find a feasible split point for \"%s\"",
+               elog(ERROR, "could not find a feasible split point for \"%s\"",
                         RelationGetRelationName(rel));
 
        *newitemonleft = state.newitemonleft;

diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 6d820729dbfb2d0cec7aea352d8c836458c62aec..53b1238bda1bdd923fd99494937a26be53401119 100644 (file)
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -1015,7 +1015,7 @@ _bt_walk_left(Relation rel, Buffer buf)
                         * if there's anything wrong.
                         */
                        if (opaque->btpo_prev == lblkno)
-                               elog(ERROR, "cannot find left sibling in \"%s\"",
+                               elog(ERROR, "could not find left sibling in \"%s\"",
                                         RelationGetRelationName(rel));
                        /* Okay to try again with new lblkno value */
                }

diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index cbf49e2f56f5b1ef7bd8e140b9a355dbacf411b5..feda62daade8cc77c86c62f23bb74f42e9ea1403 100644 (file)
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -461,7 +461,7 @@ _bt_getstrategynumber(RegProcedure sk_procedure, StrategyMap map)
                if (sk_procedure == map->entry[j].sk_procedure)
                        return j;
        }
-       elog(ERROR, "unable to identify operator %u", sk_procedure);
+       elog(ERROR, "could not identify operator %u", sk_procedure);
        return -1;                                      /* keep compiler quiet */
 }
 

diff --git a/src/backend/access/rtree/rtscan.c b/src/backend/access/rtree/rtscan.c
index 943a7a744539ba45ee2a8f4681f81950b44c786d..af5041c208947ebb1652338df0eff71b93eb1cac 100644 (file)
--- a/src/backend/access/rtree/rtscan.c
+++ b/src/backend/access/rtree/rtscan.c
@@ -248,7 +248,8 @@ rtdropscan(IndexScanDesc s)
                prev = l;
 
        if (l == (RTScanList) NULL)
-               elog(ERROR, "rtree scan list corrupted -- cannot find 0x%p", (void *) s);
+               elog(ERROR, "rtree scan list corrupted -- could not find 0x%p",
+                        (void *) s);
 
        if (prev == (RTScanList) NULL)
                RTScans = l->rtsl_next;

diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index 6a69294638b64958e8a63084fcc06837fb251f6b..728e942c1d4eb9513529449b28827ef220e91cb4 100644 (file)
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -811,7 +811,7 @@ restart:;
        {
                LWLockRelease(ctl->locks->ControlLock);
                ereport(LOG,
-                               (errmsg("unable to truncate \"%s\": apparent wraparound",
+                               (errmsg("could not truncate \"%s\": apparent wraparound",
                                                ctl->Dir)));
                return;
        }

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 6310438647f1ff09d21ad033f7b3484eeb1ede9b..a368e77c999098473636b42f06a754c192b7c323 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -2642,7 +2642,7 @@ StartupXLOG(void)
                }
                else
                        ereport(PANIC,
-                                       (errmsg("unable to locate a valid checkpoint record")));
+                                       (errmsg("could not locate a valid checkpoint record")));
        }
        LastRec = RecPtr = checkPointLoc;
        memcpy(&checkPoint, XLogRecGetData(record), sizeof(CheckPoint));

diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index f03e93856b951e65d32bfc1ad876e5a03462e5ac..4d5bcac862b58e6834ca8d99415fcf1a5dcee81d 100644 (file)
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -1725,7 +1725,7 @@ getObjectDescription(const ObjectAddress *object)
                        }
 
                default:
-                       appendStringInfo(&buffer, "unknown object %u %u %d",
+                       appendStringInfo(&buffer, "unrecognized object %u %u %d",
                                                         object->classId,
                                                         object->objectId,
                                                         object->objectSubId);

diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c
index 7858e5b80570320dd6c7387e885c256572cd19a3..86a2e2426f992bad7a92689da0421152c409f39b 100644 (file)
--- a/src/backend/catalog/pg_conversion.c
+++ b/src/backend/catalog/pg_conversion.c
@@ -76,7 +76,7 @@ ConversionCreate(const char *conname, Oid connamespace,
                                                                  contoencoding))
                        ereport(ERROR,
                                        (errcode(ERRCODE_DUPLICATE_OBJECT),
-                                        errmsg("default conversion for \"%s\" to \"%s\" already exists",
+                                        errmsg("default conversion for %s to %s already exists",
                                                        pg_encoding_to_char(conforencoding),
                                                        pg_encoding_to_char(contoencoding))));
        }

diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index a0571ca3fa6b741fe3455041e53e89942f9a4de0..67af29d1af9dad23e9da8f4e2efbabbd726731c7 100644 (file)
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -334,12 +334,12 @@ createdb(const CreatedbStmt *stmt)
        if (mkdir(target_dir, S_IRWXU) != 0)
                ereport(ERROR,
                                (errcode_for_file_access(),
-                                errmsg("unable to create database directory \"%s\": %m",
+                                errmsg("could not create database directory \"%s\": %m",
                                                target_dir)));
        if (rmdir(target_dir) != 0)
                ereport(ERROR,
                                (errcode_for_file_access(),
-                                errmsg("unable to remove temp directory \"%s\": %m",
+                                errmsg("could not remove temp directory \"%s\": %m",
                                                target_dir)));
 
        /* Make the symlink, if needed */

diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index eb425ec9e3d5080fa485341e0336b604f848548f..af8d078e1799a08e165c8c4afaa31bedcbf6da90 100644 (file)
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -106,12 +106,12 @@ compute_return_type(TypeName *returnType, Oid languageOid,
                        languageOid != ClanguageId)
                        ereport(ERROR,
                                        (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                        errmsg("type %s does not exist", typnam)));
+                                        errmsg("type \"%s\" does not exist", typnam)));
 
                /* Otherwise, go ahead and make a shell type */
                ereport(NOTICE,
                                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                errmsg("type %s is not yet defined", typnam),
+                                errmsg("type \"%s\" is not yet defined", typnam),
                                 errdetail("Creating a shell type definition.")));
                namespaceId = QualifiedNameGetCreationNamespace(returnType->names,
                                                                                                                &typname);
@@ -862,7 +862,7 @@ CreateCast(CreateCastStmt *stmt)
                if (procstruct->pronargs != 1)
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-                                        errmsg("cast function must take 1 argument")));
+                                        errmsg("cast function must take one argument")));
                if (procstruct->proargtypes[0] != sourcetypeid)
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
@@ -962,7 +962,7 @@ CreateCast(CreateCastStmt *stmt)
        if (HeapTupleIsValid(tuple))
                ereport(ERROR,
                                (errcode(ERRCODE_DUPLICATE_OBJECT),
-                                errmsg("cast from data type %s to data type %s already exists",
+                                errmsg("cast from type %s to type %s already exists",
                                                TypeNameToString(stmt->sourcetype),
                                                TypeNameToString(stmt->targettype))));
 

diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index d3971a048a32d78981f489ebeb795a0cec070540..4fdd4ce0dc19f1835750fc726b4670f76228afcf 100644 (file)
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -278,10 +278,10 @@ DefineOpClass(CreateOpClassStmt *stmt)
                        if (opclass->opcintype == typeoid && opclass->opcdefault)
                                ereport(ERROR,
                                                (errcode(ERRCODE_DUPLICATE_OBJECT),
-                                                errmsg("cannot make class \"%s\" be default for type %s",
+                                                errmsg("could not make class \"%s\" be default for type %s",
                                                                opcname,
                                                                TypeNameToString(stmt->datatype)),
-                                                errdetail("class \"%s\" already is the default",
+                                                errdetail("Class \"%s\" already is the default.",
                                                                   NameStr(opclass->opcname))));
                }
 

diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c
index 6233b72a3215746aa5cbe326ea51ab0276713a78..63ddce58f25b9f172bd94b1ae881ae5160fde269 100644 (file)
--- a/src/backend/commands/portalcmds.c
+++ b/src/backend/commands/portalcmds.c
@@ -365,7 +365,7 @@ PersistHoldablePortal(Portal portal)
                if (portal->posOverflow)                /* oops, cannot trust portalPos */
                        ereport(ERROR,
                                        (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-                                        errmsg("unable to reposition held cursor")));
+                                        errmsg("could not reposition held cursor")));
 
                tuplestore_rescan(portal->holdStore);
 

diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
index 918c37d9eee5058a9dde771218552c6bdcede802..2f3519a9335255219628cb798e999dc5d87b3e1a 100644 (file)
--- a/src/backend/commands/prepare.c
+++ b/src/backend/commands/prepare.c
@@ -264,7 +264,7 @@ InitQueryHashTable(void)
                                                                   HASH_ELEM);
 
        if (!prepared_queries)
-               elog(ERROR, "unable to create hash table");
+               elog(ERROR, "could not create hash table");
 }
 
 /*
@@ -336,7 +336,7 @@ StorePreparedStatement(const char *stmt_name,
 
        /* Shouldn't get a failure, nor a duplicate entry */
        if (!entry || found)
-               elog(ERROR, "unable to store prepared statement \"%s\"",
+               elog(ERROR, "could not store prepared statement \"%s\"",
                         stmt_name);
 
        /* Fill in the hash table entry with copied data */

diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index 2b715a9f3b167d391fccab20e67700221fe75906..3a8be43459d712cb7c8eb8ff6b3c50361357c3a6 100644 (file)
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -97,7 +97,7 @@ CreateSchemaCommand(CreateSchemaStmt *stmt)
                ereport(ERROR,
                                (errcode(ERRCODE_RESERVED_NAME),
                                 errmsg("unacceptable schema name \"%s\"", schemaName),
-                                errdetail("The prefix pg_ is reserved for system schemas.")));
+                                errdetail("The prefix \"pg_\" is reserved for system schemas.")));
 
        /* Create the schema's namespace */
        namespaceId = NamespaceCreate(schemaName, owner_userid);
@@ -214,7 +214,7 @@ RemoveSchemaById(Oid schemaOid)
                                                 ObjectIdGetDatum(schemaOid),
                                                 0, 0, 0);
        if (!HeapTupleIsValid(tup))     /* should not happen */
-               elog(ERROR, "cache lookup failed for schema %u", schemaOid);
+               elog(ERROR, "cache lookup failed for namespace %u", schemaOid);
 
        simple_heap_delete(relation, &tup->t_self);
 
@@ -266,7 +266,7 @@ RenameSchema(const char *oldname, const char *newname)
                ereport(ERROR,
                                (errcode(ERRCODE_RESERVED_NAME),
                                 errmsg("unacceptable schema name \"%s\"", newname),
-                                errdetail("The prefix pg_ is reserved for system schemas.")));
+                                errdetail("The prefix \"pg_\" is reserved for system schemas.")));
 
        /* rename */
        namestrcpy(&(((Form_pg_namespace) GETSTRUCT(tup))->nspname), newname);

diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 10c5ccef583d2d9e98f62cef9a5a68bf7b0862fe..0e3024a183c1c03d44dbfb72fded49bee1862034 100644 (file)
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -856,8 +856,8 @@ read_info(SeqTable elm, Relation rel, Buffer *buf)
        sm = (sequence_magic *) PageGetSpecialPointer(page);
 
        if (sm->magic != SEQ_MAGIC)
-               elog(ERROR, "bad magic number (%08X) in sequence \"%s\"",
-                        sm->magic, RelationGetRelationName(rel));
+               elog(ERROR, "bad magic number in sequence \"%s\": %08X",
+                        RelationGetRelationName(rel), sm->magic);
 
        lp = PageGetItemId(page, FirstOffsetNumber);
        Assert(ItemIdIsUsed(lp));
@@ -954,7 +954,7 @@ init_params(List *options, Form_pg_sequence new)
                if (new->increment_by == 0)
                        ereport(ERROR,
                                        (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-                                        errmsg("can't INCREMENT by zero")));
+                                        errmsg("cannot increment by zero")));
        }
 
        /* MAXVALUE */

diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index 05471da4f1be4081aae4f5ea5cb0d003022cfd82..baa9514963cf70a610ca27db5f544d70fb4906ce 100644 (file)
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -133,7 +133,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint)
                if (needconstrrelid && constrrelid == InvalidOid)
                        ereport(NOTICE,
                                        (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-                                        errmsg("unable to determine referenced table for constraint \"%s\"",
+                                        errmsg("could not determine referenced table for constraint \"%s\"",
                                                        stmt->trigname)));
        }
 
@@ -233,7 +233,7 @@ CreateTrigger(CreateTrigStmt *stmt, bool forConstraint)
                                TRIGGER_SETT_UPDATE(tgtype);
                                break;
                        default:
-                               elog(ERROR, "unknown trigger event: %d",
+                               elog(ERROR, "unrecognized trigger event: %d",
                                         (int) stmt->actions[i]);
                                break;
                }
@@ -477,7 +477,7 @@ DropTrigger(Oid relid, const char *trigname, DropBehavior behavior)
        if (!HeapTupleIsValid(tup))
                ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                errmsg("trigger \"%s\" on relation \"%s\" does not exist",
+                                errmsg("trigger \"%s\" for relation \"%s\" does not exist",
                                                trigname, get_rel_name(relid))));
 
        if (!pg_class_ownercheck(relid, GetUserId()))
@@ -1574,7 +1574,7 @@ ltrmark:;
                                if (XactIsoLevel == XACT_SERIALIZABLE)
                                        ereport(ERROR,
                                                        (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-                                                        errmsg("cannot serialize access due to concurrent update")));
+                                                        errmsg("could not serialize access due to concurrent update")));
                                else if (!(ItemPointerEquals(&(tuple.t_self), tid)))
                                {
                                        TupleTableSlot *epqslot = EvalPlanQual(estate,
@@ -1597,7 +1597,7 @@ ltrmark:;
 
                        default:
                                ReleaseBuffer(buffer);
-                               elog(ERROR, "unrecognized status %u from heap_mark4update",
+                               elog(ERROR, "unrecognized heap_mark4update status: %u",
                                         test);
                                return NULL;    /* keep compiler quiet */
                }

diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index ec900429d389bb0d9c8b300cfee612dfef1ec039..90dd775392402edc9db1720b576ea664677ba5e9 100644 (file)
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -146,7 +146,7 @@ write_group_file(Relation grel)
        if (fp == NULL)
                ereport(ERROR,
                                (errcode_for_file_access(),
-                                errmsg("unable to write temp file \"%s\": %m", tempname)));
+                                errmsg("could not write temp file \"%s\": %m", tempname)));
 
        /*
         * Read pg_group and write the file.  Note we use SnapshotSelf to ensure
@@ -245,7 +245,7 @@ write_group_file(Relation grel)
        if (ferror(fp))
                ereport(ERROR,
                                (errcode_for_file_access(),
-                                errmsg("unable to write temp file \"%s\": %m", tempname)));
+                                errmsg("could not write temp file \"%s\": %m", tempname)));
        FreeFile(fp);
 
        /*
@@ -294,7 +294,7 @@ write_user_file(Relation urel)
        if (fp == NULL)
                ereport(ERROR,
                                (errcode_for_file_access(),
-                                errmsg("unable to write temp file \"%s\": %m", tempname)));
+                                errmsg("could not write temp file \"%s\": %m", tempname)));
 
        /*
         * Read pg_shadow and write the file.  Note we use SnapshotSelf to ensure
@@ -376,7 +376,7 @@ write_user_file(Relation urel)
        if (ferror(fp))
                ereport(ERROR,
                                (errcode_for_file_access(),
-                                errmsg("unable to write temp file \"%s\": %m", tempname)));
+                                errmsg("could not write temp file \"%s\": %m", tempname)));
        FreeFile(fp);
 
        /*

diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 268d5f7b680bda829b37de1afab8e8f0fb15ac3e..0e944dc84373c62f4abdef0722933fc7473af109 100644 (file)
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -242,7 +242,7 @@ set_tz(const char *tz)
        strcpy(tzbuf, "TZ=");
        strncpy(tzbuf + 3, tz, sizeof(tzbuf) - 4);
        if (putenv(tzbuf) != 0)         /* shouldn't happen? */
-               elog(LOG, "unable to set TZ environment variable");
+               elog(LOG, "could not set TZ environment variable");
        tzset();
 }
 
@@ -268,7 +268,7 @@ clear_tz(void)
        {
                strcpy(tzbuf, "=");
                if (putenv(tzbuf) != 0)
-                       elog(LOG, "unable to clear TZ environment variable");
+                       elog(LOG, "could not clear TZ environment variable");
                tzset();
        }
 }
@@ -695,7 +695,7 @@ assign_client_encoding(const char *value, bool doit, bool interactive)
                if (interactive)
                        ereport(ERROR,
                                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                        errmsg("conversion between \"%s\" and \"%s\" is not supported",
+                                        errmsg("conversion between %s and %s is not supported",
                                                        value, GetDatabaseEncodingName())));
                return NULL;
        }

diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 16d1a883178072922532e5f435f77d132ed0bd9f..f1a723032f024c447e60446071f6783a8cb575b1 100644 (file)
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -1117,7 +1117,7 @@ lnext:    ;
                                                        if (XactIsoLevel == XACT_SERIALIZABLE)
                                                                ereport(ERROR,
                                                                                (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-                                                                                errmsg("cannot serialize access due to concurrent update")));
+                                                                                errmsg("could not serialize access due to concurrent update")));
                                                        if (!(ItemPointerEquals(&(tuple.t_self),
                                                                  (ItemPointer) DatumGetPointer(datum))))
                                                        {
@@ -1416,7 +1416,7 @@ ldelete:;
                        if (XactIsoLevel == XACT_SERIALIZABLE)
                                ereport(ERROR,
                                                (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-                                                errmsg("cannot serialize access due to concurrent update")));
+                                                errmsg("could not serialize access due to concurrent update")));
                        else if (!(ItemPointerEquals(tupleid, &ctid)))
                        {
                                TupleTableSlot *epqslot = EvalPlanQual(estate,
@@ -1550,7 +1550,7 @@ lreplace:;
                        if (XactIsoLevel == XACT_SERIALIZABLE)
                                ereport(ERROR,
                                                (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
-                                                errmsg("cannot serialize access due to concurrent update")));
+                                                errmsg("could not serialize access due to concurrent update")));
                        else if (!(ItemPointerEquals(tupleid, &ctid)))
                        {
                                TupleTableSlot *epqslot = EvalPlanQual(estate,
@@ -1737,7 +1737,7 @@ EvalPlanQual(EState *estate, Index rti, ItemPointer tid)
                        }
                }
                if (relation == NULL)
-                       elog(ERROR, "cannot find RowMark for RT index %u", rti);
+                       elog(ERROR, "could not find RowMark for RT index %u", rti);
        }
 
        /*

diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index 7d1f15f3f080c89057c183e308385d19259140b2..27681977a7fd2fcbb309aa4302e7a485ffe8b50e 100644 (file)
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -533,7 +533,7 @@ GetAttributeByNum(TupleTableSlot *slot,
        Datum           retval;
 
        if (!AttributeNumberIsValid(attrno))
-               elog(ERROR, "invalid attribute number: %d", attrno);
+               elog(ERROR, "invalid attribute number %d", attrno);
 
        if (isNull == (bool *) NULL)
                elog(ERROR, "a NULL isNull pointer was passed");
@@ -616,7 +616,7 @@ init_fcache(Oid foid, FuncExprState *fcache, MemoryContext fcacheCxt)
 
        /* Safety check (should never fail, as parser should check sooner) */
        if (length(fcache->args) > FUNC_MAX_ARGS)
-               elog(ERROR, "too many arguments to function");
+               elog(ERROR, "too many arguments");
 
        /* Set up the primary fmgr lookup information */
        fmgr_info_cxt(foid, &(fcache->func), fcacheCxt);

diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c
index 267a34ea64af73b1105a4770d5e5b71afb01c771..04e510175cf1aceec9b22e81fc6d4ae916246cfe 100644 (file)
--- a/src/backend/executor/nodeSetOp.c
+++ b/src/backend/executor/nodeSetOp.c
@@ -170,7 +170,7 @@ ExecSetOp(SetOpState *node)
                                                0 : (node->numLeft - node->numRight);
                                        break;
                                default:
-                                       elog(ERROR, "unrecognized setop code: %d",
+                                       elog(ERROR, "unrecognized set op: %d",
                                                 (int) plannode->cmd);
                                        break;
                        }

diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index e4ffd25a63895f4784486786aa228007249951b0..7a2449f2c03c540383a2340c9e15d57940f8b24d 100644 (file)
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -99,7 +99,7 @@ lo_open(PG_FUNCTION_ARGS)
        {                                                       /* lookup failed */
                MemoryContextSwitchTo(currentContext);
 #if FSDB
-               elog(DEBUG4, "cannot open large object %u", lobjId);
+               elog(DEBUG4, "could not open large object %u", lobjId);
 #endif
                PG_RETURN_INT32(-1);
        }

diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 2542431030b9a88d1584a4d6c24fee847db596c2..eb887585b4f7002239611a02912d676642175688 100644 (file)
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -189,7 +189,7 @@ _equalParam(Param *a, Param *b)
                        COMPARE_SCALAR_FIELD(paramid);
                        break;
                default:
-                       elog(ERROR, "unrecognized paramkind value: %d",
+                       elog(ERROR, "unrecognized paramkind: %d",
                                 a->paramkind);
        }
 

diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index bcbe6b82d7b63444babd192297208603ed48bc1e..8b36edeb1c0656dbf3bf2cb9364ced857879863a 100644 (file)
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -1322,7 +1322,7 @@ _outRangeTblEntry(StringInfo str, RangeTblEntry *node)
                        WRITE_NODE_FIELD(joinaliasvars);
                        break;
                default:
-                       elog(ERROR, "unrecognized rte kind: %d", (int) node->rtekind);
+                       elog(ERROR, "unrecognized RTE kind: %d", (int) node->rtekind);
                        break;
        }
 

diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 97dc8ecb23333a14c2169b34d60a531aa8bd5618..a97225eb38378a7c0beed18362fd0a9daae41f21 100644 (file)
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -752,7 +752,7 @@ process_implied_equality(Query *root,
                 */
                ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_FUNCTION),
-                                errmsg("unable to identify an equality operator for types %s and %s",
+                                errmsg("could not identify an equality operator for types %s and %s",
                                                format_type_be(ltype), format_type_be(rtype))));
        }
        pgopform = (Form_pg_operator) GETSTRUCT(eq_operator);

diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 290419ccc0e9dc59c5a0d2d30c6d9145d2898373..3d5774e60978f2a6713c056904cc09173a9e26f7 100644 (file)
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -312,7 +312,7 @@ generate_nonunion_plan(SetOperationStmt *op, Query *parse,
                        cmd = op->all ? SETOPCMD_EXCEPT_ALL : SETOPCMD_EXCEPT;
                        break;
                default:
-                       elog(ERROR, "unrecognized set operation code: %d",
+                       elog(ERROR, "unrecognized set op: %d",
                                 (int) op->op);
                        cmd = SETOPCMD_INTERSECT;       /* keep compiler quiet */
                        break;

diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 7b2266be72f24fc9334b94ca5d13954c09d30bf9..c1e23ec6c861605e107230b9a9afc1c4319cc20c 100644 (file)
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -1151,7 +1151,7 @@ transformTableConstraint(ParseState *pstate, CreateStmtContext *cxt,
                case CONSTR_ATTR_NOT_DEFERRABLE:
                case CONSTR_ATTR_DEFERRED:
                case CONSTR_ATTR_IMMEDIATE:
-                       elog(ERROR, "illegal context for constraint type %d",
+                       elog(ERROR, "invalid context for constraint type %d",
                                 constraint->contype);
                        break;
 
@@ -2756,11 +2756,11 @@ transformExecuteStmt(ParseState *pstate, ExecuteStmt *stmt)
                        if (pstate->p_hasSubLinks)
                                ereport(ERROR,
                                                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                                errmsg("cannot use sub-selects in EXECUTE parameters")));
+                                                errmsg("cannot use sub-select in EXECUTE parameter")));
                        if (pstate->p_hasAggs)
                                ereport(ERROR,
                                                (errcode(ERRCODE_GROUPING_ERROR),
-                                                errmsg("cannot use aggregates in EXECUTE parameters")));
+                                                errmsg("cannot use aggregate in EXECUTE parameter")));
 
                        given_type_id = exprType(expr);
                        expected_type_id = lfirsto(paramtypes);

diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 2238376867346103f6e9c691fa92c402eb58adbf..5f4a078811e0313486a81a86f4d5fb1b86c1ccb2 100644 (file)
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -726,7 +726,7 @@ coerce_to_common_type(ParseState *pstate, Node *node,
                ereport(ERROR,
                                (errcode(ERRCODE_CANNOT_COERCE),
                                 /* translator: first %s is name of a SQL construct, eg CASE */
-                                errmsg("%s unable to convert type %s to %s",
+                                errmsg("%s could not convert type %s to %s",
                                                context,
                                                format_type_be(inputTypeId),
                                                format_type_be(targetTypeId))));
@@ -945,7 +945,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
                /* Only way to get here is if all the generic args are UNKNOWN */
                ereport(ERROR,
                                (errcode(ERRCODE_DATATYPE_MISMATCH),
-                                errmsg("cannot determine ANYARRAY/ANYELEMENT type because input is UNKNOWN")));
+                                errmsg("could not determine ANYARRAY/ANYELEMENT type because input is UNKNOWN")));
        }
 
        /*
@@ -972,7 +972,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
                                        if (!OidIsValid(array_typeid))
                                                ereport(ERROR,
                                                                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                                                errmsg("cannot find array type for datatype %s",
+                                                                errmsg("could not find array type for datatype %s",
                                                                                format_type_be(elem_typeid))));
                                }
                                declared_arg_types[j] = array_typeid;
@@ -989,7 +989,7 @@ enforce_generic_type_consistency(Oid *actual_arg_types,
                        if (!OidIsValid(array_typeid))
                                ereport(ERROR,
                                                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                                errmsg("cannot find array type for datatype %s",
+                                                errmsg("could not find array type for datatype %s",
                                                                format_type_be(elem_typeid))));
                }
                return array_typeid;
@@ -1043,7 +1043,7 @@ resolve_generic_type(Oid declared_type,
                        if (!OidIsValid(array_typeid))
                                ereport(ERROR,
                                                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                                errmsg("cannot find array type for datatype %s",
+                                                errmsg("could not find array type for datatype %s",
                                                                format_type_be(context_actual_type))));
                        return array_typeid;
                }
@@ -1075,7 +1075,7 @@ resolve_generic_type(Oid declared_type,
        }
        /* If we get here, declared_type is polymorphic and context isn't */
        /* NB: this is a calling-code logic error, not a user error */
-       elog(ERROR, "cannot determine ANYARRAY/ANYELEMENT type because context isn't polymorphic");
+       elog(ERROR, "could not determine ANYARRAY/ANYELEMENT type because context isn't polymorphic");
        return InvalidOid;                      /* keep compiler quiet */
 }
 

diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 52ba694f2a083533830d04131bf1312841395a93..e7345344d1f896adf98ed3876a84a666bef044f0 100644 (file)
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -785,7 +785,7 @@ transformExpr(ParseState *pstate, Node *expr)
                                        if (!OidIsValid(element_type))
                                                ereport(ERROR,
                                                                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                                                errmsg("cannot find array type for datatype %s",
+                                                                errmsg("could not find array type for datatype %s",
                                                                                format_type_be(array_type))));
 
                                        /*
@@ -1252,7 +1252,7 @@ exprType(Node *expr)
                                                if (!OidIsValid(type))
                                                        ereport(ERROR,
                                                                        (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                                                        errmsg("cannot find array type for datatype %s",
+                                                                        errmsg("could not find array type for datatype %s",
                                                                                        format_type_be(tent->resdom->restype))));
                                        }
                                }
@@ -1289,7 +1289,7 @@ exprType(Node *expr)
                                                if (!OidIsValid(type))
                                                        ereport(ERROR,
                                                                        (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                                                        errmsg("cannot find array type for datatype %s",
+                                                                        errmsg("could not find array type for datatype %s",
                                                                                        format_type_be(tent->resdom->restype))));
                                        }
                                }

diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 4f2758b88ab2763192be4cf0a988c2673653b017..bfa16b3bed5ffe3e9764ed6e918ef1c18cd00258 100644 (file)
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -311,7 +311,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
                                         errmsg("function %s is not unique",
                                                        func_signature_string(funcname, nargs,
                                                                                                  actual_arg_types)),
-                                        errhint("Unable to choose a best candidate function. "
+                                        errhint("Could not choose a best candidate function. "
                                                         "You may need to add explicit typecasts.")));
                else
                        ereport(ERROR,

diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index 4fda535f07c131972b7265637669b2d6824a751c..0e139af6b9580dfd711eacaba6375561b92a30e8 100644 (file)
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -184,7 +184,7 @@ equality_oper(Oid argtype, bool noError)
        if (!noError)
                ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_FUNCTION),
-                                errmsg("unable to identify an equality operator for type %s",
+                                errmsg("could not identify an equality operator for type %s",
                                                format_type_be(argtype))));
        return NULL;
 }
@@ -247,7 +247,7 @@ ordering_oper(Oid argtype, bool noError)
        if (!noError)
                ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_FUNCTION),
-                                errmsg("unable to identify an ordering operator for type %s",
+                                errmsg("could not identify an ordering operator for type %s",
                                                format_type_be(argtype)),
                                 errhint("Use an explicit ordering operator or modify the query.")));
        return NULL;
@@ -689,7 +689,7 @@ op_error(List *op, char oprkind, Oid arg1, Oid arg2, FuncDetailCode fdresult)
                                (errcode(ERRCODE_AMBIGUOUS_FUNCTION),
                                 errmsg("operator is not unique: %s",
                                                op_signature_string(op, oprkind, arg1, arg2)),
-                                errhint("Unable to choose a best candidate operator. "
+                                errhint("Could not choose a best candidate operator. "
                                                 "You may need to add explicit typecasts.")));
        else
                ereport(ERROR,
@@ -828,7 +828,7 @@ make_scalar_array_op(ParseState *pstate, List *opname,
        if (!OidIsValid(res_atypeId))
                ereport(ERROR,
                                (errcode(ERRCODE_UNDEFINED_OBJECT),
-                                errmsg("unable to find datatype for array of %s",
+                                errmsg("could not find datatype for array of %s",
                                                format_type_be(declared_arg_types[1]))));
        actual_arg_types[1] = atypeId;
        declared_arg_types[1] = res_atypeId;

diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 0280c0714d000a6f3eb7ae24cf74b50028603f47..78c7fbb51fff995fd1dc02c6c24eca6993ed97ff 100644 (file)
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -496,7 +496,7 @@ checkInsertTargets(ParseState *pstate, List *cols, List **attrnos)
                        if (intMember(attrno, *attrnos))
                                ereport(ERROR,
                                                (errcode(ERRCODE_DUPLICATE_COLUMN),
-                                                errmsg("attribute \"%s\" specified more than once in INSERT list",
+                                                errmsg("attribute \"%s\" specified more than once",
                                                                name)));
                        *attrnos = lappendi(*attrnos, attrno);
                }

diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 45b08240e3ca8d11cd7593af08f4b1e624c30f1b..95fde014f7e1f19863413a4697789888fed1c327 100644 (file)
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -2022,7 +2022,7 @@ pgstat_write_statsfile(void)
        {
                ereport(LOG,
                                (errcode_for_file_access(),
-                                errmsg("cannot write temp statistics file \"%s\": %m",
+                                errmsg("could not write temp statistics file \"%s\": %m",
                                                pgStat_tmpfname)));
                return;
        }

diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index fe07be9f7f95e910b4287f93f9171e8a24ff07e9..57330c717323e50e3580d1bd7f16f0f140255533 100644 (file)
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -1197,7 +1197,7 @@ LockReleaseAll(LOCKMETHOD lockmethod, PGPROC *proc,
        lockMethodTable = LockMethodTable[lockmethod];
        if (!lockMethodTable)
        {
-               elog(WARNING, "bad lockmethod %d", lockmethod);
+               elog(WARNING, "bad lock method: %d", lockmethod);
                return FALSE;
        }
 

diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 8c1a909e4f68239773d50e10de8a928ff53968c4..185a036db8d69493589b230146d24a9fd445a3a6 100644 (file)
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -608,7 +608,7 @@ mdnblocks(Relation reln)
                         */
                        v->mdfd_chain = _mdfd_openseg(reln, segno, O_CREAT);
                        if (v->mdfd_chain == (MdfdVec *) NULL)
-                               elog(ERROR, "could not count blocks for \"%s\": %m",
+                               elog(ERROR, "could not count blocks of \"%s\": %m",
                                         RelationGetRelationName(reln));
                }
 

diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index c65ca6d5ab20ff36f0c9894af7a9752baec281bc..0c6fc432ea235ce66fee9fa27f8f76a9f29daf60 100644 (file)
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -727,7 +727,7 @@ abstime_timestamptz(PG_FUNCTION_ARGS)
                case INVALID_ABSTIME:
                        ereport(ERROR,
                                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                        errmsg("cannot convert \"invalid\" abstime to timestamptz")));
+                                        errmsg("cannot convert \"invalid\" abstime to timestamp")));
                        TIMESTAMP_NOBEGIN(result);
                        break;
 

diff --git a/src/backend/utils/adt/pseudotypes.c b/src/backend/utils/adt/pseudotypes.c
index 1f2fc62b8cfbf823da0547a22efa57d585d8f381..28a1309009bcc0d32d22edb2b619f572f4c3d884 100644 (file)
--- a/src/backend/utils/adt/pseudotypes.c
+++ b/src/backend/utils/adt/pseudotypes.c
@@ -35,7 +35,7 @@ record_in(PG_FUNCTION_ARGS)
 {
        ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot accept a constant of type record")));
+                        errmsg("cannot accept a value of type record")));
 
        PG_RETURN_VOID();                       /* keep compiler quiet */
 }
@@ -144,7 +144,7 @@ any_in(PG_FUNCTION_ARGS)
 {
        ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot accept a constant of type any")));
+                        errmsg("cannot accept a value of type any")));
 
        PG_RETURN_VOID();                       /* keep compiler quiet */
 }
@@ -171,7 +171,7 @@ anyarray_in(PG_FUNCTION_ARGS)
 {
        ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot accept a constant of type anyarray")));
+                        errmsg("cannot accept a value of type anyarray")));
 
        PG_RETURN_VOID();                       /* keep compiler quiet */
 }
@@ -249,7 +249,7 @@ trigger_in(PG_FUNCTION_ARGS)
 {
        ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot accept a constant of type trigger")));
+                        errmsg("cannot accept a value of type trigger")));
 
        PG_RETURN_VOID();                       /* keep compiler quiet */
 }
@@ -276,7 +276,7 @@ language_handler_in(PG_FUNCTION_ARGS)
 {
        ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot accept a constant of type language_handler")));
+                        errmsg("cannot accept a value of type language_handler")));
 
        PG_RETURN_VOID();                       /* keep compiler quiet */
 }
@@ -303,7 +303,7 @@ internal_in(PG_FUNCTION_ARGS)
 {
        ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot accept a constant of type internal")));
+                        errmsg("cannot accept a value of type internal")));
 
        PG_RETURN_VOID();                       /* keep compiler quiet */
 }
@@ -330,7 +330,7 @@ opaque_in(PG_FUNCTION_ARGS)
 {
        ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot accept a constant of type opaque")));
+                        errmsg("cannot accept a value of type opaque")));
 
        PG_RETURN_VOID();                       /* keep compiler quiet */
 }
@@ -357,7 +357,7 @@ anyelement_in(PG_FUNCTION_ARGS)
 {
        ereport(ERROR,
                        (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                        errmsg("cannot accept a constant of type anyelement")));
+                        errmsg("cannot accept a value of type anyelement")));
 
        PG_RETURN_VOID();                       /* keep compiler quiet */
 }

diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 4112bb56d6af52f4d6ffd7808669d0b5a520b7ef..2406ef5f96d974c8d22f481d381f15788c6fbe65 100644 (file)
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -1273,7 +1273,7 @@ parseNameAndArgTypes(const char *string, const char *caller,
                if (*nargs >= FUNC_MAX_ARGS)
                        ereport(ERROR,
                                        (errcode(ERRCODE_TOO_MANY_ARGUMENTS),
-                                        errmsg("too many argument datatypes")));
+                                        errmsg("too many arguments")));
 
                argtypes[*nargs] = typeid;
                (*nargs)++;

diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index b7f298f67fac6a7a30c202ce276c9ced237f0254..63dc4fd40eed7c1c18629c709c99c7729653c67e 100644 (file)
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -766,7 +766,7 @@ CatalogCacheFlushRelation(Oid relId)
 #ifdef CACHEDEBUG
 #define InitCatCache_DEBUG2 \
 do { \
-       elog(DEBUG2, "InitCatCache: rel=%s id=%d nkeys=%d size=%d\n", \
+       elog(DEBUG2, "InitCatCache: rel=%s id=%d nkeys=%d size=%d", \
                cp->cc_relname, cp->id, cp->cc_nkeys, cp->cc_nbuckets); \
 } while(0)
 

diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 19630cd53398c2a33e4d8037beae439185c08f8c..e56b5687b01156f28dfafa37109a785c78e67813 100644 (file)
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -312,8 +312,8 @@ get_atttypetypmod(Oid relid, AttrNumber attnum,
                                                Int16GetDatum(attnum),
                                                0, 0);
        if (!HeapTupleIsValid(tp))
-               elog(ERROR, "cache lookup failed for relation %u attribute %d",
-                        relid, attnum);
+               elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+                        attnum, relid);
        att_tup = (Form_pg_attribute) GETSTRUCT(tp);
 
        *typid = att_tup->atttypid;

diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
index 36d3ff628ad0c29ef5bffad2aee7e0febb6de2eb..dc8afc568958430e18d36809e53f2c68508d7625 100644 (file)
--- a/src/backend/utils/fmgr/funcapi.c
+++ b/src/backend/utils/fmgr/funcapi.c
@@ -35,7 +35,7 @@ init_MultiFuncCall(PG_FUNCTION_ARGS)
        if (fcinfo->resultinfo == NULL || !IsA(fcinfo->resultinfo, ReturnSetInfo))
                ereport(ERROR,
                                (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-                                errmsg("set function called in context that does not accept a set result")));
+                                errmsg("set-valued function called in context that cannot accept a set")));
 
        if (fcinfo->flinfo->fn_extra == NULL)
        {

diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 3998c8fe5d7d77587e396ec56ac50005e3510d3d..5f566bf5b03d92663337d4e44084712b9faa3f9b 100644 (file)
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -396,7 +396,7 @@ GetCharSetByHost(char *TableName, int host, const char *DataDir)
                        else if (strcasecmp(buf, "RecodeTable") == 0)
                                key = KEY_TABLE;
                        else
-                               elog(LOG, "unknown tag %s in file %s",
+                               elog(LOG, "unrecognized tag %s in file %s",
                                         buf, CHARSET_FILE);
 
                        switch (key)
@@ -452,7 +452,7 @@ GetCharSetByHost(char *TableName, int host, const char *DataDir)
                        while (!feof(file) && buf[0])
                        {
                                next_token(file, buf, sizeof(buf));
-                               elog(LOG, "unknown tag %s in file %s",
+                               elog(LOG, "unrecognized tag %s in file %s",
                                         buf, CHARSET_FILE);
                        }
                }

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 65515d35b3a0564fca950682c05acc63532a9a82..90a7504c79285ad6a12ba8660aca45a7f2b55568 100644 (file)
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -910,7 +910,7 @@ static struct config_int ConfigureNamesInt[] =
 
        {
                {"superuser_reserved_connections", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
-                       gettext_noop("Number of 'connection slots' reserved for superusers"),
+                       gettext_noop("Number of connection \"slots\" reserved for superusers"),
                        NULL
                },
                &ReservedBackends,
@@ -940,7 +940,7 @@ static struct config_int ConfigureNamesInt[] =
                        gettext_noop("Sets the access permissions of the Unix domain socket"),
                        gettext_noop("Unix domain sockets use the usual Unix file system "
                                                 "permission set. The option value is expected to be an numeric mode "
-                                                "specification in the form accepted by the chmod and umask  system "
+                                                "specification in the form accepted by the chmod and umask system "
                                                 "calls. (To use the customary octal format the number must start with "
                                                 "a 0 (zero).)")
                },
@@ -1085,7 +1085,7 @@ static struct config_int ConfigureNamesInt[] =
 
        {
                {"checkpoint_warning", PGC_SIGHUP, WAL_CHECKPOINTS,
-                       gettext_noop("Log if filling of checkpoint segments happens more"
+                       gettext_noop("Log if filling of checkpoint segments happens more "
                                                 "frequently than this (sec)"),
                        gettext_noop("Send a message to the server logs if checkpoints "
                                                 "caused by the filling of checkpoint segment files happens more "
@@ -1312,7 +1312,7 @@ static struct config_string ConfigureNamesString[] =
                {"default_transaction_isolation", PGC_USERSET, CLIENT_CONN_STATEMENT,
                        gettext_noop("The default isolation level of each new transaction"),
                        gettext_noop("Each SQL transaction has an isolation level, which "
-                                        "can be either 'read committed' or 'serializable'.")
+                                        "can be either \"read committed\" or \"serializable\".")
                },
                &default_iso_level_string,
                "read committed", assign_defaultxactisolevel, NULL
@@ -1418,7 +1418,7 @@ static struct config_string ConfigureNamesString[] =
 
        {
                {"regex_flavor", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
-                       gettext_noop("Regular expression 'flavor'"),
+                       gettext_noop("Regular expression \"flavor\""),
                        gettext_noop("This can be set to advanced, extended, or basic")
                },
                &regex_flavor_string,
@@ -1471,7 +1471,7 @@ static struct config_string ConfigureNamesString[] =
 #ifdef HAVE_SYSLOG
        {
                {"syslog_facility", PGC_POSTMASTER, LOGGING_SYSLOG,
-                       gettext_noop("Which syslog 'facility' to be used when syslog enabled"),
+                       gettext_noop("syslog \"facility\" to be used when syslog enabled"),
                        gettext_noop("You may choose from LOCAL0, LOCAL1, LOCAL2, LOCAL3, "
                                                 "LOCAL4, LOCAL5, LOCAL6, LOCAL7")
                },
@@ -3983,7 +3983,7 @@ ProcessGUCArray(ArrayType *array, GucSource source)
                {
                        ereport(WARNING,
                                        (errcode(ERRCODE_SYNTAX_ERROR),
-                                        errmsg("cannot parse setting for \"%s\"", name)));
+                                        errmsg("could not parse setting for \"%s\"", name)));
                        free(name);
                        continue;
                }

diff --git a/src/bin/pg_ctl/pg_ctl.sh b/src/bin/pg_ctl/pg_ctl.sh
index 30e8858aaa6bd48222f4bbf160b65110c2a41445..778c91c4ceca23611fb618e0b181061e09989ef9 100755 (executable)
--- a/src/bin/pg_ctl/pg_ctl.sh
+++ b/src/bin/pg_ctl/pg_ctl.sh
@@ -303,7 +303,7 @@ if [ "$op" = "stop" -o "$op" = "restart" -o "$op" = "reload" ];then
        fi
 
     else # ! -f $PIDFILE
-       echo "$CMDNAME: cannot find $PIDFILE" 1>&2
+       echo "$CMDNAME: could not find $PIDFILE" 1>&2
        echo "Is postmaster running?" 1>&2
        if [ "$op" = "restart" ];then
            echo "starting postmaster anyway" 1>&2

diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 61af39053443826087569c6ff1419033089901ac..8f8e1ada2829660356a231d7015c084432007e16 100644 (file)
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -4382,7 +4382,7 @@ convertOperatorReference(const char *opr,
 
        name = findOprByOid(g_oprinfo, numOperators, opr);
        if (name == NULL)
-               write_msg(NULL, "WARNING: cannot find operator with OID %s\n",
+               write_msg(NULL, "WARNING: could not find operator with OID %s\n",
                                  opr);
        return name;
 }

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 26aec68639c4e78fbbb3b99688da7cd5dd76cc5b..9d78a36a5c8eef35b918a9b1e605c2b22f5e3b88 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -448,7 +448,7 @@ connectOptions2(PGconn *conn)
                {
                        conn->status = CONNECTION_BAD;
                        printfPQExpBuffer(&conn->errorMessage,
-                                                         libpq_gettext("unknown sslmode \"%s\" requested\n"),
+                                                         libpq_gettext("unrecognized sslmode: \"%s\"\n"),
                                                          conn->sslmode);
                        return false;
                }

diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
index aef037abc5249465a2fa63ce0359897e9ff16a5f..167ded7b3697da85969eec984cb57e5160426ee2 100644 (file)
--- a/src/pl/plpgsql/src/pl_funcs.c
+++ b/src/pl/plpgsql/src/pl_funcs.c
@@ -593,7 +593,7 @@ dump_stmt(PLpgSQL_stmt * stmt)
                        dump_perform((PLpgSQL_stmt_perform *) stmt);
                        break;
                default:
-                       elog(ERROR, "unknown cmd_type: %d", stmt->cmd_type);
+                       elog(ERROR, "unrecognized cmd_type: %d", stmt->cmd_type);
                        break;
        }
 }

diff --git a/src/port/strerror.c b/src/port/strerror.c
index 1e1c680b253eb747191fd9d2142536a06364fa6d..38d8f0fcb51d59fc2d0687abcfee2f9b1a000ea8 100644 (file)
--- a/src/port/strerror.c
+++ b/src/port/strerror.c
@@ -23,7 +23,7 @@ strerror(int errnum)
 
        if (errnum < 0 || errnum > sys_nerr)
        {
-               sprintf(buf, "unknown error %d", errnum);
+               sprintf(buf, "unrecognized error %d", errnum);
                return buf;
        }
 

diff --git a/src/test/regress/expected/conversion.out b/src/test/regress/expected/conversion.out
index 622fccaacd2b5c092b4b434ba90e2b0c39a09de1..289bd0a27f10bf15ed8ffa9108b536717396652a 100644 (file)
--- a/src/test/regress/expected/conversion.out
+++ b/src/test/regress/expected/conversion.out
@@ -17,7 +17,7 @@ CREATE DEFAULT CONVERSION public.mydef FOR 'LATIN1' TO 'UNICODE' FROM iso8859_1_
 -- cannot make default conversion with same shcema/for_encoding/to_encoding
 --
 CREATE DEFAULT CONVERSION public.mydef2 FOR 'LATIN1' TO 'UNICODE' FROM iso8859_1_to_utf8;
-ERROR:  default conversion for "LATIN1" to "UNICODE" already exists
+ERROR:  default conversion for LATIN1 to UNICODE already exists
 --
 -- drop user defined conversion
 --

diff --git a/src/test/regress/expected/create_type.out b/src/test/regress/expected/create_type.out
index 64c29890fddced6484e82b296e633ced7f9215dd..210da92cf2df9b7f3663cc7e14812366d04fa25f 100644 (file)
--- a/src/test/regress/expected/create_type.out
+++ b/src/test/regress/expected/create_type.out
@@ -19,7 +19,7 @@ CREATE FUNCTION int42_in(cstring)
    RETURNS int42
    AS 'int4in'
    LANGUAGE 'internal' WITH (isStrict);
-NOTICE:  type int42 is not yet defined
+NOTICE:  type "int42" is not yet defined
 DETAIL:  Creating a shell type definition.
 CREATE FUNCTION int42_out(int42)
    RETURNS cstring
@@ -30,7 +30,7 @@ CREATE FUNCTION text_w_default_in(cstring)
    RETURNS text_w_default
    AS 'textin'
    LANGUAGE 'internal' WITH (isStrict);
-NOTICE:  type text_w_default is not yet defined
+NOTICE:  type "text_w_default" is not yet defined
 DETAIL:  Creating a shell type definition.
 CREATE FUNCTION text_w_default_out(text_w_default)
    RETURNS cstring

diff --git a/src/test/regress/expected/time.out b/src/test/regress/expected/time.out
index 5604c9a452d7e34b8ebf8272eda137c0f00c1bcf..5cf09b1ae211029a0748f55b370e669f63728bf2 100644 (file)
--- a/src/test/regress/expected/time.out
+++ b/src/test/regress/expected/time.out
@@ -70,4 +70,4 @@ SELECT f1 AS "Eight" FROM TIME_TBL WHERE f1 >= '00:00';
 -- where we do mixed-type arithmetic. - thomas 2000-12-02
 SELECT f1 + time '00:01' AS "Illegal" FROM TIME_TBL;
 ERROR:  operator is not unique: time without time zone + time without time zone
-HINT:  Unable to choose a best candidate operator. You may need to add explicit typecasts.
+HINT:  Could not choose a best candidate operator. You may need to add explicit typecasts.

diff --git a/src/test/regress/output/create_function_1.source b/src/test/regress/output/create_function_1.source
index 777948530599534ad09a4f83d2324546ad29e5df..44e74fb527e9241c82c2298dc98c980e56ec181e 100644 (file)
--- a/src/test/regress/output/create_function_1.source
+++ b/src/test/regress/output/create_function_1.source
@@ -5,7 +5,7 @@ CREATE FUNCTION widget_in(cstring)
    RETURNS widget
    AS '@abs_builddir@/regress@DLSUFFIX@'
    LANGUAGE 'c';
-NOTICE:  type widget is not yet defined
+NOTICE:  type "widget" is not yet defined
 DETAIL:  Creating a shell type definition.
 CREATE FUNCTION widget_out(widget)
    RETURNS cstring
@@ -16,7 +16,7 @@ CREATE FUNCTION int44in(cstring)
    RETURNS city_budget
    AS '@abs_builddir@/regress@DLSUFFIX@'
    LANGUAGE 'c';
-NOTICE:  type city_budget is not yet defined
+NOTICE:  type "city_budget" is not yet defined
 DETAIL:  Creating a shell type definition.
 CREATE FUNCTION int44out(city_budget)
    RETURNS cstring