Fix NaN comparison in circle_same test

danielgustafsson · danielgustafsson · commit 9ebfbd23bcde · 2022-09-12T12:59:06.000+02:00
Commit c4c3400 changed geometric operators to use float4 and float8 functions, and handle NaN's in a better way. The circle sameness test had a typo in the code which resulted in all comparisons with the left circle 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 left and 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.com Backpatch-through: v12
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
@@ -4635,7 +4635,7 @@ circle_same(PG_FUNCTION_ARGS)
 	CIRCLE	   *circle1 = PG_GETARG_CIRCLE_P(0);
 	CIRCLE	   *circle2 = PG_GETARG_CIRCLE_P(1);
 
-	PG_RETURN_BOOL(((isnan(circle1->radius) && isnan(circle1->radius)) ||
+	PG_RETURN_BOOL(((isnan(circle1->radius) && isnan(circle2->radius)) ||
 					FPeq(circle1->radius, circle2->radius)) &&
 				   point_eq_point(&circle1->center, &circle2->center));
 }
diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out
@@ -4056,9 +4056,8 @@ SELECT c1.f1, c2.f1 FROM CIRCLE_TBL c1, CIRCLE_TBL c2 WHERE c1.f1 ~= c2.f1;
  <(100,200),10> | <(100,200),10>
  <(100,1),115>  | <(100,1),115>
  <(3,5),0>      | <(3,5),0>
- <(3,5),NaN>    | <(3,5),0>
  <(3,5),NaN>    | <(3,5),NaN>
-(9 rows)
+(8 rows)
 
 -- Overlap with circle
 SELECT c1.f1, c2.f1 FROM CIRCLE_TBL c1, CIRCLE_TBL c2 WHERE c1.f1 && c2.f1;

Original file line number	Diff line number	Diff line change
`@@ -4635,7 +4635,7 @@ circle_same(PG_FUNCTION_ARGS)`
`4635`	`4635`	`CIRCLE *circle1 = PG_GETARG_CIRCLE_P(0);`
`4636`	`4636`	`CIRCLE *circle2 = PG_GETARG_CIRCLE_P(1);`
`4637`	`4637`
`4638`		`- PG_RETURN_BOOL(((isnan(circle1->radius) && isnan(circle1->radius)) \|\|`
	`4638`	`+ PG_RETURN_BOOL(((isnan(circle1->radius) && isnan(circle2->radius)) \|\|`
`4639`	`4639`	`FPeq(circle1->radius, circle2->radius)) &&`
`4640`	`4640`	`point_eq_point(&circle1->center, &circle2->center));`
`4641`	`4641`	`}`