From a1e05115834a413b024d2330287ba3be2eb561c8 Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Fri, 8 Oct 2021 16:16:57 +0300 Subject: [PATCH] Remove get_relation_constraint_oid_compat --- .../distributed/commands/foreign_constraint.c | 26 ++----------------- 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/src/backend/distributed/commands/foreign_constraint.c b/src/backend/distributed/commands/foreign_constraint.c index a7e0ce6f8..67a3e4335 100644 --- a/src/backend/distributed/commands/foreign_constraint.c +++ b/src/backend/distributed/commands/foreign_constraint.c @@ -76,7 +76,6 @@ static void ForeignConstraintFindDistKeys(HeapTuple pgConstraintTuple, int *referencedAttrIndex); static List * GetForeignKeyIdsForColumn(char *columnName, Oid relationId, int searchForeignKeyColumnFlags); -static Oid get_relation_constraint_oid_compat(HeapTuple heapTuple); static List * GetForeignKeysWithLocalTables(Oid relationId); static bool IsTableTypeIncluded(Oid relationId, int flags); static void UpdateConstraintIsValid(Oid constraintId, bool isValid); @@ -600,9 +599,8 @@ GetForeignKeyIdsForColumn(char *columnName, Oid relationId, if (HeapTupleOfForeignConstraintIncludesColumn(heapTuple, relationId, pgConstraintKey, columnName)) { - Oid foreignKeyOid = get_relation_constraint_oid_compat(heapTuple); foreignKeyIdsColumnAppeared = lappend_oid(foreignKeyIdsColumnAppeared, - foreignKeyOid); + constraintForm->oid); } heapTuple = systable_getnext(scanDescriptor); @@ -701,26 +699,6 @@ GetForeignConstraintCommandsInternal(Oid relationId, int flags) } -/* - * get_relation_constraint_oid_compat returns OID of the constraint represented - * by the constraintForm, which is passed as an heapTuple. OID of the contraint - * is already stored in the constraintForm struct if major PostgreSQL version is - * 12. However, in the older versions, we should utilize HeapTupleGetOid to deduce - * that OID with no cost. - */ -static Oid -get_relation_constraint_oid_compat(HeapTuple heapTuple) -{ - Assert(heapTuple != NULL); - - - Form_pg_constraint constraintForm = (Form_pg_constraint) GETSTRUCT(heapTuple); - Oid constraintOid = constraintForm->oid; - - return constraintOid; -} - - /* * HasForeignKeyWithLocalTable returns true if relation has foreign key * relationship with a local table. @@ -1050,7 +1028,7 @@ GetForeignKeyOids(Oid relationId, int flags) continue; } - Oid constraintId = get_relation_constraint_oid_compat(heapTuple); + Oid constraintId = constraintForm->oid; bool isSelfReference = (constraintForm->conrelid == constraintForm->confrelid); if (excludeSelfReference && isSelfReference)