self-hosted/postgis
self-hosted/postgis
1
0
Fork 0
mirror of https://git.osgeo.org/gitea/postgis/postgis synced 2024-10-24 00:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

#3018, GROUP BY geography sometimes returns duplicate rows

Browse source 
git-svn-id: http://svn.osgeo.org/postgis/trunk@13437 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Paul Ramsey 2015-04-23 18:20:00 +00:00
parent ca80d60917
commit c2f586ac7d
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -96,6 +96,7 @@ PostGIS 2.2.0
- #3061, Allow duplicate points in JSON, GML, GML ST_GeomFrom* functions
- #3086, ST_DumpValues() crashes backend on cleanup with invalid
band indexes
- #3018, GROUP BY geography sometimes returns duplicate rows
* Code refactoring *

30
postgis/geography_btree.c
View file

@ -210,7 +210,7 @@ Datum geography_eq(PG_FUNCTION_ARGS)
/* Must be able to build box for each argument (ie, not empty geometry) */
if ( ! gserialized_datum_get_gidx_p(PG_GETARG_DATUM(0), gbox1) ||
! gserialized_datum_get_gidx_p(PG_GETARG_DATUM(1), gbox2) )
! gserialized_datum_get_gidx_p(PG_GETARG_DATUM(1), gbox2) )
{
PG_RETURN_BOOL(FALSE);
}
@ -249,13 +249,33 @@ Datum geography_cmp(PG_FUNCTION_ARGS)
geography_gidx_center(gbox1, &p1);
geography_gidx_center(gbox2, &p2);
if ( p1.x > p2.x && p1.y > p2.y && p1.z > p2.z )
if ( ! FP_EQUALS(p1.x, p2.x) )
{
if (p1.x < p2.x)
{
PG_RETURN_INT32(-1);
}
PG_RETURN_INT32(1);
}
if ( FP_EQUALS(p1.x, p2.x) && FP_EQUALS(p1.y, p2.y) && FP_EQUALS(p1.z, p2.z) )
PG_RETURN_INT32(0);
if ( ! FP_EQUALS(p1.y, p2.y) )
{
if (p1.y < p2.y)
{
PG_RETURN_INT32(-1);
}
PG_RETURN_INT32(1);
}
PG_RETURN_INT32(-1);
if ( ! FP_EQUALS(p1.z, p2.z) )
{
if (p1.z < p2.z)
{
PG_RETURN_INT32(-1);
}
PG_RETURN_INT32(1);
}
PG_RETURN_INT32(0);
}