database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-03 20:02:46 +03:00
Code Activity

Simplify null-element handling in extension_config_remove().

Browse Source 
There's no point in asking deconstruct_array() for a null-flags
array when we already checked the array has no nulls, and aren't
going to examine the output anyhow.  Not asking for this output
should make the code marginally faster, and it's also more
robust since if there somehow were nulls, deconstruct_array()
would throw an error.

Daniel Gustafsson

Discussion: https://postgr.es/m/289FFB8B-7AAB-48B5-A497-6E0D41D7BA47@yesql.se
This commit is contained in:
Tom Lane
2018-11-12 11:50:28 -05:00
parent e3f005d974
commit 3de491482b
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/commands/extension.c
View File

@ -2597,14 +2597,13 @@ extension_config_remove(Oid extensionoid, Oid tableoid)
{
/* squeeze out the target element */
Datum *dvalues;
bool *dnulls;
int nelems;
int i;
/* We already checked there are no nulls */
deconstruct_array(a, OIDOID, sizeof(Oid), true, 'i',
&dvalues, &dnulls, &nelems);
&dvalues, NULL, &nelems);
/* We already checked there are no nulls, so ignore dnulls */
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;
/* We already checked there are no nulls */
deconstruct_array(a, TEXTOID, -1, false, 'i',
&dvalues, &dnulls, &nelems);
&dvalues, NULL, &nelems);
/* We already checked there are no nulls, so ignore dnulls */
for (i = arrayIndex; i < arrayLength - 1; i++)
dvalues[i] = dvalues[i + 1];