From 0c5039d4e38eea1da5647d9839b75de9a7c3e4bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Fri, 17 Jan 2020 23:01:16 +0000 Subject: [PATCH] Remove PG10 support --- src/backend/distributed/commands/grant.c | 41 +++++++++--------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/src/backend/distributed/commands/grant.c b/src/backend/distributed/commands/grant.c index f49fac4a5..436006593 100644 --- a/src/backend/distributed/commands/grant.c +++ b/src/backend/distributed/commands/grant.c @@ -38,41 +38,32 @@ PreprocessGrantStmt(Node *node, const char *queryString) { switch (grantStmt->objtype) { -#if (PG_VERSION_NUM >= 110000) case OBJECT_SCHEMA: case OBJECT_DATABASE: -#else - case ACL_OBJECT_NAMESPACE: - case ACL_OBJECT_DATABASE: -#endif - { - showPropagationWarning = true; - break; - } + { + showPropagationWarning = true; + break; + } -#if (PG_VERSION_NUM >= 110000) case OBJECT_TABLE: -#else - case ACL_OBJECT_RELATION: -#endif + { + ListCell *rangeVarCell = NULL; + + foreach(rangeVarCell, grantStmt->objects) { - ListCell *rangeVarCell = NULL; + RangeVar *rangeVar = (RangeVar *) lfirst(rangeVarCell); - foreach(rangeVarCell, grantStmt->objects) + Oid relationId = RangeVarGetRelid(rangeVar, NoLock, false); + if (OidIsValid(relationId) && IsDistributedTable(relationId)) { - RangeVar *rangeVar = (RangeVar *) lfirst(rangeVarCell); - - Oid relationId = RangeVarGetRelid(rangeVar, NoLock, false); - if (OidIsValid(relationId) && IsDistributedTable(relationId)) - { - showPropagationWarning = true; - break; - } + showPropagationWarning = true; + break; } - - break; } + break; + } + /* no need to warn when object is sequence, domain, function, etc. */ default: {