Skip to content

API: Treat default edge algorithm as equal to an omitted one in GeographyType #16766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
huan233usc wants to merge 1 commit into from
+26 −4
Closed

API: Treat default edge algorithm as equal to an omitted one in GeographyType #16766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions api/src/main/java/org/apache/iceberg/types/Types.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,18 +680,19 @@ public boolean equals(Object o) {
}

GeographyType that = (GeographyType) o;
return Objects.equals(crs, that.crs) && Objects.equals(algorithm, that.algorithm);
// compare the resolved CRS and algorithm so an explicit default is equal to an omitted one
return crs().equals(that.crs()) && algorithm() == that.algorithm();
}

@Override
public int hashCode() {
return Objects.hash(GeographyType.class, crs, algorithm);
return Objects.hash(GeographyType.class, crs(), algorithm());
}

@Override
public String toString() {
if (algorithm != null) {
return String.format("geography(%s, %s)", crs != null ? crs : DEFAULT_CRS, algorithm);
if (algorithm() != DEFAULT_ALGORITHM) {
return String.format("geography(%s, %s)", crs(), algorithm());
} else if (crs != null) {
return String.format("geography(%s)", crs);
} else {
Expand Down
21 changes: 21 additions & 0 deletions api/src/test/java/org/apache/iceberg/types/TestTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,27 @@ public void testGeospatialTypeToString() {
.isEqualTo("geography(srid:4326, karney)");
assertThat(Types.GeographyType.of(null, EdgeAlgorithm.KARNEY).toString())
.isEqualTo("geography(OGC:CRS84, karney)");
assertThat(Types.GeographyType.of("OGC:CRS84", EdgeAlgorithm.SPHERICAL).toString())
.isEqualTo("geography");
assertThat(Types.GeographyType.of("srid:4326", EdgeAlgorithm.SPHERICAL).toString())
.isEqualTo("geography(srid:4326)");
}

@Test
public void testGeospatialTypeDefaultNormalization() {
// the default CRS and edge algorithm normalize so that equivalent type specs are equal
assertThat(Types.GeometryType.of("OGC:CRS84")).isEqualTo(Types.GeometryType.crs84());
assertThat(Types.GeographyType.of("OGC:CRS84")).isEqualTo(Types.GeographyType.crs84());
assertThat(Types.GeographyType.of("OGC:CRS84", EdgeAlgorithm.SPHERICAL))
.isEqualTo(Types.GeographyType.crs84())
.hasSameHashCodeAs(Types.GeographyType.crs84());
assertThat(Types.GeographyType.of("srid:4326", EdgeAlgorithm.SPHERICAL))
.isEqualTo(Types.GeographyType.of("srid:4326"))
.hasSameHashCodeAs(Types.GeographyType.of("srid:4326"));
assertThat(Types.GeographyType.of("srid:4326", EdgeAlgorithm.SPHERICAL).algorithm())
.isEqualTo(EdgeAlgorithm.SPHERICAL);
assertThat(Types.GeographyType.of("srid:4326", EdgeAlgorithm.KARNEY))
.isNotEqualTo(Types.GeographyType.of("srid:4326"));
}

@Test
Expand Down
Loading