From d746021de18baf0f29eff0388204a0664f41eb8b Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 1 Jul 2022 10:51:45 +0200 Subject: Add construct_array_builtin, deconstruct_array_builtin There were many calls to construct_array() and deconstruct_array() for built-in types, for example, when dealing with system catalog columns. These all hardcoded the type attributes necessary to pass to these functions. To simplify this a bit, add construct_array_builtin(), deconstruct_array_builtin() as wrappers that centralize this hardcoded knowledge. This simplifies many call sites and reduces the amount of hardcoded stuff that is spread around. Reviewed-by: Tom Lane Discussion: https://www.postgresql.org/message-id/flat/2914356f-9e5f-8c59-2995-5997fc48bcba%40enterprisedb.com --- src/backend/commands/policy.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/backend/commands/policy.c') diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c index a59ee3b9477..d9dff9ecaab 100644 --- a/src/backend/commands/policy.c +++ b/src/backend/commands/policy.c @@ -500,8 +500,7 @@ RemoveRoleFromObjectPolicy(Oid roleid, Oid classid, Oid policy_id) memset(isnull, 0, sizeof(isnull)); /* This is the array for the new tuple */ - role_ids = construct_array(role_oids, num_roles, OIDOID, - sizeof(Oid), true, TYPALIGN_INT); + role_ids = construct_array_builtin(role_oids, num_roles, OIDOID); replaces[Anum_pg_policy_polroles - 1] = true; values[Anum_pg_policy_polroles - 1] = PointerGetDatum(role_ids); @@ -617,8 +616,7 @@ CreatePolicy(CreatePolicyStmt *stmt) /* Collect role ids */ role_oids = policy_role_list_to_array(stmt->roles, &nitems); - role_ids = construct_array(role_oids, nitems, OIDOID, - sizeof(Oid), true, TYPALIGN_INT); + role_ids = construct_array_builtin(role_oids, nitems, OIDOID); /* Parse the supplied clause */ qual_pstate = make_parsestate(NULL); @@ -801,8 +799,7 @@ AlterPolicy(AlterPolicyStmt *stmt) if (stmt->roles != NULL) { role_oids = policy_role_list_to_array(stmt->roles, &nitems); - role_ids = construct_array(role_oids, nitems, OIDOID, - sizeof(Oid), true, TYPALIGN_INT); + role_ids = construct_array_builtin(role_oids, nitems, OIDOID); } /* Get id of table. Also handles permissions checks. */ -- cgit v1.2.3