diff options
| author | Michael Paquier | 2025-12-09 22:36:46 +0000 |
|---|---|---|
| committer | Michael Paquier | 2025-12-09 22:36:46 +0000 |
| commit | 1b105f9472bdb9a68f709778afafb494997267bd (patch) | |
| tree | 205727d30b0dd4f3060bc1f49a9efa724ee3ff80 /src/backend/access/spgist/spgscan.c | |
| parent | c507ba55f5bfae900baa94f1c657e1d99da5c6dc (diff) | |
Use palloc_object() and palloc_array() in backend code
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 0c3c5c3b06a3 and 31d3847a37be.
Author: David Geier <geidav.pg@gmail.com>
Discussion: https://postgr.es/m/ad0748d4-3080-436e-b0bc-ac8f86a3466a@gmail.com
Diffstat (limited to 'src/backend/access/spgist/spgscan.c')
| -rw-r--r-- | src/backend/access/spgist/spgscan.c | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/src/backend/access/spgist/spgscan.c b/src/backend/access/spgist/spgscan.c index 25893050c58..946772f3957 100644 --- a/src/backend/access/spgist/spgscan.c +++ b/src/backend/access/spgist/spgscan.c @@ -309,9 +309,9 @@ spgbeginscan(Relation rel, int keysz, int orderbysz) scan = RelationGetIndexScan(rel, keysz, orderbysz); - so = (SpGistScanOpaque) palloc0(sizeof(SpGistScanOpaqueData)); + so = palloc0_object(SpGistScanOpaqueData); if (keysz > 0) - so->keyData = (ScanKey) palloc(sizeof(ScanKeyData) * keysz); + so->keyData = palloc_array(ScanKeyData, keysz); else so->keyData = NULL; initSpGistState(&so->state, scan->indexRelation); @@ -336,16 +336,12 @@ spgbeginscan(Relation rel, int keysz, int orderbysz) if (scan->numberOfOrderBys > 0) { /* This will be filled in spgrescan, but allocate the space here */ - so->orderByTypes = (Oid *) - palloc(sizeof(Oid) * scan->numberOfOrderBys); - so->nonNullOrderByOffsets = (int *) - palloc(sizeof(int) * scan->numberOfOrderBys); + so->orderByTypes = palloc_array(Oid, scan->numberOfOrderBys); + so->nonNullOrderByOffsets = palloc_array(int, scan->numberOfOrderBys); /* These arrays have constant contents, so we can fill them now */ - so->zeroDistances = (double *) - palloc(sizeof(double) * scan->numberOfOrderBys); - so->infDistances = (double *) - palloc(sizeof(double) * scan->numberOfOrderBys); + so->zeroDistances = palloc_array(double, scan->numberOfOrderBys); + so->infDistances = palloc_array(double, scan->numberOfOrderBys); for (i = 0; i < scan->numberOfOrderBys; i++) { @@ -353,10 +349,8 @@ spgbeginscan(Relation rel, int keysz, int orderbysz) so->infDistances[i] = get_float8_infinity(); } - scan->xs_orderbyvals = (Datum *) - palloc0(sizeof(Datum) * scan->numberOfOrderBys); - scan->xs_orderbynulls = (bool *) - palloc(sizeof(bool) * scan->numberOfOrderBys); + scan->xs_orderbyvals = palloc0_array(Datum, scan->numberOfOrderBys); + scan->xs_orderbynulls = palloc_array(bool, scan->numberOfOrderBys); memset(scan->xs_orderbynulls, true, sizeof(bool) * scan->numberOfOrderBys); } @@ -690,7 +684,7 @@ spgInnerTest(SpGistScanOpaque so, SpGistSearchItem *item, { /* force all children to be visited */ out.nNodes = nNodes; - out.nodeNumbers = (int *) palloc(sizeof(int) * nNodes); + out.nodeNumbers = palloc_array(int, nNodes); for (i = 0; i < nNodes; i++) out.nodeNumbers[i] = i; } @@ -703,7 +697,7 @@ spgInnerTest(SpGistScanOpaque so, SpGistSearchItem *item, { /* collect node pointers */ SpGistNodeTuple node; - SpGistNodeTuple *nodes = (SpGistNodeTuple *) palloc(sizeof(SpGistNodeTuple) * nNodes); + SpGistNodeTuple *nodes = palloc_array(SpGistNodeTuple, nNodes); SGITITERATE(innerTuple, i, node) { @@ -972,8 +966,8 @@ storeGettuple(SpGistScanOpaque so, ItemPointer heapPtr, so->distances[so->nPtrs] = NULL; else { - IndexOrderByDistance *distances = - palloc(sizeof(distances[0]) * so->numberOfOrderBys); + IndexOrderByDistance *distances = palloc_array(IndexOrderByDistance, + so->numberOfOrderBys); int i; for (i = 0; i < so->numberOfOrderBys; i++) |