From 433eb17cbcca7e2200a1416109097d91158f4b31 Mon Sep 17 00:00:00 2001 From: Nitin Date: Tue, 18 May 2021 22:37:08 +0530 Subject: [PATCH 2/5] allocate-the-PartitionListValue-as-a-single-chunk --- src/backend/partitioning/partbounds.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c index e0a04fe..f91efba 100644 --- a/src/backend/partitioning/partbounds.c +++ b/src/backend/partitioning/partbounds.c @@ -467,7 +467,7 @@ create_list_bounds(PartitionBoundSpec **boundspecs, int nparts, PartitionKey key, int **mapping) { PartitionBoundInfo boundinfo; - PartitionListValue **all_values = NULL; + PartitionListValue *all_values; int i = 0; int j = 0; int ndatums = 0; @@ -483,8 +483,8 @@ create_list_bounds(PartitionBoundSpec **boundspecs, int nparts, boundinfo->default_index = -1; ndatums = get_non_null_list_bounds_count(boundspecs, nparts); - all_values = (PartitionListValue **) - palloc(ndatums * sizeof(PartitionListValue *)); + all_values = (PartitionListValue *) + palloc(ndatums * sizeof(PartitionListValue)); /* Create a unified list of non-null values across all partitions. */ for (i = 0; i < nparts; i++) @@ -512,10 +512,8 @@ create_list_bounds(PartitionBoundSpec **boundspecs, int nparts, if (!val->constisnull) { - all_values[j] = (PartitionListValue *) - palloc0(sizeof(PartitionListValue)); - all_values[j]->index = i; - all_values[j]->value = val->constvalue; + all_values[j].index = i; + all_values[j].value = val->constvalue; j++; } else @@ -531,7 +529,7 @@ create_list_bounds(PartitionBoundSpec **boundspecs, int nparts, } } - qsort_arg(all_values, ndatums, sizeof(PartitionListValue *), + qsort_arg(all_values, ndatums, sizeof(PartitionListValue), qsort_partition_list_value_cmp, (void *) key); boundinfo->ndatums = ndatums; @@ -547,10 +545,10 @@ create_list_bounds(PartitionBoundSpec **boundspecs, int nparts, */ for (i = 0; i < ndatums; i++) { - int orig_index = all_values[i]->index; + int orig_index = all_values[i].index; boundinfo->datums[i] = (Datum *) palloc(sizeof(Datum)); - boundinfo->datums[i][0] = datumCopy(all_values[i]->value, + boundinfo->datums[i][0] = datumCopy(all_values[i].value, key->parttypbyval[0], key->parttyplen[0]); @@ -3693,8 +3691,8 @@ qsort_partition_hbound_cmp(const void *a, const void *b) static int32 qsort_partition_list_value_cmp(const void *a, const void *b, void *arg) { - Datum val1 = (*(PartitionListValue *const *) a)->value, - val2 = (*(PartitionListValue *const *) b)->value; + Datum val1 = ((PartitionListValue *const) a)->value, + val2 = ((PartitionListValue *const) b)->value; PartitionKey key = (PartitionKey) arg; return DatumGetInt32(FunctionCall2Coll(&key->partsupfunc[0], -- 1.8.3.1