From 37b2764593c073ca61c2baebd7d85666e553928b Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 3 Dec 2021 13:38:26 +0100 Subject: Some RELKIND macro refactoring Add more macros to group some RELKIND_* macros: - RELKIND_HAS_PARTITIONS() - RELKIND_HAS_TABLESPACE() - RELKIND_HAS_TABLE_AM() Reviewed-by: Michael Paquier Reviewed-by: Alvaro Herrera Discussion: https://www.postgresql.org/message-id/flat/a574c8f1-9c84-93ad-a9e5-65233d6fc00f%40enterprisedb.com --- src/backend/utils/adt/partitionfuncs.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/backend/utils/adt/partitionfuncs.c') diff --git a/src/backend/utils/adt/partitionfuncs.c b/src/backend/utils/adt/partitionfuncs.c index 03660d5db6c..61aeab75dd3 100644 --- a/src/backend/utils/adt/partitionfuncs.c +++ b/src/backend/utils/adt/partitionfuncs.c @@ -45,9 +45,7 @@ check_rel_can_be_partition(Oid relid) relispartition = get_rel_relispartition(relid); /* Only allow relation types that can appear in partition trees. */ - if (!relispartition && - relkind != RELKIND_PARTITIONED_TABLE && - relkind != RELKIND_PARTITIONED_INDEX) + if (!relispartition && !RELKIND_HAS_PARTITIONS(relkind)) return false; return true; @@ -143,8 +141,7 @@ pg_partition_tree(PG_FUNCTION_ARGS) nulls[1] = true; /* isleaf */ - values[2] = BoolGetDatum(relkind != RELKIND_PARTITIONED_TABLE && - relkind != RELKIND_PARTITIONED_INDEX); + values[2] = BoolGetDatum(!RELKIND_HAS_PARTITIONS(relkind)); /* level */ if (relid != rootrelid) -- cgit v1.2.3