(doris) branch master updated: [Opt](load) only MoW table need table commit lock when commit transaction for cloud mode (#45220)

[liaoxin]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 1d314867a86 [Opt](load) only MoW table need table commit lock when 
commit transaction for cloud mode (#45220)
1d314867a86 is described below

commit 1d314867a867497b94d49aead1ce54fbc079586a
Author: Xin Liao <liao...@selectdb.com>
AuthorDate: Wed Dec 11 16:04:57 2024 +0800

    [Opt](load) only MoW table need table commit lock when commit transaction 
for cloud mode (#45220)
    
    table commit lock only used for MoW table， other table modes do not need
    this lock.
---
 .../transaction/CloudGlobalTransactionMgr.java     | 26 +++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/cloud/transaction/CloudGlobalTransactionMgr.java
 
b/fe/fe-core/src/main/java/org/apache/doris/cloud/transaction/CloudGlobalTransactionMgr.java
index 3c56f7dc56a..97d75403ffc 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/cloud/transaction/CloudGlobalTransactionMgr.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/cloud/transaction/CloudGlobalTransactionMgr.java
@@ -1097,8 +1097,7 @@ public class CloudGlobalTransactionMgr implements 
GlobalTransactionMgrIface {
         try {
             commitTransactionWithSubTxns(db.getId(), tableList, transactionId, 
subTransactionStates);
         } finally {
-            decreaseWaitingLockCount(tableList);
-            MetaLockUtils.commitUnlockTables(tableList);
+            afterCommitTransaction(tableList);
         }
         return true;
     }
@@ -1153,16 +1152,28 @@ public class CloudGlobalTransactionMgr implements 
GlobalTransactionMgrIface {
                         entry.getValue().get());
             }
         }
-        increaseWaitingLockCount(tableList);
-        if (!MetaLockUtils.tryCommitLockTables(tableList, timeoutMillis, 
TimeUnit.MILLISECONDS)) {
-            decreaseWaitingLockCount(tableList);
+
+        List<Table> mowTableList = tableList.stream()
+                .filter(table -> table instanceof OlapTable && ((OlapTable) 
table).getEnableUniqueKeyMergeOnWrite())
+                .collect(Collectors.toList());
+        increaseWaitingLockCount(mowTableList);
+        if (!MetaLockUtils.tryCommitLockTables(mowTableList, timeoutMillis, 
TimeUnit.MILLISECONDS)) {
+            decreaseWaitingLockCount(mowTableList);
             // DELETE_BITMAP_LOCK_ERR will be retried on be
             throw new UserException(InternalErrorCode.DELETE_BITMAP_LOCK_ERR,
                     "get table cloud commit lock timeout, tableList=("
-                            + StringUtils.join(tableList, ",") + ")");
+                            + StringUtils.join(mowTableList, ",") + ")");
         }
     }
 
+    private void afterCommitTransaction(List<Table> tableList) {
+        List<Table> mowTableList = tableList.stream()
+                .filter(table -> table instanceof OlapTable && ((OlapTable) 
table).getEnableUniqueKeyMergeOnWrite())
+                .collect(Collectors.toList());
+        decreaseWaitingLockCount(mowTableList);
+        MetaLockUtils.commitUnlockTables(mowTableList);
+    }
+
     @Override
     public boolean commitAndPublishTransaction(DatabaseIf db, List<Table> 
tableList, long transactionId,
                                                List<TabletCommitInfo> 
tabletCommitInfos, long timeoutMillis,
@@ -1171,8 +1182,7 @@ public class CloudGlobalTransactionMgr implements 
GlobalTransactionMgrIface {
         try {
             commitTransaction(db.getId(), tableList, transactionId, 
tabletCommitInfos, txnCommitAttachment);
         } finally {
-            decreaseWaitingLockCount(tableList);
-            MetaLockUtils.commitUnlockTables(tableList);
+            afterCommitTransaction(tableList);
         }
         return true;
     }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org