This is an automated email from the ASF dual-hosted git repository. voonhous pushed a commit to branch release-1.2.1 in repository https://gitbox.apache.org/repos/asf/hudi.git
commit 8e08db36331702a56ecbcf98998499ba8ada90ce Author: oglego <[email protected]> AuthorDate: Tue Jun 16 21:20:44 2026 -0500 test(hadoop-mr): enable rollback case in HoodieRealtimeRecordReader.testReader (#18693) (cherry picked from commit 973aeba167780db953badffb85888473bd5bf4f9) --- .../hadoop/realtime/TestHoodieRealtimeRecordReader.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/realtime/TestHoodieRealtimeRecordReader.java b/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/realtime/TestHoodieRealtimeRecordReader.java index 3616b9909b77..0383f9f7e668 100644 --- a/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/realtime/TestHoodieRealtimeRecordReader.java +++ b/hudi-hadoop-mr/src/test/java/org/apache/hudi/hadoop/realtime/TestHoodieRealtimeRecordReader.java @@ -19,6 +19,7 @@ package org.apache.hudi.hadoop.realtime; import org.apache.hudi.avro.model.HoodieCompactionPlan; +import org.apache.hudi.avro.model.HoodieRollbackPlan; import org.apache.hudi.common.config.HoodieCommonConfig; import org.apache.hudi.common.config.HoodieMemoryConfig; import org.apache.hudi.common.config.HoodieReaderConfig; @@ -213,8 +214,8 @@ public class TestHoodieRealtimeRecordReader { List<Pair<String, Integer>> logVersionsWithAction = new ArrayList<>(); logVersionsWithAction.add(Pair.of(HoodieTimeline.DELTA_COMMIT_ACTION, 1)); logVersionsWithAction.add(Pair.of(HoodieTimeline.DELTA_COMMIT_ACTION, 2)); - // TODO: HUDI-154 Once Hive 2.x PR (PR-674) is merged, enable this change - // logVersionsWithAction.add(Pair.of(HoodieTimeline.ROLLBACK_ACTION, 3)); + logVersionsWithAction.add(Pair.of(HoodieTimeline.ROLLBACK_ACTION, 3)); + FileSlice fileSlice = new FileSlice(partitioned ? HadoopFSUtils.getRelativePartitionPath(new Path(basePath.toString()), new Path(partitionDir.getAbsolutePath())) : "default", baseInstant, "fileid0"); @@ -231,7 +232,7 @@ public class TestHoodieRealtimeRecordReader { HoodieLogFormat.Writer writer; if (action.equals(HoodieTimeline.ROLLBACK_ACTION)) { - writer = InputFormatTestUtil.writeRollback(partitionDir, storage, "fileid0", baseInstant, + writer = InputFormatTestUtil.writeRollback(partitionDir, storage, "fileid0", instantTime, instantTime, String.valueOf(baseInstantTs + logVersion - 1), logVersion); } else { @@ -243,7 +244,11 @@ public class TestHoodieRealtimeRecordReader { long size = writer.getCurrentSize(); writer.close(); assertTrue(size > 0, "block - size should be > 0"); - FileCreateUtilsLegacy.createDeltaCommit(COMMIT_METADATA_SER_DE, basePath.toString(), instantTime, commitMetadata); + if (action.equals(HoodieTimeline.ROLLBACK_ACTION)) { + FileCreateUtilsLegacy.createRequestedRollbackFile(basePath.toString(), instantTime, new HoodieRollbackPlan()); + } else { + FileCreateUtilsLegacy.createDeltaCommit(COMMIT_METADATA_SER_DE, basePath.toString(), instantTime, commitMetadata); + } // create a split with baseFile (parquet file written earlier) and new log file(s) fileSlice.addLogFile(writer.getLogFile());
