edit

apache · Dec 24, 2024 · d8e6dcb · d8e6dcb
1 parent dc4227e
commit d8e6dcb
Showing 1 changed file with 8 additions and 6 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
@@ -500,8 +500,7 @@ private void commitTransaction(long dbId, List<Table> tableList, long transactio
             if (null != transactionState && null != transactionState.getTransactionStatus()) {
                 if (transactionState.getTransactionStatus() == TransactionStatus.COMMITTED
                         || transactionState.getTransactionStatus() == TransactionStatus.VISIBLE) {
-                    LOG.info("txn={}, status={} not need to calculate delete bitmap again, just return ",
-                            transactionId,
+                    LOG.info("txn={}, status={} not need to calculate delete bitmap again, just return ", transactionId,
                             transactionState.getTransactionStatus().toString());
                     return;
                 } else {
@@ -530,8 +529,7 @@ private void commitTransaction(long dbId, List<Table> tableList, long transactio
                 builder.setCommitAttachment(TxnUtil
                         .loadJobFinalOperationToPb(loadJobFinalOperation));
             } else if (txnCommitAttachment instanceof RLTaskTxnCommitAttachment) {
-                RLTaskTxnCommitAttachment rlTaskTxnCommitAttachment
-                        = (RLTaskTxnCommitAttachment) txnCommitAttachment;
+                RLTaskTxnCommitAttachment rlTaskTxnCommitAttachment = (RLTaskTxnCommitAttachment) txnCommitAttachment;
                 TxnStateChangeCallback cb = callbackFactory.getCallback(rlTaskTxnCommitAttachment.getJobId());
                 if (cb != null) {
                     // use a temporary transaction state to do before commit check,
@@ -865,7 +863,6 @@ private void getDeleteBitmapUpdateLock(Map<Long, Set<Long>> tableToParttions, lo
         }
         StopWatch stopWatch = new StopWatch();
         stopWatch.start();
-
         int totalRetryTime = 0;
         for (Map.Entry<Long, Set<Long>> entry : tableToParttions.entrySet()) {
             GetDeleteBitmapUpdateLockRequest.Builder builder = GetDeleteBitmapUpdateLockRequest.newBuilder();
@@ -990,6 +987,10 @@ private void removeDeleteBitmapUpdateLock(List<OlapTable> tableList, long transa
     private void sendCalcDeleteBitmaptask(long dbId, long transactionId,
             Map<Long, List<TCalcDeleteBitmapPartitionInfo>> backendToPartitionInfos,
             long calculateDeleteBitmapTaskTimeoutSeconds) throws UserException {
+        if (backendToPartitionInfos == null) {
+            throw new UserException("failed to send calculate delete bitmap task to be,transactionId=" + transactionId
+                    + ",but backendToPartitionInfos is null");
+        }
         if (backendToPartitionInfos.isEmpty()) {
             return;
         }
@@ -1223,7 +1224,8 @@ public boolean commitAndPublishTransaction(DatabaseIf db, List<Table> tableList,
     @Override
     public void commitTransaction2PC(Database db, List<Table> tableList, long transactionId, long timeoutMillis)
             throws UserException {
-        commitTransaction(db.getId(), tableList, transactionId, null, null, true);
+        List<OlapTable> mowTableList = getMowTableList(tableList, null);
+        commitTransaction(db.getId(), tableList, transactionId, null, null, true, mowTableList, null);
     }
 
     @Override