Skip to content

Commit 5542479

Browse files
author
Artur Zakirov
committed
Dont use Min for RumMaxItemSize
1 parent 7a2c298 commit 5542479

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

src/rumfast.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -390,14 +390,13 @@ RumFastFormTuple(RumState * rumstate,
390390

391391
newsize = MAXALIGN(newsize);
392392

393-
if (newsize > Min(INDEX_SIZE_MASK, RumMaxItemSize))
393+
if (newsize > RumMaxItemSize)
394394
{
395395
ereport(ERROR,
396396
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
397397
errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",
398398
(unsigned long) newsize,
399-
(unsigned long) Min(INDEX_SIZE_MASK,
400-
RumMaxItemSize),
399+
(unsigned long) RumMaxItemSize,
401400
RelationGetRelationName(rumstate->index))));
402401
pfree(itup);
403402
return NULL;

src/ruminsert.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -175,15 +175,14 @@ RumFormTuple(RumState * rumstate,
175175
}
176176
newsize = MAXALIGN(newsize);
177177

178-
if (newsize > Min(INDEX_SIZE_MASK, RumMaxItemSize))
178+
if (newsize > RumMaxItemSize)
179179
{
180180
if (errorTooBig)
181181
ereport(ERROR,
182182
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
183183
errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",
184184
(unsigned long) newsize,
185-
(unsigned long) Min(INDEX_SIZE_MASK,
186-
RumMaxItemSize),
185+
(unsigned long) RumMaxItemSize,
187186
RelationGetRelationName(rumstate->index))));
188187
pfree(itup);
189188
return NULL;

src/rumvacuum.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,14 @@ RumFormTuple(RumState * rumstate,
161161
}
162162
newsize = MAXALIGN(newsize);
163163

164-
if (newsize > Min(INDEX_SIZE_MASK, RumMaxItemSize))
164+
if (newsize > RumMaxItemSize)
165165
{
166166
if (errorTooBig)
167167
ereport(ERROR,
168168
(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
169169
errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",
170170
(unsigned long) newsize,
171-
(unsigned long) Min(INDEX_SIZE_MASK,
172-
RumMaxItemSize),
171+
(unsigned long) RumMaxItemSize,
173172
RelationGetRelationName(rumstate->index))));
174173
pfree(itup);
175174
return NULL;

0 commit comments

Comments
 (0)