Skip to content

Commit f402ca3

Browse files
committed
Fix dependency conflict
1 parent d6f9d96 commit f402ca3

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

hudi-client/hudi-spark-client/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@
169169
</dependency>
170170
<!-- Other Utils -->
171171
<dependency>
172-
<groupId>org.awaitility</groupId>
173-
<artifactId>awaitility</artifactId>
174-
<scope>test</scope>
172+
<groupId>org.awaitility</groupId>
173+
<artifactId>awaitility</artifactId>
174+
<scope>test</scope>
175175
</dependency>
176176
</dependencies>
177177

hudi-common/src/main/java/org/apache/hudi/common/table/HoodieTableConfig.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion;
4040
import org.apache.hudi.common.util.FileIOUtils;
4141
import org.apache.hudi.common.util.Option;
42-
import org.apache.hudi.common.util.SerializationUtils;
4342
import org.apache.hudi.common.util.SpillableMapUtils;
4443
import org.apache.hudi.common.util.ValidationUtils;
4544
import org.apache.hudi.exception.HoodieIOException;
@@ -56,6 +55,8 @@
5655
import java.util.function.BiConsumer;
5756
import java.util.stream.Collectors;
5857

58+
import static java.nio.charset.StandardCharsets.UTF_8;
59+
5960
/**
6061
* Configurations on the Hoodie Table like type of ingestion, storage formats, hive table name etc Configurations are loaded from hoodie.properties, these properties are usually set during
6162
* initializing a path as hoodie base path and never changes during the lifetime of a hoodie table.
@@ -374,11 +375,7 @@ static long generateChecksum(Properties props) {
374375
}
375376
String table = props.getProperty(NAME.key());
376377
String database = props.getProperty(DATABASE_NAME.key(), "");
377-
try {
378-
return SpillableMapUtils.generateChecksum(SerializationUtils.serialize(String.format(TABLE_CHECKSUM_FORMAT, database, table)));
379-
} catch (IOException e) {
380-
throw new HoodieIOException("Unable to generate checksum.");
381-
}
378+
return SpillableMapUtils.generateChecksum(String.format(TABLE_CHECKSUM_FORMAT, database, table).getBytes(UTF_8));
382379
}
383380

384381
static boolean validateChecksum(Properties props) {

0 commit comments

Comments
 (0)