(hudi) branch master updated: [MINOR] Show specific conflict operations if conflict (#12548)

[da...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d452b7e2fc3 [MINOR] Show specific conflict operations if conflict (#12548)
d452b7e2fc3 is described below

commit d452b7e2fc322b9f70894ac71aea6d23dbffcbca
Author: houyuting <yu...@qq.com>
AuthorDate: Thu Jan 2 11:26:07 2025 +0800

    [MINOR] Show specific conflict operations if conflict (#12548)
---
 .../SimpleConcurrentFileWritesConflictResolutionStrategy.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/SimpleConcurrentFileWritesConflictResolutionStrategy.java b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/SimpleConcurrentFileWritesConflictResolutionStrategy.java
index a4e05d2d6f7..62bb867e497 100644
--- a/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/SimpleConcurrentFileWritesConflictResolutionStrategy.java
+++ b/hudi-client/hudi-client-common/src/main/java/org/apache/hudi/client/transaction/SimpleConcurrentFileWritesConflictResolutionStrategy.java
@@ -109,7 +109,8 @@ public class SimpleConcurrentFileWritesConflictResolutionStrategy
       return thisOperation.getCommitMetadataOption();
     }
     // just abort the current write if conflicts are found
-    throw new HoodieWriteConflictException(new ConcurrentModificationException("Cannot resolve conflicts for overlapping writes"));
+    throw new HoodieWriteConflictException(new ConcurrentModificationException("Cannot resolve conflicts for overlapping writes between first operation = " + thisOperation
+        + ", second operation = " + otherOperation));
   }
 
   @Override