From be3d7da8904103817b3dcd3e1f169930cf0ea10a Mon Sep 17 00:00:00 2001
From: morningman <morningman@163.com>
Date: Fri, 29 Mar 2024 00:08:09 +0800
Subject: [PATCH] 2

---
 be/src/runtime/exec_env_init.cpp              |  1 -
 .../java/org/apache/doris/catalog/Env.java    | 22 -------------------
 2 files changed, 23 deletions(-)

diff --git a/be/src/runtime/exec_env_init.cpp b/be/src/runtime/exec_env_init.cpp
index 0b044ce7fe9258..b31e97febb7ed6 100644
--- a/be/src/runtime/exec_env_init.cpp
+++ b/be/src/runtime/exec_env_init.cpp
@@ -171,7 +171,6 @@ Status ExecEnv::_init(const std::vector<StorePath>& store_paths) {
     _file_meta_cache = new FileMetaCache(config::max_external_file_meta_cache_num);
 
     _dns_cache = new DNSCache();
-    _spill_stream_mgr = new vectorized::SpillStreamManager(spill_store_paths);
     _backend_client_cache->init_metrics("backend");
     _frontend_client_cache->init_metrics("frontend");
     _broker_client_cache->init_metrics("broker");
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
index c4a177d255ec76..c0d6f0c3a071d1 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
@@ -691,15 +691,7 @@ private Env(boolean isCheckpointCatalog) {
         this.binlogManager = new BinlogManager();
         this.binlogGcer = new BinlogGcer();
         this.columnIdFlusher = new ColumnIdFlushDaemon();
-<<<<<<< HEAD
-=======
-        this.queryCancelWorker = new QueryCancelWorker(systemInfo);
-        this.topicPublisherThread = new TopicPublisherThread(
-                "TopicPublisher", Config.publish_topic_info_interval_ms, systemInfo);
-        this.mtmvService = new MTMVService();
-        this.insertOverwriteManager = new InsertOverwriteManager();
         this.dnsCache = new DNSCache();
->>>>>>> 39d695c05c ([opt](fqdn) Add DNS Cache for FE and BE (#32869))
     }
 
     public static void destroyCheckpoint() {
@@ -1549,13 +1541,8 @@ private void startMasterOnlyDaemonThreads() {
         columnIdFlusher.start();
     }
 
-<<<<<<< HEAD
     // start threads that should running on all FE
     private void startNonMasterDaemonThreads() {
-=======
-    // start threads that should run on all FE
-    protected void startNonMasterDaemonThreads() {
->>>>>>> 39d695c05c ([opt](fqdn) Add DNS Cache for FE and BE (#32869))
         // start load manager thread
         loadManager.start();
         tabletStatMgr.start();
@@ -1565,16 +1552,7 @@ protected void startNonMasterDaemonThreads() {
         getInternalCatalog().getEsRepository().start();
         // domain resolver
         domainResolver.start();
-<<<<<<< HEAD
-=======
-        // fe disk updater
-        feDiskUpdater.start();
-        if (Config.enable_hms_events_incremental_sync) {
-            metastoreEventsProcessor.start();
-        }
-
         dnsCache.start();
->>>>>>> 39d695c05c ([opt](fqdn) Add DNS Cache for FE and BE (#32869))
     }
 
     private void transferToNonMaster(FrontendNodeType newType) {