>From Ali Alsuliman <[email protected]>: Ali Alsuliman has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21978?usp=email )
( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: [NO ISSUE][EXT] Match Iceberg type errors on the column name ...................................................................... [NO ISSUE][EXT] Match Iceberg type errors on the column name - user model changes: no - storage format changes: no - interface changes: no Details: Iceberg 1.12 renders GeometryType with its CRS, as 'geometry(OGC:CRS84)' rather than 'geometry', so the two geospatial rejection tests that matched on the type name fail on master. Assert on the column name, which is ours, and leave the type's rendering to Iceberg; the error code is still checked. Generated-by: Claude Opus 5.5 <[email protected]> Change-Id: I96edec68f68bc1c417eefdf0a9ba8d4c1aeac8f5 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21978 Tested-by: Ali Alsuliman <[email protected]> Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> --- M asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/input/record/reader/iceberg/IcebergVariantSupportTest.java M asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/IcebergParquetDataParserVariantTest.java 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Ali Alsuliman: Verified Murtadha Hubail: Looks good to me, approved Michael Blow: Looks good to me, approved Objections: Anon. E. Moose #1000171: Violations found diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/input/record/reader/iceberg/IcebergVariantSupportTest.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/input/record/reader/iceberg/IcebergVariantSupportTest.java index 62a7de2..d054108 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/input/record/reader/iceberg/IcebergVariantSupportTest.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/input/record/reader/iceberg/IcebergVariantSupportTest.java @@ -82,7 +82,7 @@ Schema geo = new Schema(required(1, "id", Types.IntegerType.get()), optional(2, "shape", Types.GeometryType.crs84()), optional(3, "st", Types.StructType.of(optional(4, "area", Types.GeographyType.crs84())))); - Map<String, String> columns = Map.of("shape", "geometry' for column 'shape", "st", "for column 'st.area'"); + Map<String, String> columns = Map.of("shape", "for column 'shape'", "st", "for column 'st.area'"); for (boolean variantEnabled : new boolean[] { true, false }) { columns.forEach((selected, expected) -> { try { diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/IcebergParquetDataParserVariantTest.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/IcebergParquetDataParserVariantTest.java index 6729c01..c622d49 100644 --- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/IcebergParquetDataParserVariantTest.java +++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/IcebergParquetDataParserVariantTest.java @@ -87,7 +87,7 @@ Assert.fail("expected GEOMETRY to be rejected"); } catch (HyracksDataException e) { Assert.assertEquals(ErrorCode.UNSUPPORTED_ICEBERG_TYPE.intValue(), e.getErrorCode()); - Assert.assertTrue(e.getMessage(), e.getMessage().contains("geometry' for column 'shape'")); + Assert.assertTrue(e.getMessage(), e.getMessage().contains("for column 'shape'")); } } -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/21978?usp=email To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I96edec68f68bc1c417eefdf0a9ba8d4c1aeac8f5 Gerrit-Change-Number: 21978 Gerrit-PatchSet: 3 Gerrit-Owner: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Ali Alsuliman <[email protected]> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Murtadha Hubail <[email protected]>
