From d0f2b148dd245717e1c95985dcb9a75bfc98fde2 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Thu, 8 Nov 2018 14:06:27 +0100 Subject: [PATCH] Avoid requesting unused NULLs from extconfig pg_extension.extconfig is defined as pg_catalog.oid[] and doesn't support NULL values. Avoid asking for null values when deconstructing the array to show clear intent in the code and avoid two allocations. --- src/backend/commands/extension.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c index 2d761a5773..f9d5780bbd 100644 --- a/src/backend/commands/extension.c +++ b/src/backend/commands/extension.c @@ -2597,14 +2597,13 @@ extension_config_remove(Oid extensionoid, Oid tableoid) { /* squeeze out the target element */ Datum *dvalues; - bool *dnulls; int nelems; int i; deconstruct_array(a, OIDOID, sizeof(Oid), true, 'i', - &dvalues, &dnulls, &nelems); + &dvalues, NULL, &nelems); - /* We already checked there are no nulls, so ignore dnulls */ + /* We already checked there are no nulls */ for (i = arrayIndex; i < arrayLength - 1; i++) dvalues[i] = dvalues[i + 1]; @@ -2644,14 +2643,13 @@ extension_config_remove(Oid extensionoid, Oid tableoid) { /* squeeze out the target element */ Datum *dvalues; - bool *dnulls; int nelems; int i; deconstruct_array(a, TEXTOID, -1, false, 'i', - &dvalues, &dnulls, &nelems); + &dvalues, NULL, &nelems); - /* We already checked there are no nulls, so ignore dnulls */ + /* We already checked there are no nulls */ for (i = arrayIndex; i < arrayLength - 1; i++) dvalues[i] = dvalues[i + 1]; -- 2.14.1.145.gb3622a4ee