From 6880357d4ce8561cbf7f0d063fe0093a15a9e286 Mon Sep 17 00:00:00 2001 From: huanghaibin <284824253@qq.com> Date: Sat, 14 Sep 2024 10:39:28 +0800 Subject: [PATCH] edit --- .../transaction/CloudGlobalTransactionMgr.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 5affdb7c8c35c8..f3891db795e4b1 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 @@ -151,7 +151,7 @@ public class CloudGlobalTransactionMgr implements GlobalTransactionMgrIface { private TxnStateCallbackFactory callbackFactory; private final Map subTxnIdToTxnId = new ConcurrentHashMap<>(); - private Map countMap = new ConcurrentHashMap<>(); + private Map waitToCommitTxnCountMap = new ConcurrentHashMap<>(); public CloudGlobalTransactionMgr() { this.callbackFactory = new TxnStateCallbackFactory(); @@ -965,7 +965,7 @@ public boolean commitAndPublishTransaction(DatabaseIf db, List tableList, long tableId = tableList.get(i).getId(); LOG.info("start commit txn=" + transactionId + ",table=" + tableId); } - for (Map.Entry entry : countMap.entrySet()) { + for (Map.Entry entry : waitToCommitTxnCountMap.entrySet()) { if (entry.getValue().get() > 5) { LOG.info("now table {} commitAndPublishTransaction queue is {}", entry.getKey(), entry.getValue().get()); @@ -1740,11 +1740,11 @@ public TransactionState abortSubTxn(long txnId, long subTxnId, long dbId, Set tableList) { for (int i = 0; i < tableList.size(); i++) { long tableId = tableList.get(i).getId(); - if (countMap.containsKey(tableId)) { - countMap.get(tableId).addAndGet(1); + if (waitToCommitTxnCountMap.containsKey(tableId)) { + waitToCommitTxnCountMap.get(tableId).addAndGet(1); } else { - countMap.put(tableId, new AtomicInteger()); - countMap.get(tableId).addAndGet(1); + waitToCommitTxnCountMap.put(tableId, new AtomicInteger()); + waitToCommitTxnCountMap.get(tableId).addAndGet(1); } } } @@ -1752,7 +1752,7 @@ private void increaseCount(List
tableList) { private void decreaseCount(List
tableList) { for (int i = 0; i < tableList.size(); i++) { long tableId = tableList.get(i).getId(); - countMap.get(tableId).decrementAndGet(); + waitToCommitTxnCountMap.get(tableId).decrementAndGet(); } } }