uros-db commented on code in PR #52627: URL: https://github.com/apache/spark/pull/52627#discussion_r2444853690
########## python/pyspark/sql/tests/test_geographytype.py: ########## @@ -0,0 +1,96 @@ +# -*- encoding: utf-8 -*- +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +from pyspark.sql.types import GeographyType +from pyspark.sql.utils import IllegalArgumentException +from pyspark.testing.sqlutils import ReusedSQLTestCase + + +class GeographyTypeTestMixin: + # Test cases for GeographyType construction based on SRID. + + def test_geographytype_specified_valid_srid(self): + """Test that GeographyType is constructed correctly when a valid SRID is specified.""" + + supported_srid = {4326: "OGC:CRS84"} + + for srid, crs in supported_srid.items(): + geography_type = GeographyType(srid) + self.assertEqual(geography_type.srid, srid) + self.assertEqual(geography_type.typeName(), "geography") + self.assertEqual(geography_type.simpleString(), f"geography({srid})") + self.assertEqual(geography_type.jsonValue(), f"geography({crs}, SPHERICAL)") + self.assertEqual(repr(geography_type), f"GeographyType({srid})") + + def test_geographytype_specified_invalid_srid(self): + """Test that the correct error is returned when an invalid SRID value is specified.""" + + for srid in [-4612, -4326, -2, -1, 1, 2]: + with self.assertRaises(IllegalArgumentException) as error_context: + GeographyType(srid) + srid_header = "[ST_INVALID_SRID_VALUE] Invalid or unsupported SRID" + self.assertEqual( + str(error_context.exception), + f"{srid_header} (spatial reference identifier) value: {srid}.", + ) + + # Special string value "ANY" in place of SRID is used to denote a mixed GEOGRAPHY type. + + def test_geographytype_any_specifier(self): + """Test that GeographyType is constructed correctly with ANY specifier for mixed SRID.""" + + geography_type = GeographyType("ANY") + self.assertEqual(geography_type.srid, GeographyType.MIXED_SRID) + self.assertEqual(geography_type.typeName(), "geography") + self.assertEqual(geography_type.simpleString(), "geography(any)") + self.assertEqual(repr(geography_type), "GeographyType(ANY)") + + # The tests below verify GEOGRAPHY type object equality based on SRID values. + + def test_geographytype_same_srid_values(self): + """Test that two GeographyTypes with specified SRIDs have the same SRID values.""" + + for srid in [4326]: + geography_type_1 = GeographyType(srid) + geography_type_2 = GeographyType(srid) + self.assertEqual(geography_type_1.srid, geography_type_2.srid) + + def test_geographytype_different_srid_values(self): + """Test that two GeographyTypes with specified SRIDs have different SRID values.""" + + for srid in [4326]: + geography_type_1 = GeographyType(srid) + geography_type_2 = GeographyType("ANY") + self.assertNotEqual(geography_type_1.srid, geography_type_2.srid) + + +class GeographyTypeTest(GeographyTypeTestMixin, ReusedSQLTestCase): + pass + + +if __name__ == "__main__": + import unittest + from pyspark.sql.tests.test_types import * # noqa: F401 Review Comment: Updated. ########## python/pyspark/sql/tests/test_geometrytype.py: ########## @@ -0,0 +1,96 @@ +# -*- encoding: utf-8 -*- +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +from pyspark.sql.types import GeometryType +from pyspark.sql.utils import IllegalArgumentException +from pyspark.testing.sqlutils import ReusedSQLTestCase + + +class GeometryTypeTestMixin: + # Test cases for GeometryType construction based on SRID. + + def test_geometrytype_specified_valid_srid(self): + """Test that GeometryType is constructed correctly when a valid SRID is specified.""" + + supported_srid = {4326: "OGC:CRS84"} + + for srid, crs in supported_srid.items(): + geometry_type = GeometryType(srid) + self.assertEqual(geometry_type.srid, srid) + self.assertEqual(geometry_type.typeName(), "geometry") + self.assertEqual(geometry_type.simpleString(), f"geometry({srid})") + self.assertEqual(geometry_type.jsonValue(), f"geometry({crs})") + self.assertEqual(repr(geometry_type), f"GeometryType({srid})") + + def test_geometrytype_specified_invalid_srid(self): + """Test that the correct error is returned when an invalid SRID value is specified.""" + + for srid in [-4612, -4326, -2, -1, 1, 2]: + with self.assertRaises(IllegalArgumentException) as error_context: + GeometryType(srid) + srid_header = "[ST_INVALID_SRID_VALUE] Invalid or unsupported SRID" + self.assertEqual( + str(error_context.exception), + f"{srid_header} (spatial reference identifier) value: {srid}.", + ) + + # Special string value "ANY" in place of SRID is used to denote a mixed GEOMETRY type. + + def test_geometrytype_any_specifier(self): + """Test that GeometryType is constructed correctly with ANY specifier for mixed SRID.""" + + geometry_type = GeometryType("ANY") + self.assertEqual(geometry_type.srid, GeometryType.MIXED_SRID) + self.assertEqual(geometry_type.typeName(), "geometry") + self.assertEqual(geometry_type.simpleString(), "geometry(any)") + self.assertEqual(repr(geometry_type), "GeometryType(ANY)") + + # The tests below verify GEOMETRY type object equality based on SRID values. + + def test_geometrytype_same_srid_values(self): + """Test that two GeometryTypes with specified SRIDs have the same SRID values.""" + + for srid in [4326]: + geometry_type_1 = GeometryType(srid) + geometry_type_2 = GeometryType(srid) + self.assertEqual(geometry_type_1.srid, geometry_type_2.srid) + + def test_geometrytype_different_srid_values(self): + """Test that two GeometryTypes with specified SRIDs have different SRID values.""" + + for srid in [4326]: + geometry_type_1 = GeometryType(srid) + geometry_type_2 = GeometryType("ANY") + self.assertNotEqual(geometry_type_1.srid, geometry_type_2.srid) + + +class GeometryTypeTest(GeometryTypeTestMixin, ReusedSQLTestCase): + pass + + +if __name__ == "__main__": + import unittest + from pyspark.sql.tests.test_types import * # noqa: F401 Review Comment: Updated. ########## python/pyspark/sql/types.py: ########## @@ -518,6 +519,180 @@ class FloatType(FractionalType, metaclass=DataTypeSingleton): pass +class SpatialType(AtomicType): + """Super class of all spatial data types: GeographyType and GeometryType.""" + + # Mixed SRID value and the corresponding CRS for geospatial types (Geometry and Geography). + # These values represent a geospatial type that can hold different SRID values per row. + MIXED_SRID = -1 + MIXED_CRS = "SRID:ANY" + + +class GeographyType(SpatialType): Review Comment: Updated. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
