This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch branch-2.0-alpha in repository https://gitbox.apache.org/repos/asf/doris.git
commit cf224e932d3e89ec08e10d522907baf0c55412ab Author: HappenLee <[email protected]> AuthorDate: Tue Apr 18 09:26:45 2023 +0800 [Compile](BE) Fix compile failed with tcmalloc (#18748) --- be/src/common/daemon.cpp | 4 +--- be/src/exec/data_sink.cpp | 8 ++++---- be/src/http/action/pprof_actions.cpp | 5 ++++- be/src/service/doris_main.cpp | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/be/src/common/daemon.cpp b/be/src/common/daemon.cpp index 4a64e67053..6ef0d751f3 100644 --- a/be/src/common/daemon.cpp +++ b/be/src/common/daemon.cpp @@ -19,6 +19,7 @@ #include <bthread/errno.h> #include <gflags/gflags.h> +#include <gperftools/malloc_extension.h> // IWYU pragma: keep // IWYU pragma: no_include <bits/std_abs.h> #include <math.h> #include <signal.h> @@ -40,7 +41,6 @@ #include "common/status.h" #include "olap/options.h" #include "olap/storage_engine.h" -#include "olap/tablet_manager.h" #include "runtime/block_spill_manager.h" #include "runtime/exec_env.h" #include "runtime/load_channel_mgr.h" @@ -53,10 +53,8 @@ #include "util/disk_info.h" #include "util/doris_metrics.h" #include "util/mem_info.h" -#include "util/metrics.h" #include "util/network_util.h" #include "util/perf_counters.h" -#include "util/system_metrics.h" #include "util/thrift_util.h" #include "util/time.h" diff --git a/be/src/exec/data_sink.cpp b/be/src/exec/data_sink.cpp index fd8406a355..f93aa7bb6f 100644 --- a/be/src/exec/data_sink.cpp +++ b/be/src/exec/data_sink.cpp @@ -119,8 +119,8 @@ Status DataSink::create_data_sink(ObjectPool* pool, const TDataSink& thrift_sink if (!thrift_sink.__isset.mysql_table_sink) { return Status::InternalError("Missing data buffer sink."); } - doris::vectorized::VMysqlTableSink* vmysql_tbl_sink = - new doris::vectorized::VMysqlTableSink(pool, row_desc, output_exprs); + vectorized::VMysqlTableSink* vmysql_tbl_sink = + new vectorized::VMysqlTableSink(pool, row_desc, output_exprs); sink->reset(vmysql_tbl_sink); break; #else @@ -260,8 +260,8 @@ Status DataSink::create_data_sink(ObjectPool* pool, const TDataSink& thrift_sink if (!thrift_sink.__isset.mysql_table_sink) { return Status::InternalError("Missing data buffer sink."); } - doris::vectorized::VMysqlTableSink* vmysql_tbl_sink = - new doris::vectorized::VMysqlTableSink(pool, row_desc, output_exprs); + vectorized::VMysqlTableSink* vmysql_tbl_sink = + new vectorized::VMysqlTableSink(pool, row_desc, output_exprs); sink->reset(vmysql_tbl_sink); break; #else diff --git a/be/src/http/action/pprof_actions.cpp b/be/src/http/action/pprof_actions.cpp index 7696078a4d..56ae5e49e9 100644 --- a/be/src/http/action/pprof_actions.cpp +++ b/be/src/http/action/pprof_actions.cpp @@ -17,12 +17,14 @@ #include "http/action/pprof_actions.h" +#include <gperftools/heap-profiler.h> // IWYU pragma: keep +#include <gperftools/malloc_extension.h> // IWYU pragma: keep +#include <gperftools/profiler.h> // IWYU pragma: keep #include <stdio.h> #include <fstream> #include <memory> #include <mutex> -#include <string> #include "common/config.h" #include "common/object_pool.h" @@ -34,6 +36,7 @@ #include "io/fs/local_file_system.h" #include "runtime/exec_env.h" #include "util/bfd_parser.h" +#include "util/pprof_utils.h" // IWYU pragma: keep namespace doris { diff --git a/be/src/service/doris_main.cpp b/be/src/service/doris_main.cpp index ab91661b5f..be10089eae 100644 --- a/be/src/service/doris_main.cpp +++ b/be/src/service/doris_main.cpp @@ -19,6 +19,7 @@ #include <butil/macros.h> #include <errno.h> #include <fcntl.h> +#include <gperftools/malloc_extension.h> // IWYU pragma: keep #include <libgen.h> #include <setjmp.h> #include <signal.h> @@ -27,7 +28,6 @@ #include <stdlib.h> #include <unistd.h> -#include <algorithm> #include <cstring> #include <ostream> #include <string> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
