diff --git a/spark-doris-connector/spark-doris-connector-base/src/main/java/org/apache/doris/spark/rest/PartitionDefinition.java b/spark-doris-connector/spark-doris-connector-base/src/main/java/org/apache/doris/spark/rest/PartitionDefinition.java index f07b0c25..67c612d5 100644 --- a/spark-doris-connector/spark-doris-connector-base/src/main/java/org/apache/doris/spark/rest/PartitionDefinition.java +++ b/spark-doris-connector/spark-doris-connector-base/src/main/java/org/apache/doris/spark/rest/PartitionDefinition.java @@ -108,7 +108,7 @@ public int compareTo(PartitionDefinition o) { similar.retainAll(o.tabletIds); diffSelf.removeAll(similar); diffOther.removeAll(similar); - if (diffSelf.size() == 0) { + if (diffSelf.isEmpty()) { return 0; } long diff = Collections.min(diffSelf) - Collections.min(diffOther); @@ -127,7 +127,7 @@ public boolean equals(Object o) { return Objects.equals(database, that.database) && Objects.equals(table, that.table) && Objects.equals(beAddress, that.beAddress) - && Objects.deepEquals(tabletIds, that.tabletIds) + && tabletIds.size() == that.tabletIds.size() && tabletIds.containsAll(that.tabletIds) && Objects.equals(queryPlan, that.queryPlan) && Objects.equals(serializedSettings, that.serializedSettings); } diff --git a/spark-doris-connector/spark-doris-connector-base/src/test/java/org/apache/doris/spark/rest/TestRestService.java b/spark-doris-connector/spark-doris-connector-base/src/test/java/org/apache/doris/spark/rest/TestRestService.java index ac30188e..d83d0bc2 100644 --- a/spark-doris-connector/spark-doris-connector-base/src/test/java/org/apache/doris/spark/rest/TestRestService.java +++ b/spark-doris-connector/spark-doris-connector-base/src/test/java/org/apache/doris/spark/rest/TestRestService.java @@ -17,7 +17,6 @@ package org.apache.doris.spark.rest; -import org.apache.commons.collections4.ListUtils; import static org.apache.doris.spark.cfg.ConfigurationOptions.DORIS_FENODES; import static org.apache.doris.spark.cfg.ConfigurationOptions.DORIS_TABLET_SIZE; import static org.apache.doris.spark.cfg.ConfigurationOptions.DORIS_TABLET_SIZE_DEFAULT; @@ -26,7 +25,6 @@ import static org.hamcrest.core.StringStartsWith.startsWith; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -307,7 +305,7 @@ public void testTabletsMapToPartition() throws Exception { settings, beToTablets, opaquedQueryPlan, database, table, logger); Collections.sort(actual); - Assert.assertTrue(ListUtils.isEqualList(expected, actual)); + Assert.assertEquals(expected, actual); } @Deprecated