This is an automated email from the ASF dual-hosted git repository. vinoyang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/hudi.git.
from be257b5 [Hudi-1583]: Fix bug that Hudi will skip remaining log files if there is logFile with zero size in logFileList when merge on read. (#2584) add 7a11de1 [HUDI-1632] Supports merge on read write mode for Flink writer (#2593) No new revisions were added by this update. Summary of changes: .../org/apache/hudi/io/HoodieAppendHandle.java | 48 ++++--- .../java/org/apache/hudi/io/HoodieMergeHandle.java | 15 ++- .../apache/hudi/client/HoodieFlinkWriteClient.java | 121 ++++++++++++++--- .../hudi/index/state/FlinkInMemoryStateIndex.java | 10 -- ...actory.java => ExplicitWriteHandleFactory.java} | 6 +- .../java/org/apache/hudi/io/FlinkAppendHandle.java | 125 +++++++++++++++++ .../java/org/apache/hudi/io/FlinkCreateHandle.java | 14 +- .../java/org/apache/hudi/io/FlinkMergeHandle.java | 28 +--- .../hudi/table/HoodieFlinkCopyOnWriteTable.java | 64 ++++++++- .../hudi/table/HoodieFlinkMergeOnReadTable.java | 66 ++++++++- .../org/apache/hudi/table/HoodieFlinkTable.java | 3 +- .../commit/BaseFlinkCommitActionExecutor.java | 29 ++-- .../hudi/table/action/commit/FlinkMergeHelper.java | 11 +- .../delta/BaseFlinkDeltaCommitActionExecutor.java | 65 +++++++++ .../FlinkUpsertDeltaCommitActionExecutor.java} | 24 ++-- .../table/action/compact/FlinkCompactHelpers.java} | 26 ++-- .../FlinkScheduleCompactionActionExecutor.java} | 14 +- .../HoodieFlinkMergeOnReadTableCompactor.java} | 111 +++++++-------- .../org/apache/hudi/operator/FlinkOptions.java | 40 +++++- .../apache/hudi/operator/StreamWriteFunction.java | 8 +- .../operator/StreamWriteOperatorCoordinator.java | 19 +++ .../hudi/operator/compact/CompactFunction.java | 94 +++++++++++++ .../operator/compact/CompactionCommitEvent.java | 62 +++++++++ .../operator/compact/CompactionCommitSink.java | 150 +++++++++++++++++++++ .../hudi/operator/compact/CompactionPlanEvent.java | 31 ++--- .../operator/compact/CompactionPlanOperator.java | 146 ++++++++++++++++++++ .../operator/partitioner/BucketAssignFunction.java | 9 +- .../hudi/operator/partitioner/BucketAssigner.java | 4 +- .../hudi/operator/partitioner/BucketAssigners.java | 54 ++++++++ .../partitioner/delta/DeltaBucketAssigner.java | 62 +++------ .../java/org/apache/hudi/util/StreamerUtil.java | 6 + .../apache/hudi/operator/StreamWriteITCase.java | 83 ++++++++++++ ...FunctionTest.java => TestWriteCopyOnWrite.java} | 85 +++++++----- .../apache/hudi/operator/TestWriteMergeOnRead.java | 96 +++++++++++++ .../operator/TestWriteMergeOnReadWithCompact.java | 58 ++++++++ .../operator/utils/CompactFunctionWrapper.java | 142 +++++++++++++++++++ .../operator/utils/StreamWriteFunctionWrapper.java | 16 +++ .../org/apache/hudi/operator/utils/TestData.java | 96 +++++++++++++ 38 files changed, 1734 insertions(+), 307 deletions(-) rename hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/io/{ExplicitCreateHandleFactory.java => ExplicitWriteHandleFactory.java} (87%) create mode 100644 hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/io/FlinkAppendHandle.java create mode 100644 hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/table/action/commit/delta/BaseFlinkDeltaCommitActionExecutor.java copy hudi-client/hudi-flink-client/src/main/java/org/apache/hudi/table/action/commit/{FlinkUpsertCommitActionExecutor.java => delta/FlinkUpsertDeltaCommitActionExecutor.java} (66%) copy hudi-client/{hudi-spark-client/src/main/java/org/apache/hudi/table/action/compact/SparkCompactHelpers.java => hudi-flink-client/src/main/java/org/apache/hudi/table/action/compact/FlinkCompactHelpers.java} (75%) copy hudi-client/{hudi-spark-client/src/main/java/org/apache/hudi/table/action/compact/SparkScheduleCompactionActionExecutor.java => hudi-flink-client/src/main/java/org/apache/hudi/table/action/compact/FlinkScheduleCompactionActionExecutor.java} (92%) copy hudi-client/{hudi-spark-client/src/main/java/org/apache/hudi/table/action/compact/HoodieSparkMergeOnReadTableCompactor.java => hudi-flink-client/src/main/java/org/apache/hudi/table/action/compact/HoodieFlinkMergeOnReadTableCompactor.java} (72%) create mode 100644 hudi-flink/src/main/java/org/apache/hudi/operator/compact/CompactFunction.java create mode 100644 hudi-flink/src/main/java/org/apache/hudi/operator/compact/CompactionCommitEvent.java create mode 100644 hudi-flink/src/main/java/org/apache/hudi/operator/compact/CompactionCommitSink.java copy hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/AbstractCompactor.java => hudi-flink/src/main/java/org/apache/hudi/operator/compact/CompactionPlanEvent.java (52%) create mode 100644 hudi-flink/src/main/java/org/apache/hudi/operator/compact/CompactionPlanOperator.java create mode 100644 hudi-flink/src/main/java/org/apache/hudi/operator/partitioner/BucketAssigners.java copy hudi-client/hudi-spark-client/src/main/java/org/apache/hudi/table/action/deltacommit/SparkUpsertDeltaCommitPartitioner.java => hudi-flink/src/main/java/org/apache/hudi/operator/partitioner/delta/DeltaBucketAssigner.java (62%) rename hudi-flink/src/test/java/org/apache/hudi/operator/{StreamWriteFunctionTest.java => TestWriteCopyOnWrite.java} (90%) create mode 100644 hudi-flink/src/test/java/org/apache/hudi/operator/TestWriteMergeOnRead.java create mode 100644 hudi-flink/src/test/java/org/apache/hudi/operator/TestWriteMergeOnReadWithCompact.java create mode 100644 hudi-flink/src/test/java/org/apache/hudi/operator/utils/CompactFunctionWrapper.java