NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitbc67f41

committed

Fix handling Inf and Nan values in GiST pairing heap comparator

Previously plain float comparison was used in GiST pairing heap. Suchcomparison doesn't provide proper ordering for value sets containing Inf and Nanvalues. This commit fixes that by usage of float8_cmp_internal(). Note, thereis remaining problem with NULL distances, which are represented as Inf inpairing heap. It would be fixes in subsequent commit.Backpatch to all supported versions.Reported-by: Andrey BorodinDiscussion:https://postgr.es/m/CAPpHfdsNvNdA0DBS%2BwMpFrgwT6C3-q50sFVGLSiuWnV3FqOJuQ%40mail.gmail.comAuthor: Alexander KorotkovReviewed-by: Heikki LinnakangasBackpatch-through: 9.4

1 parentb6d72dd commitbc67f41Copy full SHA for bc67f41

File tree

2 files changed

+10

-7

lines changed

src
- backend/access/gist
  - gistscan.c
- test/regress/expected
  - create_index.out

2 files changed

+10

-7

lines changed

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

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`#include"access/gist_private.h"`
`18`	`18`	`#include"access/gistscan.h"`
`19`	`19`	`#include"access/relscan.h"`
	`20`	`+#include"utils/float.h"`
`20`	`21`	`#include"utils/lsyscache.h"`
`21`	`22`	`#include"utils/memutils.h"`
`22`	`23`	`#include"utils/rel.h"`
`@@ -36,8 +37,10 @@ pairingheap_GISTSearchItem_cmp(const pairingheap_node *a, const pairingheap_node`
`36`	`37`	`/* Order according to distance comparison */`
`37`	`38`	`for (i=0;i<scan->numberOfOrderBys;i++)`
`38`	`39`	`{`
`39`		`-if (sa->distances[i]!=sb->distances[i])`
`40`		`-return (sa->distances[i]<sb->distances[i]) ?1 :-1;`
	`40`	`+intcmp=-float8_cmp_internal(sa->distances[i],sb->distances[i]);`
	`41`	`+`
	`42`	`+if (cmp!=0)`
	`43`	`+returncmp;`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`/* Heap items go before inner pages, to ensure a depth-first search */`

`‎src/test/regress/expected/create_index.out`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -523,16 +523,16 @@ SELECT * FROM point_tbl ORDER BY f1 <-> '0,1';`
`523`	`523`	`SELECT * FROM point_tbl ORDER BY f1 <-> '0,1';`
`524`	`524`	`f1`
`525`	`525`	`-------------------`
`526`		`- (10,10)`
`527`		`- (NaN,NaN)`
`528`	`526`	`(0,0)`
`529`	`527`	`(1e-300,-1e-300)`
`530`	`528`	`(-3,4)`
`531`	`529`	`(-10,0)`
	`530`	`+ (10,10)`
`532`	`531`	`(-5,-12)`
`533`	`532`	`(5.1,34.5)`
`534`		`-`
`535`	`533`	`(1e+300,Infinity)`
	`534`	`+`
	`535`	`+ (NaN,NaN)`
`536`	`536`	`(10 rows)`
`537`	`537`
`538`	`538`	`EXPLAIN (COSTS OFF)`
`@@ -561,15 +561,15 @@ SELECT * FROM point_tbl WHERE f1 IS NOT NULL ORDER BY f1 <-> '0,1';`
`561`	`561`	`SELECT * FROM point_tbl WHERE f1 IS NOT NULL ORDER BY f1 <-> '0,1';`
`562`	`562`	`f1`
`563`	`563`	`-------------------`
`564`		`- (10,10)`
`565`		`- (NaN,NaN)`
`566`	`564`	`(0,0)`
`567`	`565`	`(1e-300,-1e-300)`
`568`	`566`	`(-3,4)`
`569`	`567`	`(-10,0)`
	`568`	`+ (10,10)`
`570`	`569`	`(-5,-12)`
`571`	`570`	`(5.1,34.5)`
`572`	`571`	`(1e+300,Infinity)`
	`572`	`+ (NaN,NaN)`
`573`	`573`	`(9 rows)`
`574`	`574`
`575`	`575`	`EXPLAIN (COSTS OFF)`

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!

Commitbc67f41

File tree

2 files changed

2 files changed

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

`‎src/test/regress/expected/create_index.out`

0 commit comments