database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-12-19 17:02:53 +03:00
Code Activity

Use palloc_object() and palloc_array() in backend code

Browse Source 
The idea is to encourage more the use of these new routines across the
tree, as these offer stronger type safety guarantees than palloc().
This batch of changes includes most of the trivial changes suggested by
the author for src/backend/.

A total of 334 files are updated here.  Among these files, 48 of them
have their build change slightly; these are caused by line number
changes as the new allocation formulas are simpler, shaving around 100
lines of code in total.

Similar work has been done in 0c3c5c3b06 and 31d3847a37.

Author: David Geier <geidav.pg@gmail.com>
Discussion: https://postgr.es/m/ad0748d4-3080-436e-b0bc-ac8f86a3466a@gmail.com
This commit is contained in:
Michael Paquier
2025-12-10 07:36:46 +09:00
parent c507ba55f5
commit 1b105f9472
333 changed files with 1357 additions and 1464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/backend/partitioning/partbounds.c
View File

@@ -319,7 +319,7 @@ partition_bounds_create(PartitionBoundSpec **boundspecs, int nparts,
* Initialize mapping array with invalid values, this is filled within
* each sub-routine below depending on the bound type.
*/
*mapping = (int *) palloc(sizeof(int) * nparts);
*mapping = palloc_array(int, nparts);
for (i = 0; i < nparts; i++)
(*mapping)[i] = -1;
@@ -353,15 +353,13 @@ create_hash_bounds(PartitionBoundSpec **boundspecs, int nparts,
int greatest_modulus;
Datum *boundDatums;
boundinfo = (PartitionBoundInfoData *)
palloc0(sizeof(PartitionBoundInfoData));
boundinfo = palloc0_object(PartitionBoundInfoData);
boundinfo->strategy = key->strategy;
/* No special hash partitions. */
boundinfo->null_index = -1;
boundinfo->default_index = -1;
hbounds = (PartitionHashBound *)
palloc(nparts * sizeof(PartitionHashBound));
hbounds = palloc_array(PartitionHashBound, nparts);
/* Convert from node to the internal representation */
for (i = 0; i < nparts; i++)
@@ -384,7 +382,7 @@ create_hash_bounds(PartitionBoundSpec **boundspecs, int nparts,
greatest_modulus = hbounds[nparts - 1].modulus;
boundinfo->ndatums = nparts;
boundinfo->datums = (Datum **) palloc0(nparts * sizeof(Datum *));
boundinfo->datums = palloc0_array(Datum *, nparts);
boundinfo->kind = NULL;
boundinfo->interleaved_parts = NULL;
boundinfo->nindexes = greatest_modulus;
@@ -472,8 +470,7 @@ create_list_bounds(PartitionBoundSpec **boundspecs, int nparts,
int null_index = -1;
Datum *boundDatums;
boundinfo = (PartitionBoundInfoData *)
palloc0(sizeof(PartitionBoundInfoData));
boundinfo = palloc0_object(PartitionBoundInfoData);
boundinfo->strategy = key->strategy;
/* Will be set correctly below. */
boundinfo->null_index = -1;
@@ -533,7 +530,7 @@ create_list_bounds(PartitionBoundSpec **boundspecs, int nparts,
qsort_partition_list_value_cmp, key);
boundinfo->ndatums = ndatums;
boundinfo->datums = (Datum **) palloc0(ndatums * sizeof(Datum *));
boundinfo->datums = palloc0_array(Datum *, ndatums);
boundinfo->kind = NULL;
boundinfo->interleaved_parts = NULL;
boundinfo->nindexes = ndatums;
@@ -690,16 +687,14 @@ create_range_bounds(PartitionBoundSpec **boundspecs, int nparts,
Datum *boundDatums;
PartitionRangeDatumKind *boundKinds;
boundinfo = (PartitionBoundInfoData *)
palloc0(sizeof(PartitionBoundInfoData));
boundinfo = palloc0_object(PartitionBoundInfoData);
boundinfo->strategy = key->strategy;
/* There is no special null-accepting range partition. */
boundinfo->null_index = -1;
/* Will be set correctly below. */
boundinfo->default_index = -1;
all_bounds = (PartitionRangeBound **)
palloc0(2 * nparts * sizeof(PartitionRangeBound *));
all_bounds = palloc0_array(PartitionRangeBound *, 2 * nparts);
/* Create a unified list of range bounds across all the partitions. */
ndatums = 0;
@@ -803,10 +798,8 @@ create_range_bounds(PartitionBoundSpec **boundspecs, int nparts,
* bound.
*/
boundinfo->ndatums = ndatums;
boundinfo->datums = (Datum **) palloc0(ndatums * sizeof(Datum *));
boundinfo->kind = (PartitionRangeDatumKind **)
palloc(ndatums *
sizeof(PartitionRangeDatumKind *));
boundinfo->datums = palloc0_array(Datum *, ndatums);
boundinfo->kind = palloc0_array(PartitionRangeDatumKind *, ndatums);
boundinfo->interleaved_parts = NULL;
/*
@@ -814,7 +807,7 @@ create_range_bounds(PartitionBoundSpec **boundspecs, int nparts,
* element of the indexes[] array.
*/
boundinfo->nindexes = ndatums + 1;
boundinfo->indexes = (int *) palloc((ndatums + 1) * sizeof(int));
boundinfo->indexes = palloc_array(int, (ndatums + 1));
/*
* In the loop below, to save from allocating a series of small arrays,
@@ -824,8 +817,7 @@ create_range_bounds(PartitionBoundSpec **boundspecs, int nparts,
*/
partnatts = key->partnatts;
boundDatums = (Datum *) palloc(ndatums * partnatts * sizeof(Datum));
boundKinds = (PartitionRangeDatumKind *) palloc(ndatums * partnatts *
sizeof(PartitionRangeDatumKind));
boundKinds = palloc_array(PartitionRangeDatumKind, ndatums * partnatts);
for (i = 0; i < ndatums; i++)
{
@@ -1008,7 +1000,7 @@ partition_bounds_copy(PartitionBoundInfo src,
int nindexes;
int partnatts;
dest = (PartitionBoundInfo) palloc(sizeof(PartitionBoundInfoData));
dest = (PartitionBoundInfo) palloc_object(PartitionBoundInfoData);
dest->strategy = src->strategy;
ndatums = dest->ndatums = src->ndatums;
@@ -1018,7 +1010,7 @@ partition_bounds_copy(PartitionBoundInfo src,
/* List partitioned tables have only a single partition key. */
Assert(key->strategy != PARTITION_STRATEGY_LIST || partnatts == 1);
dest->datums = (Datum **) palloc(sizeof(Datum *) * ndatums);
dest->datums = palloc_array(Datum *, ndatums);
if (src->kind != NULL && ndatums > 0)
{
@@ -1092,7 +1084,7 @@ partition_bounds_copy(PartitionBoundInfo src,
}
}
dest->indexes = (int *) palloc(sizeof(int) * nindexes);
dest->indexes = palloc_array(int, nindexes);
memcpy(dest->indexes, src->indexes, sizeof(int) * nindexes);
dest->null_index = src->null_index;
@@ -1815,10 +1807,10 @@ init_partition_map(RelOptInfo *rel, PartitionMap *map)
int i;
map->nparts = nparts;
map->merged_indexes = (int *) palloc(sizeof(int) * nparts);
map->merged = (bool *) palloc(sizeof(bool) * nparts);
map->merged_indexes = palloc_array(int, nparts);
map->merged = palloc_array(bool, nparts);
map->did_remapping = false;
map->old_indexes = (int *) palloc(sizeof(int) * nparts);
map->old_indexes = palloc_array(int, nparts);
for (i = 0; i < nparts; i++)
{
map->merged_indexes[i] = map->old_indexes[i] = -1;
@@ -2393,7 +2385,7 @@ fix_merged_indexes(PartitionMap *outer_map, PartitionMap *inner_map,
Assert(nmerged > 0);
new_indexes = (int *) palloc(sizeof(int) * nmerged);
new_indexes = palloc_array(int, nmerged);
for (i = 0; i < nmerged; i++)
new_indexes[i] = -1;
@@ -2453,8 +2445,8 @@ generate_matching_part_pairs(RelOptInfo *outer_rel, RelOptInfo *inner_rel,
Assert(*outer_parts == NIL);
Assert(*inner_parts == NIL);
outer_indexes = (int *) palloc(sizeof(int) * nmerged);
inner_indexes = (int *) palloc(sizeof(int) * nmerged);
outer_indexes = palloc_array(int, nmerged);
inner_indexes = palloc_array(int, nmerged);
for (i = 0; i < nmerged; i++)
outer_indexes[i] = inner_indexes[i] = -1;
@@ -2525,11 +2517,11 @@ build_merged_partition_bounds(char strategy, List *merged_datums,
int pos;
ListCell *lc;
merged_bounds = (PartitionBoundInfo) palloc(sizeof(PartitionBoundInfoData));
merged_bounds = palloc_object(PartitionBoundInfoData);
merged_bounds->strategy = strategy;
merged_bounds->ndatums = ndatums;
merged_bounds->datums = (Datum **) palloc(sizeof(Datum *) * ndatums);
merged_bounds->datums = palloc_array(Datum *, ndatums);
pos = 0;
foreach(lc, merged_datums)
merged_bounds->datums[pos++] = (Datum *) lfirst(lc);
@@ -2537,8 +2529,7 @@ build_merged_partition_bounds(char strategy, List *merged_datums,
if (strategy == PARTITION_STRATEGY_RANGE)
{
Assert(list_length(merged_kinds) == ndatums);
merged_bounds->kind = (PartitionRangeDatumKind **)
palloc(sizeof(PartitionRangeDatumKind *) * ndatums);
merged_bounds->kind = palloc_array(PartitionRangeDatumKind *, ndatums);
pos = 0;
foreach(lc, merged_kinds)
merged_bounds->kind[pos++] = (PartitionRangeDatumKind *) lfirst(lc);
@@ -2559,7 +2550,7 @@ build_merged_partition_bounds(char strategy, List *merged_datums,
Assert(list_length(merged_indexes) == ndatums);
merged_bounds->nindexes = ndatums;
merged_bounds->indexes = (int *) palloc(sizeof(int) * ndatums);
merged_bounds->indexes = palloc_array(int, ndatums);
pos = 0;
foreach(lc, merged_indexes)
merged_bounds->indexes[pos++] = lfirst_int(lc);
@@ -3434,11 +3425,10 @@ make_one_partition_rbound(PartitionKey key, int index, List *datums, bool lower)
Assert(datums != NIL);
bound = (PartitionRangeBound *) palloc0(sizeof(PartitionRangeBound));
bound = palloc0_object(PartitionRangeBound);
bound->index = index;
bound->datums = (Datum *) palloc0(key->partnatts * sizeof(Datum));
bound->kind = (PartitionRangeDatumKind *) palloc0(key->partnatts *
sizeof(PartitionRangeDatumKind));
bound->datums = palloc0_array(Datum, key->partnatts);
bound->kind = palloc0_array(PartitionRangeDatumKind, key->partnatts);
bound->lower = lower;
i = 0;