diff --git a/src/backend/distributed/commands/distribute_object_ops.c b/src/backend/distributed/commands/distribute_object_ops.c index 8934bb1d4..a275e1282 100644 --- a/src/backend/distributed/commands/distribute_object_ops.c +++ b/src/backend/distributed/commands/distribute_object_ops.c @@ -773,7 +773,7 @@ GetDistributeObjectOps(Node *node) case T_AlterTableStmt: { AlterTableStmt *stmt = castNode(AlterTableStmt, node); - switch (AlterTableStmtObjType(stmt)) + switch (AlterTableStmtObjType_compat(stmt)) { case OBJECT_TYPE: { diff --git a/src/backend/distributed/commands/sequence.c b/src/backend/distributed/commands/sequence.c index 10df671a4..dd7390b45 100644 --- a/src/backend/distributed/commands/sequence.c +++ b/src/backend/distributed/commands/sequence.c @@ -595,7 +595,7 @@ PreprocessAlterSequenceOwnerStmt(Node *node, const char *queryString, ProcessUtilityContext processUtilityContext) { AlterTableStmt *stmt = castNode(AlterTableStmt, node); - Assert(AlterTableStmtObjType(stmt) == OBJECT_SEQUENCE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_SEQUENCE); ObjectAddress sequenceAddress = GetObjectAddressFromParseTree((Node *) stmt, false); if (!ShouldPropagateObject(&sequenceAddress)) @@ -623,7 +623,7 @@ ObjectAddress AlterSequenceOwnerStmtObjectAddress(Node *node, bool missing_ok) { AlterTableStmt *stmt = castNode(AlterTableStmt, node); - Assert(AlterTableStmtObjType(stmt) == OBJECT_SEQUENCE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_SEQUENCE); RangeVar *sequence = stmt->relation; Oid seqOid = RangeVarGetRelid(sequence, NoLock, missing_ok); @@ -643,7 +643,7 @@ List * PostprocessAlterSequenceOwnerStmt(Node *node, const char *queryString) { AlterTableStmt *stmt = castNode(AlterTableStmt, node); - Assert(AlterTableStmtObjType(stmt) == OBJECT_SEQUENCE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_SEQUENCE); ObjectAddress sequenceAddress = GetObjectAddressFromParseTree((Node *) stmt, false); if (!ShouldPropagateObject(&sequenceAddress)) diff --git a/src/backend/distributed/commands/table.c b/src/backend/distributed/commands/table.c index f72b1b2bf..e00a5590c 100644 --- a/src/backend/distributed/commands/table.c +++ b/src/backend/distributed/commands/table.c @@ -524,7 +524,7 @@ PreprocessAlterTableStmt(Node *node, const char *alterTableCommand, if (get_rel_relkind(leftRelationId) == RELKIND_SEQUENCE) { AlterTableStmt *stmtCopy = copyObject(alterTableStatement); - AlterTableStmtObjType(stmtCopy) = OBJECT_SEQUENCE; + AlterTableStmtObjType_compat(stmtCopy) = OBJECT_SEQUENCE; return PreprocessAlterSequenceOwnerStmt((Node *) stmtCopy, alterTableCommand, processUtilityContext); } @@ -1617,7 +1617,7 @@ PostprocessAlterTableStmt(AlterTableStmt *alterTableStatement) */ if (get_rel_relkind(relationId) == RELKIND_SEQUENCE) { - AlterTableStmtObjType(alterTableStatement) = OBJECT_SEQUENCE; + AlterTableStmtObjType_compat(alterTableStatement) = OBJECT_SEQUENCE; PostprocessAlterSequenceOwnerStmt((Node *) alterTableStatement, NULL); return; } diff --git a/src/backend/distributed/commands/type.c b/src/backend/distributed/commands/type.c index 71281fa7e..87a1fbae5 100644 --- a/src/backend/distributed/commands/type.c +++ b/src/backend/distributed/commands/type.c @@ -206,7 +206,7 @@ PreprocessAlterTypeStmt(Node *node, const char *queryString, ProcessUtilityContext processUtilityContext) { AlterTableStmt *stmt = castNode(AlterTableStmt, node); - Assert(AlterTableStmtObjType(stmt) == OBJECT_TYPE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_TYPE); ObjectAddress typeAddress = GetObjectAddressFromParseTree((Node *) stmt, false); if (!ShouldPropagateObject(&typeAddress)) @@ -789,7 +789,7 @@ ObjectAddress AlterTypeStmtObjectAddress(Node *node, bool missing_ok) { AlterTableStmt *stmt = castNode(AlterTableStmt, node); - Assert(AlterTableStmtObjType(stmt) == OBJECT_TYPE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_TYPE); TypeName *typeName = MakeTypeNameFromRangeVar(stmt->relation); Oid typeOid = LookupTypeNameOid(NULL, typeName, missing_ok); diff --git a/src/backend/distributed/commands/utility_hook.c b/src/backend/distributed/commands/utility_hook.c index 29c9c4fd7..e41c4f00e 100644 --- a/src/backend/distributed/commands/utility_hook.c +++ b/src/backend/distributed/commands/utility_hook.c @@ -485,8 +485,8 @@ ProcessUtilityInternal(PlannedStmt *pstmt, if (IsA(parsetree, AlterTableStmt)) { AlterTableStmt *alterTableStmt = (AlterTableStmt *) parsetree; - if (AlterTableStmtObjType(alterTableStmt) == OBJECT_TABLE || - AlterTableStmtObjType(alterTableStmt) == OBJECT_FOREIGN_TABLE) + if (AlterTableStmtObjType_compat(alterTableStmt) == OBJECT_TABLE || + AlterTableStmtObjType_compat(alterTableStmt) == OBJECT_FOREIGN_TABLE) { ErrorIfAlterDropsPartitionColumn(alterTableStmt); diff --git a/src/backend/distributed/deparser/deparse_sequence_stmts.c b/src/backend/distributed/deparser/deparse_sequence_stmts.c index c074a2d95..e6cb36146 100644 --- a/src/backend/distributed/deparser/deparse_sequence_stmts.c +++ b/src/backend/distributed/deparser/deparse_sequence_stmts.c @@ -194,7 +194,7 @@ DeparseAlterSequenceOwnerStmt(Node *node) StringInfoData str = { 0 }; initStringInfo(&str); - Assert(AlterTableStmtObjType(stmt) == OBJECT_SEQUENCE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_SEQUENCE); AppendAlterSequenceOwnerStmt(&str, stmt); @@ -209,7 +209,7 @@ DeparseAlterSequenceOwnerStmt(Node *node) static void AppendAlterSequenceOwnerStmt(StringInfo buf, AlterTableStmt *stmt) { - Assert(AlterTableStmtObjType(stmt) == OBJECT_SEQUENCE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_SEQUENCE); RangeVar *seq = stmt->relation; char *qualifiedSequenceName = quote_qualified_identifier(seq->schemaname, seq->relname); diff --git a/src/backend/distributed/deparser/deparse_table_stmts.c b/src/backend/distributed/deparser/deparse_table_stmts.c index 83289bc5c..26e2bd8a9 100644 --- a/src/backend/distributed/deparser/deparse_table_stmts.c +++ b/src/backend/distributed/deparser/deparse_table_stmts.c @@ -64,7 +64,7 @@ DeparseAlterTableStmt(Node *node) StringInfoData str = { 0 }; initStringInfo(&str); - Assert(AlterTableStmtObjType(stmt) == OBJECT_TABLE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_TABLE); AppendAlterTableStmt(&str, stmt); return str.data; @@ -83,7 +83,7 @@ AppendAlterTableStmt(StringInfo buf, AlterTableStmt *stmt) stmt->relation->relname); ListCell *cmdCell = NULL; - Assert(AlterTableStmtObjType(stmt) == OBJECT_TABLE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_TABLE); appendStringInfo(buf, "ALTER TABLE %s", identifier); foreach(cmdCell, stmt->cmds) diff --git a/src/backend/distributed/deparser/deparse_type_stmts.c b/src/backend/distributed/deparser/deparse_type_stmts.c index 8966f9016..e12d96ad9 100644 --- a/src/backend/distributed/deparser/deparse_type_stmts.c +++ b/src/backend/distributed/deparser/deparse_type_stmts.c @@ -122,7 +122,7 @@ DeparseAlterTypeStmt(Node *node) StringInfoData str = { 0 }; initStringInfo(&str); - Assert(AlterTableStmtObjType(stmt) == OBJECT_TYPE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_TYPE); AppendAlterTypeStmt(&str, stmt); @@ -137,7 +137,7 @@ AppendAlterTypeStmt(StringInfo buf, AlterTableStmt *stmt) stmt->relation->relname); ListCell *cmdCell = NULL; - Assert(AlterTableStmtObjType(stmt) == OBJECT_TYPE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_TYPE); appendStringInfo(buf, "ALTER TYPE %s", identifier); foreach(cmdCell, stmt->cmds) diff --git a/src/backend/distributed/deparser/qualify_sequence_stmt.c b/src/backend/distributed/deparser/qualify_sequence_stmt.c index 952aa2421..efff68c72 100644 --- a/src/backend/distributed/deparser/qualify_sequence_stmt.c +++ b/src/backend/distributed/deparser/qualify_sequence_stmt.c @@ -32,7 +32,7 @@ void QualifyAlterSequenceOwnerStmt(Node *node) { AlterTableStmt *stmt = castNode(AlterTableStmt, node); - Assert(AlterTableStmtObjType(stmt) == OBJECT_SEQUENCE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_SEQUENCE); RangeVar *seq = stmt->relation; diff --git a/src/backend/distributed/deparser/qualify_type_stmt.c b/src/backend/distributed/deparser/qualify_type_stmt.c index 4728b0032..506491f47 100644 --- a/src/backend/distributed/deparser/qualify_type_stmt.c +++ b/src/backend/distributed/deparser/qualify_type_stmt.c @@ -126,7 +126,7 @@ void QualifyAlterTypeStmt(Node *node) { AlterTableStmt *stmt = castNode(AlterTableStmt, node); - Assert(AlterTableStmtObjType(stmt) == OBJECT_TYPE); + Assert(AlterTableStmtObjType_compat(stmt) == OBJECT_TYPE); if (stmt->relation->schemaname == NULL) { diff --git a/src/include/distributed/version_compat.h b/src/include/distributed/version_compat.h index 697f8dbbc..c425a8075 100644 --- a/src/include/distributed/version_compat.h +++ b/src/include/distributed/version_compat.h @@ -31,7 +31,7 @@ #endif #if PG_VERSION_NUM >= PG_VERSION_14 -#define AlterTableStmtObjType(a) ((a)->objtype) +#define AlterTableStmtObjType_compat(a) ((a)->objtype) #define getObjectTypeDescription_compat(a, b) getObjectTypeDescription(a, b) #define getObjectIdentity_compat(a, b) getObjectIdentity(a, b) @@ -57,7 +57,7 @@ #define pull_varnos_compat(a, b) pull_varnos(a, b) #define pg_get_statisticsobj_worker_compat(a, b, c) pg_get_statisticsobj_worker(a, b, c) #else -#define AlterTableStmtObjType(a) ((a)->relkind) +#define AlterTableStmtObjType_compat(a) ((a)->relkind) #define F_NEXTVAL F_NEXTVAL_OID #define ROLE_PG_MONITOR DEFAULT_ROLE_MONITOR #define PROC_WAIT_STATUS_WAITING STATUS_WAITING