Commit9aad205

danielgustafsson

authored and

pull[bot]

committed

Fix NaN comparison in circle_same test

Commitc4c3400 changed geometric operators to use float4 and float8functions, and handle NaN's in a better way. The circle sameness testhad a typo in the code which resulted in all comparisons with the leftcircle having a NaN radius considered same. postgres=# select '<(0,0),NaN>'::circle ~= '<(0,0),1>'::circle; ?column? ---------- t (1 row)This fixes the sameness test to consider the radius of both the leftand right circle.Backpatch to v12 where this was introduced.Author: Ranier Vilela <ranier.vf@gmail.com>Discussion:https://postgr.es/m/CAEudQAo8dK=yctg2ZzjJuzV4zgOPBxRU5+Kb+yatFiddtQk6Rw@mail.gmail.comBackpatch-through: v12

1 parent3eb99b9 commit9aad205Copy full SHA for 9aad205

File tree

2 files changed

-3

lines changed

src
- backend/utils/adt
  - geo_ops.c
- test/regress/expected
  - geometry.out

2 files changed

-3

lines changed

`‎src/backend/utils/adt/geo_ops.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4710,7 +4710,7 @@ circle_same(PG_FUNCTION_ARGS)`
`4710`	`4710`	`CIRCLE*circle1=PG_GETARG_CIRCLE_P(0);`
`4711`	`4711`	`CIRCLE*circle2=PG_GETARG_CIRCLE_P(1);`
`4712`	`4712`
`4713`		`-PG_RETURN_BOOL(((isnan(circle1->radius)&&isnan(circle1->radius))\|\|`
	`4713`	`+PG_RETURN_BOOL(((isnan(circle1->radius)&&isnan(circle2->radius))\|\|`
`4714`	`4714`	`FPeq(circle1->radius,circle2->radius))&&`
`4715`	`4715`	`point_eq_point(&circle1->center,&circle2->center));`
`4716`	`4716`	`}`

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

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4380,9 +4380,8 @@ SELECT c1.f1, c2.f1 FROM CIRCLE_TBL c1, CIRCLE_TBL c2 WHERE c1.f1 ~= c2.f1;`
`4380`	`4380`	`<(100,200),10> \| <(100,200),10>`
`4381`	`4381`	`<(100,1),115> \| <(100,1),115>`
`4382`	`4382`	`<(3,5),0> \| <(3,5),0>`
`4383`		`- <(3,5),NaN> \| <(3,5),0>`
`4384`	`4383`	`<(3,5),NaN> \| <(3,5),NaN>`
`4385`		`-(9 rows)`
	`4384`	`+(8 rows)`
`4386`	`4385`
`4387`	`4386`	`-- Overlap with circle`
`4388`	`4387`	`SELECT c1.f1, c2.f1 FROM CIRCLE_TBL c1, CIRCLE_TBL c2 WHERE c1.f1 && c2.f1;`

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!

Commit9aad205

File tree

2 files changed

2 files changed

`‎src/backend/utils/adt/geo_ops.c`

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

0 commit comments