(doris) branch branch-2.1 updated: [branch-2.1](multi-table-load) reduce routine load job transaction info storage in memory #31127

[yiguolei]

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

yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new d55d796c74f [branch-2.1](multi-table-load) reduce routine load job 
transaction info storage in memory #31127
d55d796c74f is described below

commit d55d796c74f6c20b8bca62c24be6a635fae896e6
Author: HHoflittlefish777 <77738092+hhoflittlefish...@users.noreply.github.com>
AuthorDate: Tue Feb 20 09:08:56 2024 +0800

    [branch-2.1](multi-table-load) reduce routine load job transaction info 
storage in memory #31127
---
 .../java/org/apache/doris/service/FrontendServiceImpl.java    |  3 ---
 .../org/apache/doris/transaction/DatabaseTransactionMgr.java  | 11 -----------
 .../org/apache/doris/transaction/GlobalTransactionMgr.java    |  5 -----
 3 files changed, 19 deletions(-)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java 
b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index c6096adf0b2..53a32dd8ad4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -1932,7 +1932,6 @@ public class FrontendServiceImpl implements 
FrontendService.Iface {
         }
         long timeoutMs = request.isSetThriftRpcTimeoutMs() ? 
request.getThriftRpcTimeoutMs() : 5000;
         List planFragmentParamsList = new ArrayList<>(tableNames.size());
-        List<Long> tableIds = 
olapTables.stream().map(OlapTable::getId).collect(Collectors.toList());
         // todo: if is multi table, we need consider the lock time and the 
timeout
         boolean enablePipelineLoad = Config.enable_pipeline_load;
         try {
@@ -1950,8 +1949,6 @@ public class FrontendServiceImpl implements 
FrontendService.Iface {
                 }
                 multiTableFragmentInstanceIdIndexMap.put(request.getTxnId(), 
++index);
             }
-            Env.getCurrentGlobalTransactionMgr()
-                    .putTransactionTableNames(db.getId(), request.getTxnId(), 
tableIds);
             LOG.debug("receive stream load multi table put request result: 
{}", result);
         } catch (Throwable e) {
             LOG.warn("catch unknown result.", e);
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
 
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
index e772b28ade4..fd48b974544 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
@@ -2246,17 +2246,6 @@ public class DatabaseTransactionMgr {
         return msgBuilder.toString();
     }
 
-    protected void putTransactionTableNames(long transactionId, List<Long> 
tableIds) {
-        if (CollectionUtils.isEmpty(tableIds)) {
-            return;
-        }
-        if (multiTableRunningTransactionTableIdMaps.contains(transactionId)) {
-            
multiTableRunningTransactionTableIdMaps.get(transactionId).addAll(tableIds);
-            return;
-        }
-        multiTableRunningTransactionTableIdMaps.put(transactionId, tableIds);
-    }
-
     /**
      * Update transaction table ids by transaction id.
      * it's used for multi table transaction.
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
 
b/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
index 30f1c706c50..57a86298765 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java
@@ -776,9 +776,4 @@ public class GlobalTransactionMgr implements Writable {
             throws AnalysisException {
         
getDatabaseTransactionMgr(dbId).updateMultiTableRunningTransactionTableIds(transactionId,
 tableIds);
     }
-
-    public void putTransactionTableNames(Long dbId, Long transactionId, 
List<Long> tableIds)
-            throws AnalysisException {
-        
getDatabaseTransactionMgr(dbId).putTransactionTableNames(transactionId, 
tableIds);
-    }
 }


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