deprecate byte [] in deserilzation

apache · Feb 13, 2025 · 082fd85 · 082fd85
1 parent a485c0c
commit 082fd85
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/...ient-common/src/main/java/org/apache/hudi/table/action/clean/CleanPlanActionExecutor.java b/...ient-common/src/main/java/org/apache/hudi/table/action/clean/CleanPlanActionExecutor.java
@@ -193,10 +193,9 @@ protected Option<HoodieCleanerPlan> requestClean(String startCleanTime) {
         activeTimeline.deleteEmptyInstantIfExists(cleanInstant);
         HoodieInstant cleanPlanInstant = new HoodieInstant(HoodieInstant.State.INFLIGHT, cleanInstant.getAction(), cleanInstant.requestedTime(), InstantComparatorV1.REQUESTED_TIME_BASED_COMPARATOR);
         try {
-          Option<byte[]> content = activeTimeline.getInstantDetails(cleanPlanInstant);
           // Deserialize plan if it is non-empty
-          if (content.map(bytes -> bytes.length > 0).orElse(false)) {
-            return Option.of(TimelineMetadataUtils.deserializeCleanerPlan(content.get()));
+          if (!activeTimeline.isEmpty(cleanPlanInstant)) {
+            return Option.of(TimelineMetadataUtils.deserializeCleanerPlan(activeTimeline.getContentStream(cleanPlanInstant)));
           } else {
             return Option.of(new HoodieCleanerPlan());
           }

diff --git a/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieTestSuiteJob.java b/hudi-integ-test/src/main/java/org/apache/hudi/integ/testsuite/HoodieTestSuiteJob.java
@@ -156,7 +156,7 @@ int getSchemaVersionFromCommit(int nthCommit) throws Exception {
       HoodieInstant prevInstant = timeline.nthFromLastInstant(nthCommit).get();
       HoodieCommitMetadata commit = metaClient.getCommitMetadataSerDe().deserialize(
           prevInstant,
-          timeline.getInstantContentStream(prevInstant).get(),
+          timeline.getInstantContentStream(prevInstant),
           HoodieCommitMetadata.class);
       Map<String, String> extraMetadata = commit.getExtraMetadata();
       String avroSchemaStr = extraMetadata.get(HoodieCommitMetadata.SCHEMA_KEY);

diff --git a/...teg-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/ScheduleCompactNode.java b/...teg-test/src/main/java/org/apache/hudi/integ/testsuite/dag/nodes/ScheduleCompactNode.java
@@ -49,7 +49,7 @@ public void execute(ExecutionContext executionContext, int curItrCount) throws E
     Option<HoodieInstant> lastInstant = metaClient.getActiveTimeline().getCommitsTimeline().lastInstant();
     if (lastInstant.isPresent()) {
       HoodieCommitMetadata metadata = metaClient.getCommitMetadataSerDe().deserialize(
-          lastInstant.get(), metaClient.getActiveTimeline().getInstantContentStream(lastInstant.get()).get(), HoodieCommitMetadata.class);
+          lastInstant.get(), metaClient.getActiveTimeline().getInstantContentStream(lastInstant.get()), HoodieCommitMetadata.class);
       Option<String> scheduledInstant = executionContext.getHoodieTestSuiteWriter().scheduleCompaction(Option.of(metadata
           .getExtraMetadata()));
       if (scheduledInstant.isPresent()) {

diff --git a/...ce/hudi-spark/src/test/java/org/apache/hudi/table/action/compact/TestHoodieCompactor.java b/...ce/hudi-spark/src/test/java/org/apache/hudi/table/action/compact/TestHoodieCompactor.java
@@ -421,9 +421,7 @@ private HoodieCompactionPlan getLatestCompactionPlan() {
     Option<HoodieInstant> latestCompactionInstant = metaClient.getActiveTimeline().getCommitTimeline().lastInstant();
     HoodieInstant compactionPlanInstant = new HoodieInstant(HoodieInstant.State.REQUESTED, HoodieTimeline.COMPACTION_ACTION,
         latestCompactionInstant.get().requestedTime(), InstantComparatorV1.REQUESTED_TIME_BASED_COMPARATOR);
-    Option<byte[]> details = metaClient.getActiveTimeline().readCompactionPlanAsBytes(compactionPlanInstant);
-
-    return CompactionUtils.getCompactionPlan(metaClient, details);
+    return CompactionUtils.getCompactionPlan(metaClient, metaClient.getActiveTimeline().getInstantContentStream(compactionPlanInstant));
   }
 
   @Override