Commit5542479

Artur Zakirov

committed

Dont use Min for RumMaxItemSize

1 parent7a2c298 commit5542479Copy full SHA for 5542479

File tree

-9

lines changed

-9

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -390,14 +390,13 @@ RumFastFormTuple(RumState * rumstate,`
`390`	`390`
`391`	`391`	`newsize=MAXALIGN(newsize);`
`392`	`392`
`393`		`-if (newsize>Min(INDEX_SIZE_MASK,RumMaxItemSize))`
	`393`	`+if (newsize>RumMaxItemSize)`
`394`	`394`	`{`
`395`	`395`	`ereport(ERROR,`
`396`	`396`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`397`	`397`	`errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",`
`398`	`398`	`(unsigned long)newsize,`
`399`		`- (unsigned long)Min(INDEX_SIZE_MASK,`
`400`		`-RumMaxItemSize),`
	`399`	`+ (unsigned long)RumMaxItemSize,`
`401`	`400`	`RelationGetRelationName(rumstate->index))));`
`402`	`401`	`pfree(itup);`
`403`	`402`	`returnNULL;`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -175,15 +175,14 @@ RumFormTuple(RumState * rumstate,`
`175`	`175`	`}`
`176`	`176`	`newsize=MAXALIGN(newsize);`
`177`	`177`
`178`		`-if (newsize>Min(INDEX_SIZE_MASK,RumMaxItemSize))`
	`178`	`+if (newsize>RumMaxItemSize)`
`179`	`179`	`{`
`180`	`180`	`if (errorTooBig)`
`181`	`181`	`ereport(ERROR,`
`182`	`182`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`183`	`183`	`errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",`
`184`	`184`	`(unsigned long)newsize,`
`185`		`- (unsigned long)Min(INDEX_SIZE_MASK,`
`186`		`-RumMaxItemSize),`
	`185`	`+ (unsigned long)RumMaxItemSize,`
`187`	`186`	`RelationGetRelationName(rumstate->index))));`
`188`	`187`	`pfree(itup);`
`189`	`188`	`returnNULL;`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -161,15 +161,14 @@ RumFormTuple(RumState * rumstate,`
`161`	`161`	`}`
`162`	`162`	`newsize=MAXALIGN(newsize);`
`163`	`163`
`164`		`-if (newsize>Min(INDEX_SIZE_MASK,RumMaxItemSize))`
	`164`	`+if (newsize>RumMaxItemSize)`
`165`	`165`	`{`
`166`	`166`	`if (errorTooBig)`
`167`	`167`	`ereport(ERROR,`
`168`	`168`	`(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),`
`169`	`169`	`errmsg("index row size %lu exceeds maximum %lu for index \"%s\"",`
`170`	`170`	`(unsigned long)newsize,`
`171`		`- (unsigned long)Min(INDEX_SIZE_MASK,`
`172`		`-RumMaxItemSize),`
	`171`	`+ (unsigned long)RumMaxItemSize,`
`173`	`172`	`RelationGetRelationName(rumstate->index))));`
`174`	`173`	`pfree(itup);`
`175`	`174`	`returnNULL;`

Comments

(0)