mirror of
https://github.com/postgres/postgres.git
synced 2025-07-30 11:03:19 +03:00
Improve error messages about mismatching relkind
Most error messages about a relkind that was not supported or appropriate for the command was of the pattern "relation \"%s\" is not a table, foreign table, or materialized view" This style can become verbose and tedious to maintain. Moreover, it's not very helpful: If I'm trying to create a comment on a TOAST table, which is not supported, then the information that I could have created a comment on a materialized view is pointless. Instead, write the primary error message shorter and saying more directly that what was attempted is not possible. Then, in the detail message, explain that the operation is not supported for the relkind the object was. To simplify that, add a new function errdetail_relkind_not_supported() that does this. In passing, make use of RELKIND_HAS_STORAGE() where appropriate, instead of listing out the relkinds individually. Reviewed-by: Michael Paquier <michael@paquier.xyz> Reviewed-by: Alvaro Herrera <alvherre@alvh.no-ip.org> Discussion: https://www.postgresql.org/message-id/flat/dc35a398-37d0-75ce-07ea-1dd71d98f8ec@2ndquadrant.com
This commit is contained in:
@ -147,7 +147,6 @@ typedef struct HeapCheckContext
|
||||
} HeapCheckContext;
|
||||
|
||||
/* Internal implementation */
|
||||
static void sanity_check_relation(Relation rel);
|
||||
static void check_tuple(HeapCheckContext *ctx);
|
||||
static void check_toast_tuple(HeapTuple toasttup, HeapCheckContext *ctx,
|
||||
ToastedAttribute *ta, int32 *expected_chunk_seq,
|
||||
@ -300,7 +299,23 @@ verify_heapam(PG_FUNCTION_ARGS)
|
||||
|
||||
/* Open relation, check relkind and access method */
|
||||
ctx.rel = relation_open(relid, AccessShareLock);
|
||||
sanity_check_relation(ctx.rel);
|
||||
|
||||
/*
|
||||
* Check that a relation's relkind and access method are both supported.
|
||||
*/
|
||||
if (ctx.rel->rd_rel->relkind != RELKIND_RELATION &&
|
||||
ctx.rel->rd_rel->relkind != RELKIND_MATVIEW &&
|
||||
ctx.rel->rd_rel->relkind != RELKIND_TOASTVALUE)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("cannot check relation \"%s\"",
|
||||
RelationGetRelationName(ctx.rel)),
|
||||
errdetail_relkind_not_supported(ctx.rel->rd_rel->relkind)));
|
||||
|
||||
if (ctx.rel->rd_rel->relam != HEAP_TABLE_AM_OID)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
||||
errmsg("only heap AM is supported")));
|
||||
|
||||
/* Early exit if the relation is empty */
|
||||
nblocks = RelationGetNumberOfBlocks(ctx.rel);
|
||||
@ -523,25 +538,6 @@ verify_heapam(PG_FUNCTION_ARGS)
|
||||
PG_RETURN_NULL();
|
||||
}
|
||||
|
||||
/*
|
||||
* Check that a relation's relkind and access method are both supported.
|
||||
*/
|
||||
static void
|
||||
sanity_check_relation(Relation rel)
|
||||
{
|
||||
if (rel->rd_rel->relkind != RELKIND_RELATION &&
|
||||
rel->rd_rel->relkind != RELKIND_MATVIEW &&
|
||||
rel->rd_rel->relkind != RELKIND_TOASTVALUE)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
|
||||
errmsg("\"%s\" is not a table, materialized view, or TOAST table",
|
||||
RelationGetRelationName(rel))));
|
||||
if (rel->rd_rel->relam != HEAP_TABLE_AM_OID)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
|
||||
errmsg("only heap AM is supported")));
|
||||
}
|
||||
|
||||
/*
|
||||
* Shared internal implementation for report_corruption and
|
||||
* report_toast_corruption.
|
||||
|
Reference in New Issue
Block a user