Rename macro to RELKIND_HAS_STORAGE

alvherre · alvherre · commit df5be63763f8 · 2019-01-04T14:34:18.000-03:00
The original name was an unfortunate choice. Discussion: https://postgr.es/m/20181218.145600.172055615.horiguchi.kyotaro@lab.ntt.co.jp
diff --git 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
@@ -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
@@ -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 || \

Original file line number	Diff line number	Diff line change
`@@ -2405,7 +2405,7 @@ CopyFrom(CopyState cstate)`
`2405`	`2405`	`*----------`
`2406`	`2406`	`*/`
`2407`	`2407`	`/* createSubid is creation check, newRelfilenodeSubid is truncation check */`
`2408`		`- if (RELKIND_CAN_HAVE_STORAGE(cstate->rel->rd_rel->relkind) &&`
	`2408`	`+ if (RELKIND_HAS_STORAGE(cstate->rel->rd_rel->relkind) &&`
`2409`	`2409`	`(cstate->rel->rd_createSubid != InvalidSubTransactionId \|\|`
`2410`	`2410`	`cstate->rel->rd_newRelfilenodeSubid != InvalidSubTransactionId))`
`2411`	`2411`	`{`