(doris) branch master updated: [bugfix](hive)Modify the method used to obtain the txnId #33883

[yiguolei]

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

yiguolei 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 3d1bdc80815 [bugfix](hive)Modify the method used to obtain the txnId 
#33883
3d1bdc80815 is described below

commit 3d1bdc808154633060812f3fea55e91d9a1b673d
Author: wuwenchi <wuwenchi...@hotmail.com>
AuthorDate: Sat Apr 20 11:42:37 2024 +0800

    [bugfix](hive)Modify the method used to obtain the txnId #33883
---
 .../apache/doris/datasource/hive/HMSExternalCatalog.java   |  1 -
 .../apache/doris/transaction/HiveTransactionManager.java   | 14 ++------------
 .../org/apache/doris/transaction/TransactionManager.java   |  3 ---
 3 files changed, 2 insertions(+), 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
index 4474e546500..299ab6dddfb 100644
--- 
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 @@ public class HMSExternalCatalog extends ExternalCatalog {
         }
         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
index 07304fb23ab..2499cc6eba4 100644
--- 
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,10 +17,10 @@
 
 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;
@@ -28,25 +28,15 @@ 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
index daacdecf152..ca9cbb917ec 100644
--- 
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;


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