This is an automated email from the ASF dual-hosted git repository.

danny0405 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git


    from a9c101125948 fix: adding back PRECOMBINE field Config property in 
DataSourceReadOptions (#13900)
     add ff00d212c404 feat(merger): [RFC-101] Update HoodieRecordMerger 
interface and implementations (#13742)

No new revisions were added by this update.

Summary of changes:
 .../org/apache/hudi/index/HoodieIndexUtils.java    |   1 -
 .../hudi/io/FileGroupReaderBasedMergeHandle.java   |  10 -
 .../hudi/io/HoodieMergeHandleWithChangeLog.java    |   9 +-
 .../apache/hudi/io/HoodieSortedMergeHandle.java    |   6 +-
 .../io/HoodieSortedMergeHandleWithChangeLog.java   |   6 +-
 .../org/apache/hudi/io/HoodieWriteMergeHandle.java |  60 ++++--
 .../hudi/io/SecondaryIndexStreamingTracker.java    |  11 +-
 .../hudi/table/action/commit/BaseWriteHelper.java  |   5 +-
 .../org/apache/hudi/io/TestHoodieWriteHandle.java  |   2 +-
 .../io/TestSecondaryIndexStreamingTracker.java     |  25 +--
 .../hudi/utils/HoodieWriterClientTestHarness.java  |   1 -
 .../client/model/CommitTimeFlinkRecordMerger.java  |  18 +-
 .../client/model/EventTimeFlinkRecordMerger.java   |  36 ++--
 .../hudi/client/model/HoodieFlinkRecord.java       |   4 +-
 .../model/PartialUpdateFlinkRecordMerger.java      |  61 +++---
 .../FlinkIncrementalMergeHandleWithChangeLog.java  |   9 +-
 .../hudi/io/FlinkMergeHandleWithChangeLog.java     |   8 +-
 .../hudi/merge/TestHoodieFlinkRecordMerger.java    |  78 +++----
 .../merge/TestPartialUpdateFlinkRecordMerger.java  | 107 +++++----
 .../org/apache/hudi/DefaultSparkRecordMerger.java  |  58 +++--
 .../org/apache/hudi/HoodieSparkRecordMerger.java   |  44 ----
 .../hudi/OverwriteWithLatestSparkRecordMerger.java |  24 +--
 .../hudi/common/model/HoodieSparkRecord.java       |   5 +-
 .../apache/hudi/merge/SparkRecordMergingUtils.java |  42 ++--
 .../commit/BaseSparkCommitActionExecutor.java      |   6 +-
 .../hudi/BaseSparkInternalRecordContext.java       |  11 +-
 .../SparkFileFormatInternalRecordContext.scala     |  13 +-
 .../SparkFileFormatInternalRowReaderContext.scala  |   2 +-
 .../testutils/HoodieSparkDeleteRecordMerger.java   |  13 +-
 .../org/apache/hudi/avro/AvroRecordContext.java    |   4 +-
 .../apache/hudi/common/engine/RecordContext.java   |   2 +-
 .../common/model/DefaultHoodieRecordPayload.java   |  24 +--
 .../hudi/common/model/EventTimeAvroPayload.java    |  11 +-
 .../hudi/common/model/HoodieAvroIndexedRecord.java |  42 ++--
 .../apache/hudi/common/model/HoodieAvroRecord.java |   9 +-
 .../hudi/common/model/HoodieAvroRecordMerger.java  |  82 +++++--
 .../model/HoodiePreCombineAvroRecordMerger.java    |  44 ++--
 .../org/apache/hudi/common/model/HoodieRecord.java |   2 +-
 .../hudi/common/model/HoodieRecordMerger.java      |  45 +++-
 .../common/model/OverwriteWithLatestMerger.java    |  10 +-
 .../table/log/HoodieMergedLogRecordScanner.java    |  17 +-
 .../table/log/HoodieUnMergedLogRecordScanner.java  |   2 +-
 .../table/read/BufferedRecordMergerFactory.java    | 239 ++++-----------------
 .../hudi/common/table/read/BufferedRecords.java    |   9 +-
 .../table/read/buffer/FileGroupRecordBuffer.java   |   2 +-
 .../read/buffer/KeyBasedFileGroupRecordBuffer.java |   1 -
 .../buffer/PositionBasedFileGroupRecordBuffer.java |   1 -
 .../apache/hudi/common/util/HoodieRecordUtils.java |   8 +-
 .../model/TestDefaultHoodieRecordPayload.java      |  18 +-
 .../common/table/read/SchemaHandlerTestBase.java   |   2 +-
 .../read/buffer/BaseTestFileGroupRecordBuffer.java |  29 ++-
 .../common/testutils/HoodieTestDataGenerator.java  |   4 +-
 .../hudi/common/testutils/HoodieTestUtils.java     |   2 +-
 .../reader/HoodieAvroRecordTestMerger.java         |  89 --------
 .../org/apache/hudi/sink/StreamWriteFunction.java  |   1 -
 .../hudi/table/format/cdc/CdcInputFormat.java      |   1 -
 .../common/functional/TestHoodieLogFormat.java     |   4 +-
 .../common/table/read/TestCustomRecordMerger.java  |  40 ++--
 .../TestHoodieFileGroupReaderInflightCommit.java   |   4 +-
 .../hudi/hadoop/DefaultHiveRecordMerger.java       |  42 +---
 .../org/apache/hudi/hadoop/HiveRecordContext.java  |   5 +-
 .../org/apache/hudi/hadoop/HoodieHiveRecord.java   |   5 +-
 .../OverwriteWithLatestHiveRecordMerger.java       |  11 +-
 .../realtime/RealtimeCompactedRecordReader.java    |  24 ++-
 .../src/main/scala/org/apache/hudi/Iterators.scala |  54 ++---
 .../org/apache/hudi/cdc/CDCFileGroupIterator.scala |   2 +-
 ...odieSparkValidateDuplicateKeyRecordMerger.scala |  11 +-
 .../hudi/command/payload/ExpressionPayload.scala   |   2 +-
 .../apache/hudi/TestDefaultSparkRecordMerger.java  |  93 +++-----
 .../TestPositionBasedFileGroupRecordBuffer.java    |   8 +-
 .../hudi/functional/TestBufferedRecordMerger.java  | 114 +++++++++-
 .../test/java/org/apache/hudi/io/CustomMerger.java |  62 ++++++
 .../java/org/apache/hudi/io/CustomPayload.java     |  79 +++++++
 .../java/org/apache/hudi/io/TestMergeHandle.java   |  87 +-------
 74 files changed, 968 insertions(+), 1054 deletions(-)
 delete mode 100644 
hudi-common/src/test/java/org/apache/hudi/common/testutils/reader/HoodieAvroRecordTestMerger.java
 create mode 100644 
hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/io/CustomMerger.java
 create mode 100644 
hudi-spark-datasource/hudi-spark/src/test/java/org/apache/hudi/io/CustomPayload.java

Reply via email to