diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2025-01-31 13:52:40 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2025-01-31 13:52:40 -0500 |
| commit | 041e8b95b8cd251bfec6a3c9c3dd6614de6a4c9b (patch) | |
| tree | 58c23012141617cec375499045af409ae0c24afd /src/backend/access/gin | |
| parent | f8d8581ed882b79b512daaa7f71ca19c8eafcaef (diff) | |
| download | postgresql-041e8b95b8cd251bfec6a3c9c3dd6614de6a4c9b.tar.gz postgresql-041e8b95b8cd251bfec6a3c9c3dd6614de6a4c9b.zip | |
Get rid of our dependency on type "long" for memory size calculations.
Consistently use "Size" (or size_t, or in some places int64 or double)
as the type for variables holding memory allocation sizes. In most
places variables' data types were fine already, but we had an ancient
habit of computing bytes from kilobytes-units GUCs with code like
"work_mem * 1024L". That risks overflow on Win64 where they did not
make "long" as wide as "size_t". We worked around that by restricting
such GUCs' ranges, so you couldn't set work_mem et al higher than 2GB
on Win64. This patch removes that restriction, after replacing such
calculations with "work_mem * (Size) 1024" or variants of that.
It should be noted that this patch was constructed by searching
outwards from the GUCs that have MAX_KILOBYTES as upper limit.
So I can't positively guarantee there are no other places doing
memory-size arithmetic in int or long variables. I do however feel
pretty confident that increasing MAX_KILOBYTES on Win64 is safe now.
Also, nothing in our code should be dealing in multiple-gigabyte
allocations without authorization from a relevant GUC, so it seems
pretty likely that this search caught everything that could be at
risk of overflow.
Author: Vladlen Popolitov <v.popolitov@postgrespro.ru>
Co-authored-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://postgr.es/m/1a01f0-66ec2d80-3b-68487680@27595217
Diffstat (limited to 'src/backend/access/gin')
| -rw-r--r-- | src/backend/access/gin/ginfast.c | 8 | ||||
| -rw-r--r-- | src/backend/access/gin/ginget.c | 2 | ||||
| -rw-r--r-- | src/backend/access/gin/gininsert.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c index 97b96848003..4ab815fefe0 100644 --- a/src/backend/access/gin/ginfast.c +++ b/src/backend/access/gin/ginfast.c @@ -39,7 +39,7 @@ int gin_pending_list_limit = 0; #define GIN_PAGE_FREESIZE \ - ( BLCKSZ - MAXALIGN(SizeOfPageHeaderData) - MAXALIGN(sizeof(GinPageOpaqueData)) ) + ( (Size) BLCKSZ - MAXALIGN(SizeOfPageHeaderData) - MAXALIGN(sizeof(GinPageOpaqueData)) ) typedef struct KeyArray { @@ -456,7 +456,7 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector) * ginInsertCleanup() should not be called inside our CRIT_SECTION. */ cleanupSize = GinGetPendingListCleanupSize(index); - if (metadata->nPendingPages * GIN_PAGE_FREESIZE > cleanupSize * 1024L) + if (metadata->nPendingPages * GIN_PAGE_FREESIZE > cleanupSize * (Size) 1024) needCleanup = true; UnlockReleaseBuffer(metabuffer); @@ -795,7 +795,7 @@ ginInsertCleanup(GinState *ginstate, bool full_clean, blknoFinish; bool cleanupFinish = false; bool fsm_vac = false; - Size workMemory; + int workMemory; /* * We would like to prevent concurrent cleanup process. For that we will @@ -901,7 +901,7 @@ ginInsertCleanup(GinState *ginstate, bool full_clean, */ if (GinPageGetOpaque(page)->rightlink == InvalidBlockNumber || (GinPageHasFullRow(page) && - (accum.allocatedMemory >= workMemory * 1024L))) + accum.allocatedMemory >= workMemory * (Size) 1024)) { ItemPointerData *list; uint32 nlist; diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c index 330805626ee..63dd1f3679f 100644 --- a/src/backend/access/gin/ginget.c +++ b/src/backend/access/gin/ginget.c @@ -125,7 +125,7 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack, CompactAttribute *attr; /* Initialize empty bitmap result */ - scanEntry->matchBitmap = tbm_create(work_mem * 1024L, NULL); + scanEntry->matchBitmap = tbm_create(work_mem * (Size) 1024, NULL); /* Null query cannot partial-match anything */ if (scanEntry->isPartialMatch && diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c index 8e1788dbcf7..d1b5e8f0dd1 100644 --- a/src/backend/access/gin/gininsert.c +++ b/src/backend/access/gin/gininsert.c @@ -288,7 +288,7 @@ ginBuildCallback(Relation index, ItemPointer tid, Datum *values, values[i], isnull[i], tid); /* If we've maxed out our available memory, dump everything to the index */ - if (buildstate->accum.allocatedMemory >= (Size) maintenance_work_mem * 1024L) + if (buildstate->accum.allocatedMemory >= maintenance_work_mem * (Size) 1024) { ItemPointerData *list; Datum key; |