[bugfix](hive)Modify the method used to obtain the txnId apache#33883

spaces-X · Apr 20, 2024 · 3d1bdc8 · 3d1bdc8
1 parent 91fe1e4
commit 3d1bdc8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java
@@ -148,7 +148,6 @@ protected void initLocalObjectsImpl() {
         }
         HiveMetadataOps hiveOps = ExternalMetadataOperations.newHiveMetadataOps(hiveConf, jdbcClientConfig, this);
         transactionManager = TransactionManagerFactory.createHiveTransactionManager(hiveOps);
-        transactionManager.setEditLog(Env.getCurrentEnv().getEditLog());
         metadataOps = hiveOps;
     }
 

diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/HiveTransactionManager.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/HiveTransactionManager.java
@@ -17,36 +17,26 @@
 
 package org.apache.doris.transaction;
 
+import org.apache.doris.catalog.Env;
 import org.apache.doris.common.UserException;
 import org.apache.doris.datasource.hive.HMSTransaction;
 import org.apache.doris.datasource.hive.HiveMetadataOps;
-import org.apache.doris.persist.EditLog;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class HiveTransactionManager implements TransactionManager {
 
     private final Map<Long, HMSTransaction> transactions = new ConcurrentHashMap<>();
-    private final TransactionIdGenerator idGenerator = new TransactionIdGenerator();
     private final HiveMetadataOps ops;
 
     public HiveTransactionManager(HiveMetadataOps ops) {
         this.ops = ops;
     }
 
-    public Long getNextTransactionId() {
-        return idGenerator.getNextTransactionId();
-    }
-
-    @Override
-    public void setEditLog(EditLog editLog) {
-        this.idGenerator.setEditLog(editLog);
-    }
-
     @Override
     public long begin() {
-        long id = idGenerator.getNextTransactionId();
+        long id = Env.getCurrentEnv().getNextId();
         HMSTransaction hiveTransaction = new HMSTransaction(ops);
         transactions.put(id, hiveTransaction);
         return id;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionManager.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/TransactionManager.java
@@ -18,12 +18,9 @@
 package org.apache.doris.transaction;
 
 import org.apache.doris.common.UserException;
-import org.apache.doris.persist.EditLog;
 
 public interface TransactionManager {
 
-    void setEditLog(EditLog editLog);
-
     long begin();
 
     void commit(long id) throws UserException;