This is an automated email from the ASF dual-hosted git repository. yihua pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/hudi.git.
from 9ff6a48 [HUDI-3736] Fix null pointer when key not specified (#5167) add 2d73c8a [HUDI-3355] Issue with out of order commits in the timeline when ingestion writers using SparkAllowUpdateStrategy (#4962) No new revisions were added by this update. Summary of changes: .../apache/hudi/client/BaseHoodieWriteClient.java | 6 +- .../apache/hudi/client/utils/TransactionUtils.java | 67 ++++++--- .../action/commit/BaseCommitActionExecutor.java | 5 +- ...urrentFileWritesConflictResolutionStrategy.java | 154 ++++++++++++++++++++- .../apache/hudi/client/SparkRDDWriteClient.java | 2 +- .../hudi/common/testutils/FileCreateUtils.java | 4 + .../hudi/common/testutils/HoodieTestTable.java | 7 + 7 files changed, 217 insertions(+), 28 deletions(-)