diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-20 21:56:35 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-20 21:56:35 +0000 |
| commit | da4ed8bfdd79759f5a1fccc4bb0940929bdc4ff2 (patch) | |
| tree | ed72b114797c44d92818e166fefeedb779f9f5f8 /src/backend/commands/analyze.c | |
| parent | 46bc5870079e829db82d352d05444c95ce62050a (diff) | |
Another round of error message editing, covering backend/commands/.
Diffstat (limited to 'src/backend/commands/analyze.c')
| -rw-r--r-- | src/backend/commands/analyze.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c index 70d147f1207..5277884f1f8 100644 --- a/src/backend/commands/analyze.c +++ b/src/backend/commands/analyze.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.55 2003/06/27 14:45:27 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/analyze.c,v 1.56 2003/07/20 21:56:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -196,8 +196,9 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt) { /* No need for a WARNING if we already complained during VACUUM */ if (!vacstmt->vacuum) - elog(WARNING, "Skipping \"%s\" --- only table or database owner can ANALYZE it", - RelationGetRelationName(onerel)); + ereport(WARNING, + (errmsg("skipping \"%s\" --- only table or database owner can ANALYZE it", + RelationGetRelationName(onerel)))); relation_close(onerel, AccessShareLock); return; } @@ -210,8 +211,9 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt) { /* No need for a WARNING if we already complained during VACUUM */ if (!vacstmt->vacuum) - elog(WARNING, "Skipping \"%s\" --- can not process indexes, views or special system tables", - RelationGetRelationName(onerel)); + ereport(WARNING, + (errmsg("skipping \"%s\" --- cannot ANALYZE indexes, views or special system tables", + RelationGetRelationName(onerel)))); relation_close(onerel, AccessShareLock); return; } @@ -239,9 +241,10 @@ analyze_rel(Oid relid, VacuumStmt *vacstmt) return; } - elog(elevel, "Analyzing %s.%s", - get_namespace_name(RelationGetNamespace(onerel)), - RelationGetRelationName(onerel)); + ereport(elevel, + (errmsg("analyzing \"%s.%s\"", + get_namespace_name(RelationGetNamespace(onerel)), + RelationGetRelationName(onerel)))); /* * Determine which columns to analyze @@ -429,7 +432,7 @@ examine_attribute(Relation onerel, int attnum) ObjectIdGetDatum(attr->atttypid), 0, 0, 0); if (!HeapTupleIsValid(typtuple)) - elog(ERROR, "cache lookup of type %u failed", attr->atttypid); + elog(ERROR, "cache lookup failed for type %u", attr->atttypid); stats->attrtype = (Form_pg_type) palloc(sizeof(FormData_pg_type)); memcpy(stats->attrtype, GETSTRUCT(typtuple), sizeof(FormData_pg_type)); ReleaseSysCache(typtuple); @@ -636,8 +639,7 @@ pageloop:; */ targbuffer = ReadBuffer(onerel, targblock); if (!BufferIsValid(targbuffer)) - elog(ERROR, "acquire_sample_rows: ReadBuffer(%s,%u) failed", - RelationGetRelationName(onerel), targblock); + elog(ERROR, "ReadBuffer failed"); LockBuffer(targbuffer, BUFFER_LOCK_SHARE); targpage = BufferGetPage(targbuffer); maxoffset = PageGetMaxOffsetNumber(targpage); |