charliec05 commented on code in PR #17741:
URL: https://github.com/apache/iceberg/pull/17741#discussion_r3994652628
##########
spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/source/StructInternalRow.java:
##########
@@ -251,12 +255,14 @@ private VariantVal getVariantInternal(int ordinal) {
@Override
public GeographyVal getGeography(int ordinal) {
- return isNullAt(ordinal) ? null :
GeographyVal.fromBytes(getBinaryInternal(ordinal));
+ return isNullAt(ordinal) ? null :
STUtils.stGeogFromWKB(getBinaryInternal(ordinal));
}
@Override
public GeometryVal getGeometry(int ordinal) {
- return isNullAt(ordinal) ? null :
GeometryVal.fromBytes(getBinaryInternal(ordinal));
+ return isNullAt(ordinal)
+ ? null
+ : toGeometryVal(type.fields().get(ordinal).type(),
getBinaryInternal(ordinal));
Review Comment:
Addressed in 82a4f8ec5. Generic `get(int, DataType)` now dispatches
`GeometryType` and `GeographyType` to the same conversion helpers used by the
typed getters, after the existing null check. The nested-struct test now
exercises both generic getters; it failed on the previous implementation and
passes with this change.
##########
spark/v4.1/spark/src/main/java/org/apache/iceberg/spark/source/StructInternalRow.java:
##########
@@ -369,6 +387,11 @@ private ArrayData collectionToArrayData(Type elementType,
Collection<?> values)
}
}
+ private static GeometryVal toGeometryVal(Type type, Object value) {
+ GeometryType sparkType = (GeometryType) SparkSchemaUtil.convert(type);
Review Comment:
Addressed in 82a4f8ec5. The geometry SRID is now resolved before `fillArray`
and captured by the element converter, so list elements and map key/value
arrays no longer invoke `SparkSchemaUtil.convert` for every element. Existing
mixed `byte[]`/`ByteBuffer` and SRID-preservation tests pass.
##########
spark/v4.1/spark/src/test/java/org/apache/iceberg/spark/source/TestStructInternalRowGeospatial.java:
##########
@@ -0,0 +1,160 @@
+/*
+ * 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.
+ */
+package org.apache.iceberg.spark.source;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import org.apache.iceberg.data.GenericRecord;
+import org.apache.iceberg.spark.SparkSchemaUtil;
+import org.apache.iceberg.types.Types;
+import org.apache.spark.sql.catalyst.InternalRow;
+import org.apache.spark.sql.catalyst.util.ArrayData;
+import org.apache.spark.sql.catalyst.util.MapData;
+import org.apache.spark.sql.catalyst.util.STUtils;
+import org.apache.spark.sql.types.DataType;
+import org.apache.spark.unsafe.types.GeographyVal;
+import org.apache.spark.unsafe.types.GeometryVal;
+import org.junit.jupiter.api.Test;
+
+public class TestStructInternalRowGeospatial {
+
+ @Test
+ public void convertsGeospatialArrays() {
+ Types.GeometryType geometryType = Types.GeometryType.of("EPSG:3857");
+ Types.GeographyType geographyType = Types.GeographyType.crs84();
+ Types.StructType structType =
+ Types.StructType.of(
+ Types.NestedField.required(1, "geometries",
Types.ListType.ofOptional(2, geometryType)),
+ Types.NestedField.required(
+ 3, "geographies", Types.ListType.ofOptional(4,
geographyType)));
+
+ byte[] point = pointWkb(30.0, 10.0);
+ byte[] lineString = lineStringWkb(30.0, 10.0, 40.0, 20.0);
+ GenericRecord record = GenericRecord.create(structType);
+ record.set(0, Arrays.asList(ByteBuffer.wrap(point), lineString, null));
+ record.set(1, Arrays.asList(lineString, ByteBuffer.wrap(point), null));
+
+ InternalRow row = new StructInternalRow(structType).setStruct(record);
+ DataType sparkGeometryType = SparkSchemaUtil.convert(geometryType);
+ DataType sparkGeographyType = SparkSchemaUtil.convert(geographyType);
+
+ ArrayData geometries = row.getArray(0);
+ assertGeometry((GeometryVal) geometries.get(0, sparkGeometryType), 3857,
point);
+ assertGeometry((GeometryVal) geometries.get(1, sparkGeometryType), 3857,
lineString);
+ assertThat(geometries.isNullAt(2)).isTrue();
+
+ ArrayData geographies = row.getArray(1);
+ assertGeography((GeographyVal) geographies.get(0, sparkGeographyType),
lineString);
+ assertGeography((GeographyVal) geographies.get(1, sparkGeographyType),
point);
+ assertThat(geographies.isNullAt(2)).isTrue();
+ }
+
+ @Test
+ public void convertsGeospatialMapKeysAndValues() {
+ Types.GeometryType geometryType = Types.GeometryType.of("EPSG:3857");
+ Types.GeographyType geographyType = Types.GeographyType.crs84();
+ Types.MapType mapType = Types.MapType.ofOptional(2, 3, geometryType,
geographyType);
+ Types.StructType structType =
+ Types.StructType.of(Types.NestedField.required(1, "locations",
mapType));
+
+ byte[] firstGeometry = pointWkb(30.0, 10.0);
+ byte[] secondGeometry = lineStringWkb(30.0, 10.0, 40.0, 20.0);
+ byte[] geography = pointWkb(-71.0, 42.0);
+ Map<Object, Object> locations = new LinkedHashMap<>();
+ locations.put(ByteBuffer.wrap(firstGeometry), geography);
+ locations.put(secondGeometry, null);
+
+ GenericRecord record = GenericRecord.create(structType);
+ record.set(0, locations);
+
+ MapData map = new
StructInternalRow(structType).setStruct(record).getMap(0);
+ DataType sparkGeometryType = SparkSchemaUtil.convert(geometryType);
+ DataType sparkGeographyType = SparkSchemaUtil.convert(geographyType);
+ assertGeometry((GeometryVal) map.keyArray().get(0, sparkGeometryType),
3857, firstGeometry);
+ assertGeometry((GeometryVal) map.keyArray().get(1, sparkGeometryType),
3857, secondGeometry);
+ assertGeography((GeographyVal) map.valueArray().get(0,
sparkGeographyType), geography);
+ assertThat(map.valueArray().isNullAt(1)).isTrue();
+ }
+
+ @Test
+ public void convertsGeospatialValuesInStructList() {
+ Types.GeometryType geometryType = Types.GeometryType.of("EPSG:3857");
+ Types.GeographyType geographyType = Types.GeographyType.crs84();
+ Types.StructType locationType =
+ Types.StructType.of(
+ Types.NestedField.required(3, "geometry", geometryType),
+ Types.NestedField.required(4, "geography", geographyType));
+ Types.StructType structType =
+ Types.StructType.of(
+ Types.NestedField.required(1, "locations",
Types.ListType.ofOptional(2, locationType)));
+
+ byte[] geometry = lineStringWkb(30.0, 10.0, 40.0, 20.0);
+ byte[] geography = pointWkb(-71.0, 42.0);
+ GenericRecord location = GenericRecord.create(locationType);
+ location.set(0, ByteBuffer.wrap(geometry));
+ location.set(1, geography);
+ GenericRecord record = GenericRecord.create(structType);
+ record.set(0, Arrays.asList(location, null));
+
+ ArrayData locations = new
StructInternalRow(structType).setStruct(record).getArray(0);
+ InternalRow converted = locations.getStruct(0,
locationType.fields().size());
+ assertGeometry(converted.getGeometry(0), 3857, geometry);
+ assertGeography(converted.getGeography(1), geography);
+ assertThat(locations.isNullAt(1)).isTrue();
+ }
Review Comment:
Addressed in 82a4f8ec5. Added generic `get` assertions for both geometry and
geography alongside the typed getters in the nested-struct test, plus
null-field coverage for both access paths. Verified the generic-access
regression fails before the implementation change. All `TestStructInternalRow*`
tests, Spotless, and main/test Checkstyle checks pass locally.
--
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]
