Rename macro to RELKIND_HAS_STORAGE

The original name was an unfortunate choice.

Discussion: https://postgr.es/m/20181218.145600.172055615[email protected]

diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index acd992bf0c76edbcaf3bfaa29286b83c61b2dc5f..a61a62847119d2f8be59c14c09bb7fb604e57ed0 100644 (file)
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -2405,7 +2405,7 @@ CopyFrom(CopyState cstate)
         *----------
         */
        /* createSubid is creation check, newRelfilenodeSubid is truncation check */
-       if (RELKIND_CAN_HAVE_STORAGE(cstate->rel->rd_rel->relkind) &&
+       if (RELKIND_HAS_STORAGE(cstate->rel->rd_rel->relkind) &&
                (cstate->rel->rd_createSubid != InvalidSubTransactionId ||
                 cstate->rel->rd_newRelfilenodeSubid != InvalidSubTransactionId))
        {

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index e1af2c449537ccc8030a4d6ad2952d6f126c9a82..c75c5808ba11daeef579eb69db45d02668eb0fd9 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -11003,7 +11003,7 @@ ATExecSetTableSpaceNoStorage(Relation rel, Oid newTableSpace)
         * Shouldn't be called on relations having storage; these are processed
         * in phase 3.
         */
-       Assert(!RELKIND_CAN_HAVE_STORAGE(rel->rd_rel->relkind));
+       Assert(!RELKIND_HAS_STORAGE(rel->rd_rel->relkind));
 
        /* Can't allow a non-shared relation in pg_global */
        if (newTableSpace == GLOBALTABLESPACE_OID)

diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index 002f7fac92dde5c0489e57eb43b4656351159f72..5d82ce09a6c1988899a06d95665d4a14ddb5b2e6 100644 (file)
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -127,7 +127,7 @@ typedef FormData_pg_class *Form_pg_class;
  * relfilenode set to non-zero, but it can also be zero if the relation is
  * mapped.
  */
-#define RELKIND_CAN_HAVE_STORAGE(relkind) \
+#define RELKIND_HAS_STORAGE(relkind) \
        ((relkind) == RELKIND_RELATION || \
         (relkind) == RELKIND_INDEX || \
         (relkind) == RELKIND_SEQUENCE || \