NotificationsYou must be signed in to change notification settings
Fork5k
Star17.9k

Commit08779dc

committed

Protect GIST logic that assumes penalty values can't be negative.

Apparently sane-looking penalty code might return small negative values,for example because of roundoff error. This will confuse places likegistchoose(). Prevent problems by clamping negative penalty values tozero. (Just to be really sure, I also made it force NaNs to zero.)Back-patch to all supported branches.Alexander Korotkov

1 parentfccef77 commit08779dcCopy full SHA for 08779dc

File tree

2 files changed

+13

-3

lines changed

doc/src/sgml
- gist.sgml
src/backend/access/gist
- gistutil.c

2 files changed

+13

-3

lines changed

`‎doc/src/sgml/gist.sgml`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,8 @@`
`147`	`147`	`Returns a value indicating the <quote>cost</quote> of inserting the new`
`148`	`148`	`entry into a particular branch of the tree. items will be inserted`
`149`	`149`	`down the path of least <function>penalty</function> in the tree.`
	`150`	`+ Values returned by <function>penalty</function> should be non-negative.`
	`151`	`+ If a negative value is returned, it will be treated as zero.`
`150`	`152`	`</para>`
`151`	`153`	`</listitem>`
`152`	`154`	`</varlistentry>`

`‎src/backend/access/gist/gistutil.c`

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@`
`13`	`13`	`*/`
`14`	`14`	`#include"postgres.h"`
`15`	`15`
	`16`	`+#include<math.h>`
	`17`	`+`
`16`	`18`	`#include"access/gist_private.h"`
`17`	`19`	`#include"access/heapam.h"`
`18`	`20`	`#include"access/reloptions.h"`
`@@ -530,16 +532,22 @@ gistpenalty(GISTSTATE *giststate, int attno,`
`530`	`532`	`{`
`531`	`533`	`floatpenalty=0.0;`
`532`	`534`
`533`		`-if (giststate->penaltyFn[attno].fn_strict== FALSE\|\| (isNullOrig== FALSE&&isNullAdd== FALSE))`
	`535`	`+if (giststate->penaltyFn[attno].fn_strict== FALSE\|\|`
	`536`	`+(isNullOrig== FALSE&&isNullAdd== FALSE))`
	`537`	`+{`
`534`	`538`	`FunctionCall3(&giststate->penaltyFn[attno],`
`535`	`539`	`PointerGetDatum(orig),`
`536`	`540`	`PointerGetDatum(add),`
`537`	`541`	`PointerGetDatum(&penalty));`
	`542`	`+/* disallow negative or NaN penalty */`
	`543`	`+if (isnan(penalty)\|\|penalty<0.0)`
	`544`	`+penalty=0.0;`
	`545`	`+}`
`538`	`546`	`elseif (isNullOrig&&isNullAdd)`
`539`	`547`	`penalty=0.0;`
`540`	`548`	`else`
`541`		`-penalty=1e10;/* try to preventto mix null and non-null`
`542`		`- value /`
	`549`	`+penalty=1e10;/* try to preventmixing null and non-null`
	`550`	`+ values /`
`543`	`551`
`544`	`552`	`returnpenalty;`
`545`	`553`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit08779dc

File tree

2 files changed

2 files changed

`‎doc/src/sgml/gist.sgml`

`‎src/backend/access/gist/gistutil.c`

0 commit comments