diff options
| -rw-r--r-- | src/backend/access/common/reloptions.c | 10 | ||||
| -rw-r--r-- | src/backend/commands/tablecmds.c | 6 | ||||
| -rw-r--r-- | src/include/utils/rel.h | 16 |
3 files changed, 30 insertions, 2 deletions
diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c index b5fd30a4f95..31941e99edb 100644 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@ -63,6 +63,14 @@ static relopt_bool boolRelOpts[] = }, { { + "user_catalog_table", + "Declare a table as an additional catalog table, e.g. for the purpose of logical replication", + RELOPT_KIND_HEAP + }, + false + }, + { + { "fastupdate", "Enables \"fast update\" feature for this GIN index", RELOPT_KIND_GIN @@ -1166,6 +1174,8 @@ default_reloptions(Datum reloptions, bool validate, relopt_kind kind) offsetof(StdRdOptions, security_barrier)}, {"check_option", RELOPT_TYPE_STRING, offsetof(StdRdOptions, check_option_offset)}, + {"user_catalog_table", RELOPT_TYPE_BOOL, + offsetof(StdRdOptions, user_catalog_table)} }; options = parseRelOptions(reloptions, validate, kind, &numoptions); diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 1d9f29a7b7c..b9cd88d5701 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -3532,6 +3532,12 @@ ATRewriteTables(List **wqueue, LOCKMODE lockmode) errmsg("cannot rewrite system relation \"%s\"", RelationGetRelationName(OldHeap)))); + if (RelationIsUsedAsCatalogTable(OldHeap)) + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("cannot rewrite table \"%s\" used as a catalog table", + RelationGetRelationName(OldHeap)))); + /* * Don't allow rewrite on temp tables of other backends ... their * local buffer manager is not going to cope. diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index ad878cf1a22..383744b3a0c 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -217,6 +217,7 @@ typedef struct StdRdOptions AutoVacOpts autovacuum; /* autovacuum-related options */ bool security_barrier; /* for views */ int check_option_offset; /* for views */ + bool user_catalog_table; /* use as an additional catalog relation */ } StdRdOptions; #define HEAP_MIN_FILLFACTOR 10 @@ -286,6 +287,15 @@ typedef struct StdRdOptions "cascaded") == 0 : false) /* + * RelationIsUsedAsCatalogTable + * Returns whether the relation should be treated as a catalog table + * from the pov of logical decoding. + */ +#define RelationIsUsedAsCatalogTable(relation) \ + ((relation)->rd_options ? \ + ((StdRdOptions *) (relation)->rd_options)->user_catalog_table : false) + +/* * RelationIsValid * True iff relation descriptor is valid. */ @@ -462,7 +472,7 @@ typedef struct StdRdOptions #define RelationIsAccessibleInLogicalDecoding(relation) \ (XLogLogicalInfoActive() && \ RelationNeedsWAL(relation) && \ - IsCatalogRelation(relation)) + (IsCatalogRelation(relation) || RelationIsUsedAsCatalogTable(relation))) /* * RelationIsLogicallyLogged @@ -471,7 +481,9 @@ typedef struct StdRdOptions * * We don't log information for unlogged tables (since they don't WAL log * anyway) and for system tables (their content is hard to make sense of, and - * it would complicate decoding slightly for little gain). + * it would complicate decoding slightly for little gain). Note that we *do* + * log information for user defined catalog tables since they presumably are + * interesting to the user... */ #define RelationIsLogicallyLogged(relation) \ (XLogLogicalInfoActive() && \ |