update

Signed-off-by: sevev <[email protected]>
StarRocks · Jan 16, 2025 · 6e05e08 · 6e05e08
1 parent 851149e
commit 6e05e08
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/be/src/common/config.h b/be/src/common/config.h
@@ -1538,5 +1538,4 @@ CONF_mInt32(json_parse_many_batch_size, "1000000");
 CONF_mBool(enable_dynamic_batch_size_for_json_parse_many, "true");
 CONF_mInt32(put_combined_txn_log_thread_pool_num_max, "64");
 CONF_mBool(enable_put_combinded_txn_log_parallel, "false");
-CONF_mBool(output_combined_txn_log, "false");
 } // namespace starrocks::config
diff --git a/be/src/exec/tablet_sink_sender.cpp b/be/src/exec/tablet_sink_sender.cpp
@@ -370,22 +370,14 @@ bool TabletSinkSender::get_immutable_partition_ids(std::set<int64_t>* partition_
 }
 
 Status TabletSinkSender::_write_combined_txn_log() {
-    int64_t t_start = MonotonicMillis();
     if (config::enable_put_combinded_txn_log_parallel) {
-        Status st = write_combined_txn_log(_txn_log_map);
-        if (config::output_combined_txn_log) {
-            LOG(INFO) << "write_combined_txn_log parallel cost time: " << MonotonicMillis() - t_start;
-        }
-        return st;
+        return write_combined_txn_log(_txn_log_map);
     }
 
     for (const auto& [partition_id, logs] : _txn_log_map) {
         (void)partition_id;
         RETURN_IF_ERROR(write_combined_txn_log(logs));
     }
-    if (config::output_combined_txn_log) {
-        LOG(INFO) << "write_combined_txn_log non-parallel cost time: " << MonotonicMillis() - t_start;
-    }
     return Status::OK();
 }
 

diff --git a/be/src/exec/write_combined_txn_log.cpp b/be/src/exec/write_combined_txn_log.cpp
@@ -24,7 +24,7 @@ namespace starrocks {
 
 class TxnLogTask : public Runnable {
 public:
-    TxnLogTask(const CombinedTxnLogPB& logs, lake::TabletManager* tablet_mgr, std::promise<Status> promise)
+    TxnLogTask(const CombinedTxnLogPB logs, lake::TabletManager* tablet_mgr, std::promise<Status> promise)
             : _logs(logs), _tablet_mgr(tablet_mgr), _promise(std::move(promise)) {}
 
     void run() override {

diff --git a/be/src/runtime/exec_env.cpp b/be/src/runtime/exec_env.cpp
@@ -759,6 +759,7 @@ void ExecEnv::destroy() {
     SAFE_DELETE(_lake_update_manager);
     SAFE_DELETE(_lake_replication_txn_manager);
     SAFE_DELETE(_cache_mgr);
+    SAFE_DELETE(_put_combined_txn_log_thread_pool);
     _dictionary_cache_pool.reset();
     _automatic_partition_pool.reset();
     _metrics = nullptr;