Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit13b8a1c

Browse files
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 parentbe0b052 commit13b8a1c

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4763,7 +4763,7 @@ circle_same(PG_FUNCTION_ARGS)
47634763
CIRCLE*circle1=PG_GETARG_CIRCLE_P(0);
47644764
CIRCLE*circle2=PG_GETARG_CIRCLE_P(1);
47654765

4766-
PG_RETURN_BOOL(((isnan(circle1->radius)&&isnan(circle1->radius))||
4766+
PG_RETURN_BOOL(((isnan(circle1->radius)&&isnan(circle2->radius))||
47674767
FPeq(circle1->radius,circle2->radius))&&
47684768
point_eq_point(&circle1->center,&circle2->center));
47694769
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4342,9 +4342,8 @@ SELECT c1.f1, c2.f1 FROM CIRCLE_TBL c1, CIRCLE_TBL c2 WHERE c1.f1 ~= c2.f1;
43424342
<(100,200),10> | <(100,200),10>
43434343
<(100,1),115> | <(100,1),115>
43444344
<(3,5),0> | <(3,5),0>
4345-
<(3,5),NaN> | <(3,5),0>
43464345
<(3,5),NaN> | <(3,5),NaN>
4347-
(9 rows)
4346+
(8 rows)
43484347

43494348
-- Overlap with circle
43504349
SELECT c1.f1, c2.f1 FROM CIRCLE_TBL c1, CIRCLE_TBL c2 WHERE c1.f1 && c2.f1;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp