This is an automated email from the ASF dual-hosted git repository.
yuqi1129 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/main by this push:
new 03a3181b61 [#13240] fix(common): add @EqualsAndHashCode to
Hour/Month/Year partitioning DTOs (#13241)
03a3181b61 is described below
commit 03a3181b61b8a651b4b9c0f761d921e6db4ea76a
Author: YangJie <[email protected]>
AuthorDate: Fri Sep 18 22:41:38 2026 -0400
[#13240] fix(common): add @EqualsAndHashCode to Hour/Month/Year
partitioning DTOs (#13241)
### What changes were proposed in this pull request?
`HourPartitioningDTO`, `MonthPartitioningDTO`, and `YearPartitioningDTO`
now carry `@EqualsAndHashCode(callSuper = true)`, aligning them with the
Day and Identity partitioning DTOs.
### Why are the changes needed?
Without it, the three DTOs inherited `SingleFieldPartitioning`'s Lombok
`equals`, so different strategies over the same field compared equal
(`hour(ts).equals(month(ts))` was `true`) and Set-based dedup silently
merged distinct strategies.
Fix: #13240
### Does this PR introduce _any_ user-facing change?
Yes. This changes DTO `equals`/`hashCode` semantics: Hour/Month/Year
partitioning DTOs of different strategies over the same field are no
longer equal. It fixes silent `Set` deduplication of distinct
partitioning strategies.
### How was this patch tested?
Added `TestPartitioningDTOEquality`, which pins that Hour/Month/Year
partitioning DTOs of different strategies over the same field are not
equal and are not collapsed by a `Set`; it fails on the pre-fix tree and
passes after the fix.
---
.../dto/rel/partitioning/HourPartitioningDTO.java | 2 +
.../dto/rel/partitioning/MonthPartitioningDTO.java | 2 +
.../dto/rel/partitioning/YearPartitioningDTO.java | 2 +
.../partitioning/TestPartitioningDTOEquality.java | 60 ++++++++++++++++++++++
4 files changed, 66 insertions(+)
diff --git
a/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/HourPartitioningDTO.java
b/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/HourPartitioningDTO.java
index 6435af4d07..85dc372a6c 100644
---
a/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/HourPartitioningDTO.java
+++
b/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/HourPartitioningDTO.java
@@ -19,9 +19,11 @@
package org.apache.gravitino.dto.rel.partitioning;
import com.google.common.base.Preconditions;
+import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.ArrayUtils;
/** Represents the hour partitioning. */
+@EqualsAndHashCode(callSuper = true)
public final class HourPartitioningDTO extends
Partitioning.SingleFieldPartitioning {
/**
diff --git
a/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/MonthPartitioningDTO.java
b/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/MonthPartitioningDTO.java
index 333714b2f0..2e4dc70eb4 100644
---
a/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/MonthPartitioningDTO.java
+++
b/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/MonthPartitioningDTO.java
@@ -19,12 +19,14 @@
package org.apache.gravitino.dto.rel.partitioning;
import com.google.common.base.Preconditions;
+import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.ArrayUtils;
/**
* Represents a MonthPartitioning Data Transfer Object (DTO) that extends the
Partitioning
* interface.
*/
+@EqualsAndHashCode(callSuper = true)
public final class MonthPartitioningDTO extends
Partitioning.SingleFieldPartitioning {
/**
diff --git
a/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/YearPartitioningDTO.java
b/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/YearPartitioningDTO.java
index 195bd391b2..774349305c 100644
---
a/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/YearPartitioningDTO.java
+++
b/common/src/main/java/org/apache/gravitino/dto/rel/partitioning/YearPartitioningDTO.java
@@ -19,9 +19,11 @@
package org.apache.gravitino.dto.rel.partitioning;
import com.google.common.base.Preconditions;
+import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.ArrayUtils;
/** Represents the year partitioning. */
+@EqualsAndHashCode(callSuper = true)
public final class YearPartitioningDTO extends
Partitioning.SingleFieldPartitioning {
/**
diff --git
a/common/src/test/java/org/apache/gravitino/dto/rel/partitioning/TestPartitioningDTOEquality.java
b/common/src/test/java/org/apache/gravitino/dto/rel/partitioning/TestPartitioningDTOEquality.java
new file mode 100644
index 0000000000..3c400edb6f
--- /dev/null
+++
b/common/src/test/java/org/apache/gravitino/dto/rel/partitioning/TestPartitioningDTOEquality.java
@@ -0,0 +1,60 @@
+/*
+ * 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.gravitino.dto.rel.partitioning;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class TestPartitioningDTOEquality {
+
+ @Test
+ public void testDifferentSingleFieldStrategiesAreNotEqual() {
+ // Before the fix, Hour/Month/Year DTOs lacked
@EqualsAndHashCode(callSuper = true) (unlike
+ // Day/Identity), so they inherited SingleFieldPartitioning's equals and
different strategies
+ // over the same field compared equal.
+ String[] field = {"ts"};
+ Assertions.assertNotEquals(HourPartitioningDTO.of(field),
MonthPartitioningDTO.of(field));
+ Assertions.assertNotEquals(MonthPartitioningDTO.of(field),
YearPartitioningDTO.of(field));
+ Assertions.assertNotEquals(HourPartitioningDTO.of(field),
YearPartitioningDTO.of(field));
+ Assertions.assertNotEquals(HourPartitioningDTO.of(field),
DayPartitioningDTO.of(field));
+ Assertions.assertNotEquals(HourPartitioningDTO.of(field),
IdentityPartitioningDTO.of(field));
+ }
+
+ @Test
+ public void testSameStrategyIsEqual() {
+ String[] field = {"ts"};
+ Assertions.assertEquals(HourPartitioningDTO.of(field),
HourPartitioningDTO.of(field));
+ Assertions.assertEquals(
+ HourPartitioningDTO.of(field), HourPartitioningDTO.of(new String[]
{"ts"}));
+ Assertions.assertNotEquals(
+ HourPartitioningDTO.of(field), HourPartitioningDTO.of(new String[]
{"other"}));
+ }
+
+ @Test
+ public void testSetSemantics() {
+ Set<Partitioning> strategies =
+ new HashSet<>(Arrays.asList(HourPartitioningDTO.of(new String[]
{"ts"})));
+
+ Assertions.assertFalse(strategies.contains(MonthPartitioningDTO.of(new
String[] {"ts"})));
+ Assertions.assertTrue(strategies.contains(HourPartitioningDTO.of(new
String[] {"ts"})));
+ }
+}
