diff --git a/be/src/agent/workload_sched_policy_listener.cpp b/be/src/agent/workload_sched_policy_listener.cpp index fc7c8ba8c1806e..60749a3e473713 100644 --- a/be/src/agent/workload_sched_policy_listener.cpp +++ b/be/src/agent/workload_sched_policy_listener.cpp @@ -17,6 +17,7 @@ #include "agent/workload_sched_policy_listener.h" +#include "runtime/exec_env.h" #include "runtime/workload_management/workload_action.h" #include "runtime/workload_management/workload_condition.h" #include "runtime/workload_management/workload_sched_policy.h" diff --git a/be/src/agent/workload_sched_policy_listener.h b/be/src/agent/workload_sched_policy_listener.h index f1410b502fdd99..e340ccd1d2c5d6 100644 --- a/be/src/agent/workload_sched_policy_listener.h +++ b/be/src/agent/workload_sched_policy_listener.h @@ -20,9 +20,9 @@ #include #include "agent/topic_listener.h" -#include "runtime/exec_env.h" namespace doris { +class ExecEnv; class WorkloadschedPolicyListener : public TopicListener { public: diff --git a/be/src/exec/operator/aggregation_sink_operator.h b/be/src/exec/operator/aggregation_sink_operator.h index f90671cb465e2d..ae491a95e38c31 100644 --- a/be/src/exec/operator/aggregation_sink_operator.h +++ b/be/src/exec/operator/aggregation_sink_operator.h @@ -20,7 +20,6 @@ #include #include "exec/operator/operator.h" -#include "runtime/exec_env.h" #include "runtime/runtime_profile.h" namespace doris { diff --git a/be/src/exec/scan/scanner.h b/be/src/exec/scan/scanner.h index 041af638c52dd8..7430e7458af4c7 100644 --- a/be/src/exec/scan/scanner.h +++ b/be/src/exec/scan/scanner.h @@ -25,7 +25,6 @@ #include "common/status.h" #include "core/block/block.h" -#include "runtime/exec_env.h" #include "runtime/runtime_state.h" #include "storage/tablet/tablet.h" #include "util/stopwatch.hpp" diff --git a/be/src/exec/sink/load_stream_map_pool.h b/be/src/exec/sink/load_stream_map_pool.h index cb210b3663ccde..4a669c71f88bf7 100644 --- a/be/src/exec/sink/load_stream_map_pool.h +++ b/be/src/exec/sink/load_stream_map_pool.h @@ -54,7 +54,6 @@ #include "core/data_type/data_type.h" #include "exec/sink/load_stream_stub.h" #include "exprs/vexpr_fwd.h" -#include "runtime/exec_env.h" #include "runtime/memory/mem_tracker.h" #include "runtime/runtime_profile.h" #include "runtime/thread_context.h" diff --git a/be/src/exec/sink/load_stream_stub.h b/be/src/exec/sink/load_stream_stub.h index 4dfe2e252d9e72..6dfd56a5b1bb01 100644 --- a/be/src/exec/sink/load_stream_stub.h +++ b/be/src/exec/sink/load_stream_stub.h @@ -57,7 +57,6 @@ #include "core/column/column.h" #include "core/data_type/data_type.h" #include "exprs/vexpr_fwd.h" -#include "runtime/exec_env.h" #include "runtime/memory/mem_tracker.h" #include "runtime/runtime_profile.h" #include "runtime/thread_context.h" diff --git a/be/src/exec/sink/writer/vtablet_writer.h b/be/src/exec/sink/writer/vtablet_writer.h index d9e3869e68e588..a89720ad6c05d0 100644 --- a/be/src/exec/sink/writer/vtablet_writer.h +++ b/be/src/exec/sink/writer/vtablet_writer.h @@ -61,7 +61,6 @@ #include "exec/sink/vtablet_finder.h" #include "exec/sink/writer/async_result_writer.h" #include "exprs/vexpr_fwd.h" -#include "runtime/exec_env.h" #include "runtime/memory/mem_tracker.h" #include "runtime/runtime_profile.h" #include "runtime/thread_context.h" diff --git a/be/src/exec/sink/writer/vtablet_writer_v2.h b/be/src/exec/sink/writer/vtablet_writer_v2.h index 914c17d1cdc23f..395ace0773fdf7 100644 --- a/be/src/exec/sink/writer/vtablet_writer_v2.h +++ b/be/src/exec/sink/writer/vtablet_writer_v2.h @@ -56,7 +56,6 @@ #include "exec/sink/vrow_distribution.h" #include "exec/sink/writer/async_result_writer.h" #include "exprs/vexpr_fwd.h" -#include "runtime/exec_env.h" #include "runtime/memory/mem_tracker.h" #include "runtime/runtime_profile.h" #include "runtime/thread_context.h" diff --git a/be/src/load/group_commit/group_commit_mgr.h b/be/src/load/group_commit/group_commit_mgr.h index 5a79f3e1ac53b9..dc94007c72186d 100644 --- a/be/src/load/group_commit/group_commit_mgr.h +++ b/be/src/load/group_commit/group_commit_mgr.h @@ -33,7 +33,6 @@ #include "core/block/block.h" #include "exec/sink/writer/vwal_writer.h" #include "load/group_commit/wal/wal_manager.h" -#include "runtime/exec_env.h" #include "util/threadpool.h" namespace doris { diff --git a/be/src/load/group_commit/wal/wal_info.h b/be/src/load/group_commit/wal/wal_info.h index b5c7ce7054d720..a7017e31fc5329 100644 --- a/be/src/load/group_commit/wal/wal_info.h +++ b/be/src/load/group_commit/wal/wal_info.h @@ -15,7 +15,6 @@ // specific language governing permissions and limitations // under the License. #pragma once -#include "runtime/exec_env.h" namespace doris { class WalInfo { diff --git a/be/src/load/group_commit/wal/wal_manager.h b/be/src/load/group_commit/wal/wal_manager.h index 4157cc11d19f4e..24be4dc6be2d55 100644 --- a/be/src/load/group_commit/wal/wal_manager.h +++ b/be/src/load/group_commit/wal/wal_manager.h @@ -38,11 +38,11 @@ #include "load/group_commit/wal/wal_table.h" #include "load/group_commit/wal/wal_writer.h" #include "load/stream_load/stream_load_context.h" -#include "runtime/exec_env.h" #include "util/thread.h" #include "util/threadpool.h" namespace doris { +class ExecEnv; class WalManager { ENABLE_FACTORY_CREATOR(WalManager); struct ScanWalInfo { diff --git a/be/src/load/group_commit/wal/wal_table.cpp b/be/src/load/group_commit/wal/wal_table.cpp index 4c6c0e1edb5856..b2b8ec6e8cf7c4 100644 --- a/be/src/load/group_commit/wal/wal_table.cpp +++ b/be/src/load/group_commit/wal/wal_table.cpp @@ -30,6 +30,7 @@ #include "service/http/http_common.h" #include "service/http/http_headers.h" #include "service/http/utils.h" +#include "runtime/exec_env.h" #include "util/client_cache.h" #include "util/path_util.h" #include "util/thrift_rpc_helper.h" diff --git a/be/src/load/group_commit/wal/wal_table.h b/be/src/load/group_commit/wal/wal_table.h index 89223c65668e0d..01bcbd18e69d37 100644 --- a/be/src/load/group_commit/wal/wal_table.h +++ b/be/src/load/group_commit/wal/wal_table.h @@ -27,10 +27,10 @@ #include "common/status.h" #include "load/group_commit/wal/wal_info.h" #include "load/stream_load/stream_load_context.h" -#include "runtime/exec_env.h" #include "service/http/action/http_stream.h" namespace doris { +class ExecEnv; class WalTable { public: WalTable(ExecEnv* exec_env, int64_t db_id, int64_t table_id); diff --git a/be/src/runtime/query_context.h b/be/src/runtime/query_context.h index aa1746ed8b0939..34029f59ac4f28 100644 --- a/be/src/runtime/query_context.h +++ b/be/src/runtime/query_context.h @@ -35,7 +35,6 @@ #include "common/status.h" #include "exec/runtime_filter/runtime_filter_mgr.h" #include "exec/scan/scanner_scheduler.h" -#include "runtime/exec_env.h" #include "runtime/memory/mem_tracker_limiter.h" #include "runtime/runtime_predicate.h" #include "runtime/workload_group/workload_group.h" @@ -44,6 +43,7 @@ #include "util/threadpool.h" namespace doris { +class ExecEnv; class PipelineFragmentContext; class PipelineTask; diff --git a/be/src/runtime/workload_management/workload_sched_policy_mgr.cpp b/be/src/runtime/workload_management/workload_sched_policy_mgr.cpp index cba5ad50b560fe..2eea98cd9a243e 100644 --- a/be/src/runtime/workload_management/workload_sched_policy_mgr.cpp +++ b/be/src/runtime/workload_management/workload_sched_policy_mgr.cpp @@ -20,6 +20,7 @@ #include #include "common/config.h" +#include "runtime/exec_env.h" #include "runtime/fragment_mgr.h" #include "runtime/workload_management/resource_context.h" diff --git a/be/src/runtime/workload_management/workload_sched_policy_mgr.h b/be/src/runtime/workload_management/workload_sched_policy_mgr.h index ecdb0913bb9219..c1ded419e649bd 100644 --- a/be/src/runtime/workload_management/workload_sched_policy_mgr.h +++ b/be/src/runtime/workload_management/workload_sched_policy_mgr.h @@ -17,11 +17,12 @@ #pragma once -#include "runtime/exec_env.h" #include "runtime/workload_management/workload_sched_policy.h" #include "util/countdown_latch.h" namespace doris { +class ExecEnv; +class Thread; class WorkloadSchedPolicyMgr { public: diff --git a/be/src/service/http/action/check_encryption_action.h b/be/src/service/http/action/check_encryption_action.h index ae4ce978b16019..7bcc86c83e614e 100644 --- a/be/src/service/http/action/check_encryption_action.h +++ b/be/src/service/http/action/check_encryption_action.h @@ -18,11 +18,11 @@ #include #include "cloud/cloud_tablet_mgr.h" -#include "runtime/exec_env.h" #include "service/http/http_handler_with_auth.h" #include "service/http/http_request.h" #include "storage/tablet/tablet_manager.h" namespace doris { +class ExecEnv; class CheckEncryptionAction : public HttpHandlerWithAuth { public: diff --git a/be/src/service/http/action/compaction_score_action.cpp b/be/src/service/http/action/compaction_score_action.cpp index fd04f65717a86d..376861be69db63 100644 --- a/be/src/service/http/action/compaction_score_action.cpp +++ b/be/src/service/http/action/compaction_score_action.cpp @@ -42,6 +42,7 @@ #include "cloud/cloud_tablet_mgr.h" #include "cloud/config.h" #include "common/status.h" +#include "runtime/exec_env.h" #include "service/http/http_channel.h" #include "service/http/http_handler_with_auth.h" #include "service/http/http_headers.h" diff --git a/be/src/service/http/action/compaction_score_action.h b/be/src/service/http/action/compaction_score_action.h index 0fc88ae7627560..a354df2384a385 100644 --- a/be/src/service/http/action/compaction_score_action.h +++ b/be/src/service/http/action/compaction_score_action.h @@ -25,11 +25,11 @@ #include "cloud/cloud_tablet_mgr.h" #include "common/status.h" -#include "runtime/exec_env.h" #include "service/http/http_handler_with_auth.h" #include "service/http/http_request.h" #include "storage/storage_engine.h" namespace doris { +class ExecEnv; struct CompactionScoreResult { int64_t tablet_id; diff --git a/be/src/service/http/http_handler_with_auth.cpp b/be/src/service/http/http_handler_with_auth.cpp index 4c977ddd9ec1d5..2b83206865f08c 100644 --- a/be/src/service/http/http_handler_with_auth.cpp +++ b/be/src/service/http/http_handler_with_auth.cpp @@ -19,6 +19,7 @@ #include +#include "runtime/exec_env.h" #include "service/http/http_channel.h" #include "service/http/utils.h" #include "util/client_cache.h" diff --git a/be/src/service/http/http_handler_with_auth.h b/be/src/service/http/http_handler_with_auth.h index b21c3fb2d01204..45caf745cfe38d 100644 --- a/be/src/service/http/http_handler_with_auth.h +++ b/be/src/service/http/http_handler_with_auth.h @@ -19,7 +19,6 @@ #include -#include "runtime/exec_env.h" #include "service/http/http_handler.h" namespace doris { diff --git a/be/src/storage/metadata_adder.h b/be/src/storage/metadata_adder.h index c745bfafa5666f..cb788a672f8b17 100644 --- a/be/src/storage/metadata_adder.h +++ b/be/src/storage/metadata_adder.h @@ -20,7 +20,6 @@ #include #include -#include "runtime/exec_env.h" #include "runtime/memory/mem_tracker_limiter.h" #include "runtime/runtime_profile.h" diff --git a/be/src/storage/rowset/rowset_writer_context.h b/be/src/storage/rowset/rowset_writer_context.h index ba803a9a118839..9ec90387195172 100644 --- a/be/src/storage/rowset/rowset_writer_context.h +++ b/be/src/storage/rowset/rowset_writer_context.h @@ -31,7 +31,6 @@ #include "io/fs/file_system.h" #include "io/fs/file_writer.h" #include "io/fs/packed_file_system.h" -#include "runtime/exec_env.h" #include "storage/olap_define.h" #include "storage/partial_update_info.h" #include "storage/storage_policy.h" diff --git a/be/src/storage/segment/page_handle.h b/be/src/storage/segment/page_handle.h index 2022efc1f45528..db469bde16e93f 100644 --- a/be/src/storage/segment/page_handle.h +++ b/be/src/storage/segment/page_handle.h @@ -17,7 +17,6 @@ #pragma once -#include "runtime/exec_env.h" #include "storage/cache/page_cache.h" #include "util/slice.h" // for Slice