[Refactor] Cleanup stale includes (StarRocks#74982)

alvin-phoenix-ai · web-flow · commit 8ecbaf44da42 · 2026-06-18T06:17:27.000-07:00
diff --git a/be/src/storage/compaction.cpp b/be/src/storage/compaction.cpp
@@ -25,7 +25,6 @@
 #include "common/config_exec_fwd.h"
 #include "gutil/strings/substitute.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
 #include "storage/chunk_helper.h"
 #include "storage/rowset/column_reader.h"
 #include "storage/rowset/rowset.h"
diff --git a/be/src/storage/compaction_task_factory.cpp b/be/src/storage/compaction_task_factory.cpp
@@ -15,7 +15,7 @@
 #include "storage/compaction_task_factory.h"
 
 #include "common/config_compaction_fwd.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/mem_tracker.h"
 #include "storage/chunk_helper.h"
 #include "storage/compaction_manager.h"
diff --git a/be/src/storage/data_dir.cpp b/be/src/storage/data_dir.cpp
@@ -42,6 +42,7 @@
 #include "base/string/string_util.h"
 #include "base/system/errno.h"
 #include "base/time/monotime.h"
+#include "base/time/time.h"
 #include "base/utility/defer_op.h"
 #include "common/config_storage_fwd.h"
 #include "common/system/backend_options.h"
@@ -50,7 +51,6 @@
 #include "fs/fs_util.h"
 #include "gutil/strings/substitute.h"
 #include "platform/path_rw.h"
-#include "runtime/exec_env.h"
 #include "storage/olap_define.h"
 #include "storage/rowset/rowset_factory.h"
 #include "storage/rowset/rowset_meta.h"
diff --git a/be/src/storage/delta_writer.cpp b/be/src/storage/delta_writer.cpp
@@ -26,7 +26,7 @@
 #include "io/io_profiler.h"
 #include "runtime/current_thread.h"
 #include "runtime/descriptors.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/load_fail_point.h"
 #include "storage/chunk_helper.h"
 #include "storage/compaction_manager.h"
diff --git a/be/src/storage/index/inverted/builtin/builtin_inverted_reader.cpp b/be/src/storage/index/inverted/builtin/builtin_inverted_reader.cpp
@@ -16,7 +16,7 @@
 
 #include <fmt/format.h>
 
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/mem_tracker.h"
 #include "storage/index/index_descriptor.h"
 #include "storage/index/inverted/builtin/builtin_inverted_index_iterator.h"
diff --git a/be/src/storage/index/vector/tenann_index_reader.cpp b/be/src/storage/index/vector/tenann_index_reader.cpp
@@ -42,7 +42,7 @@
 #include "common/statusor.h"
 #include "fs/fs.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/mem_tracker.h"
 #include "storage/index/vector/tenann/tenann_index_utils.h"
 #include "storage/index/vector/vector_index_file_reader.h"
diff --git a/be/src/storage/kv_store.cpp b/be/src/storage/kv_store.cpp
@@ -38,6 +38,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/time/time.h"
 #include "common/config_storage_fwd.h"
 #include "common/logging.h"
 #include "common/runtime_profile.h"
@@ -49,7 +50,7 @@
 #include "rocksdb/options.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/slice_transform.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/mem_tracker.h"
 #include "storage/olap_define.h"
 #include "storage/rocksdb_status_adapter.h"
diff --git a/be/src/storage/lake/compaction_scheduler.cpp b/be/src/storage/lake/compaction_scheduler.cpp
@@ -38,7 +38,6 @@
 #include "gen_cpp/lake_service.pb.h"
 #include "gutil/stl_util.h"
 #include "platform/thrift_rpc_helper.h"
-#include "runtime/exec_env.h"
 #include "storage/lake/compaction_task.h"
 #include "storage/lake/tablet_manager.h"
 #include "storage/lake/tablet_parallel_compaction_manager.h"
diff --git a/be/src/storage/lake/compaction_task.cpp b/be/src/storage/lake/compaction_task.cpp
@@ -17,7 +17,7 @@
 #include "common/config_compaction_fwd.h"
 #include "common/config_primary_key_fwd.h"
 #include "gen_cpp/lake_types.pb.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "storage/lake/tablet.h"
 #include "storage/lake/tablet_reshard_helper.h"
 #include "storage/lake/tablet_writer.h"
diff --git a/be/src/storage/lake/delta_writer.cpp b/be/src/storage/lake/delta_writer.cpp
@@ -32,7 +32,7 @@
 #include "fs/bundle_file.h"
 #include "runtime/current_thread.h"
 #include "runtime/descriptors.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/load_fail_point.h"
 #include "runtime/mem_tracker.h"
 #include "storage/chunk_helper.h"
diff --git a/be/src/storage/lake/lake_primary_key_compaction_conflict_resolver.cpp b/be/src/storage/lake/lake_primary_key_compaction_conflict_resolver.cpp
@@ -14,7 +14,6 @@
 
 #include "storage/lake/lake_primary_key_compaction_conflict_resolver.h"
 
-#include "runtime/exec_env.h"
 #include "storage/chunk_helper.h"
 #include "storage/lake/filenames.h"
 #include "storage/lake/lake_delvec_loader.h"
diff --git a/be/src/storage/lake/pk_tablet_writer.cpp b/be/src/storage/lake/pk_tablet_writer.cpp
@@ -21,7 +21,6 @@
 #include "common/runtime_profile.h"
 #include "fs/fs_util.h"
 #include "fs/key_cache.h"
-#include "runtime/exec_env.h"
 #include "serde/column_array_serde.h"
 #include "storage/lake/filenames.h"
 #include "storage/lake/pk_tablet_sst_writer.h"
diff --git a/be/src/storage/lake/replication_txn_manager.cpp b/be/src/storage/lake/replication_txn_manager.cpp
@@ -40,7 +40,6 @@
 #include "http/http_client.h"
 #include "platform/thrift_rpc_helper.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
 #include "storage/chunk_helper.h"
 #include "storage/del_file_stream_converter.h"
 #include "storage/delete_handler.h"
diff --git a/be/src/storage/lake/spill_mem_table_sink.cpp b/be/src/storage/lake/spill_mem_table_sink.cpp
@@ -22,7 +22,7 @@
 #include "compute_env/spill/spiller.h"
 #include "compute_env/spill/spiller_factory.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/runtime_state.h"
 #include "storage/aggregate_iterator.h"
 #include "storage/base/merge_iterator.h"
diff --git a/be/src/storage/lake/tablet.cpp b/be/src/storage/lake/tablet.cpp
@@ -18,7 +18,6 @@
 #include "fs/fs.h"
 #include "gen_cpp/lake_types.pb.h"
 #include "gen_cpp/tablet_schema.pb.h"
-#include "runtime/exec_env.h"
 #include "storage/lake/filenames.h"
 #include "storage/lake/general_tablet_writer.h"
 #include "storage/lake/location_provider.h"
diff --git a/be/src/storage/lake/tablet_internal_parallel_merge_task.cpp b/be/src/storage/lake/tablet_internal_parallel_merge_task.cpp
@@ -24,7 +24,7 @@
 #include "compute_env/spill/spiller.h"
 #include "compute_env/spill/spiller_factory.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/runtime_state.h"
 #include "storage/aggregate_iterator.h"
 #include "storage/base/merge_iterator.h"
diff --git a/be/src/storage/manual_compaction.cpp b/be/src/storage/manual_compaction.cpp
@@ -25,7 +25,7 @@
 #include "common/logging.h"
 #include "fmt/core.h"
 #include "gutil/strings/split.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/mem_tracker.h"
 #include "storage/base_compaction.h"
 #include "storage/compaction_manager.h"
diff --git a/be/src/storage/memtable_flush_executor.h b/be/src/storage/memtable_flush_executor.h
@@ -47,7 +47,6 @@
 namespace starrocks {
 
 class DataDir;
-class ExecEnv;
 class SegmentPB;
 class MemTable;
 
diff --git a/be/src/storage/replication_txn_manager.cpp b/be/src/storage/replication_txn_manager.cpp
@@ -38,7 +38,6 @@
 #include "http/http_client.h"
 #include "platform/thrift_rpc_helper.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
 #include "storage/protobuf_file.h"
 #include "storage/replication_utils.h"
 #include "storage/rowset/rowset.h"
diff --git a/be/src/storage/rowset/bitmap_index_reader.cpp b/be/src/storage/rowset/bitmap_index_reader.cpp
@@ -44,7 +44,7 @@
 #include "column/column_viewer.h"
 #include "exprs/function_context.h"
 #include "exprs/like_predicate.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/mem_tracker.h"
 #include "storage/chunk_helper.h"
 #include "storage/primitive/bitmap_range_iterator.h"
diff --git a/be/src/storage/rowset/bloom_filter_index_reader.cpp b/be/src/storage/rowset/bloom_filter_index_reader.cpp
@@ -43,7 +43,7 @@
 #include "column/column_viewer.h"
 #include "common/bloom_filter.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "storage/chunk_helper.h"
 #include "storage/types.h"
 
diff --git a/be/src/storage/rowset/column_reader.cpp b/be/src/storage/rowset/column_reader.cpp
@@ -55,7 +55,7 @@
 #include "fs/key_cache.h"
 #include "gen_cpp/segment.pb.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "storage/index/index_descriptor.h"
 #include "storage/lake/index_delta_group.h"
 #include "storage/lake/index_file_reader.h"
diff --git a/be/src/storage/rowset/ordinal_page_index.cpp b/be/src/storage/rowset/ordinal_page_index.cpp
@@ -39,7 +39,7 @@
 #include "cache/mem_cache/page_handle.h"
 #include "common/logging.h"
 #include "fs/fs.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "storage/primitive/key_coder.h"
 #include "storage/rowset/page_io.h"
 
diff --git a/be/src/storage/rowset/rowset.cpp b/be/src/storage/rowset/rowset.cpp
@@ -47,7 +47,7 @@
 #include "fs/fs_util.h"
 #include "gutil/strings/substitute.h"
 #include "rowset_options.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/runtime_state.h"
 #include "segment_options.h"
 #include "storage/base/merge_iterator.h"
diff --git a/be/src/storage/rowset/rowset_factory.cpp b/be/src/storage/rowset/rowset_factory.cpp
@@ -39,7 +39,6 @@
 
 #include "gen_cpp/olap_file.pb.h"
 #include "rowset.h"
-#include "runtime/exec_env.h"
 #include "storage/rowset/horizontal_update_rowset_writer.h"
 #include "storage/rowset/rowset_writer.h"
 #include "storage/storage_engine.h"
diff --git a/be/src/storage/rowset/rowset_meta.cpp b/be/src/storage/rowset/rowset_meta.cpp
@@ -14,7 +14,7 @@
 
 #include "storage/rowset/rowset_meta.h"
 
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/mem_tracker.h"
 
 namespace starrocks {
diff --git a/be/src/storage/rowset/segment.cpp b/be/src/storage/rowset/segment.cpp
@@ -52,7 +52,7 @@
 #include "gutil/strings/split.h"
 #include "gutil/strings/substitute.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "segment_iterator.h"
 #include "segment_options.h"
 #include "storage/lake/tablet_manager.h"
diff --git a/be/src/storage/rowset/zone_map_index.cpp b/be/src/storage/rowset/zone_map_index.cpp
@@ -42,7 +42,7 @@
 #include "column/column_viewer.h"
 #include "common/config_rowset_fwd.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "storage/chunk_helper.h"
 #include "storage/olap_define.h"
 #include "storage/rowset/encoding_info.h"
diff --git a/be/src/storage/segment_flush_executor.h b/be/src/storage/segment_flush_executor.h
@@ -34,7 +34,6 @@ class Closure;
 namespace starrocks {
 
 class DataDir;
-class ExecEnv;
 class PTabletWriterAddSegmentRequest;
 class PTabletWriterAddSegmentResult;
 class ThreadPoolToken;
diff --git a/be/src/storage/segment_replicate_executor.h b/be/src/storage/segment_replicate_executor.h
@@ -29,7 +29,6 @@
 namespace starrocks {
 
 class DataDir;
-class ExecEnv;
 class MemTracker;
 class SegmentPB;
 class PTabletInfo;
diff --git a/be/src/storage/snapshot_manager.cpp b/be/src/storage/snapshot_manager.cpp
@@ -45,7 +45,7 @@
 #include "gen_cpp/Types_constants.h"
 #include "gutil/strings/join.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "storage/del_vector.h"
 #include "storage/index/index_descriptor.h"
 
diff --git a/be/src/storage/sstable/format.cpp b/be/src/storage/sstable/format.cpp
@@ -10,7 +10,6 @@
 #include "base/hash/crc32c.h"
 #include "common/status.h"
 #include "fs/fs.h"
-#include "runtime/exec_env.h"
 #include "storage/lake/tablet_manager.h"
 #include "storage/sstable/coding.h"
 
diff --git a/be/src/storage/sstable/table.cpp b/be/src/storage/sstable/table.cpp
@@ -11,7 +11,6 @@
 #include "base/debug/trace.h"
 #include "common/status.h"
 #include "fs/fs.h"
-#include "runtime/exec_env.h"
 #include "storage/lake/tablet_manager.h"
 #include "storage/sstable/block.h"
 #include "storage/sstable/comparator.h"
diff --git a/be/src/storage/storage_engine.cpp b/be/src/storage/storage_engine.cpp
@@ -67,7 +67,7 @@
 #include "gen_cpp/FrontendService_types.h"
 #include "platform/thrift_rpc_helper.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "storage/base_compaction.h"
 #include "storage/compaction_manager.h"
 #include "storage/data_dir.h"
diff --git a/be/src/storage/tablet.cpp b/be/src/storage/tablet.cpp
@@ -53,7 +53,7 @@
 #include "common/util/table_metrics.h"
 #include "exec/schema_scanner/schema_be_tablets_scanner.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "storage/binlog_builder.h"
 #include "storage/compaction_candidate.h"
 #include "storage/compaction_context.h"
diff --git a/be/src/storage/tablet_meta.cpp b/be/src/storage/tablet_meta.cpp
@@ -39,7 +39,7 @@
 
 #include "base/format.h"
 #include "base/uid_util.h"
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/mem_tracker.h"
 #include "storage/metadata_util.h"
 #include "storage/olap_common.h"
diff --git a/be/src/storage/tablet_schema.cpp b/be/src/storage/tablet_schema.cpp
@@ -39,7 +39,6 @@
 #include <algorithm>
 #include <vector>
 
-#include "runtime/exec_env.h"
 #include "runtime/mem_tracker.h"
 #include "storage/chunk_helper.h"
 #include "storage/metadata_util.h"
diff --git a/be/src/storage/tablet_schema_map.cpp b/be/src/storage/tablet_schema_map.cpp
@@ -16,7 +16,7 @@
 
 #include <bvar/bvar.h>
 
-#include "runtime/exec_env.h"
+#include "runtime/env/global_env.h"
 #include "runtime/mem_tracker.h"
 
 namespace starrocks {
diff --git a/be/src/storage/tablet_updates.cpp b/be/src/storage/tablet_updates.cpp
@@ -24,6 +24,7 @@
 #include "base/debug/trace.h"
 #include "base/failpoint/fail_point.h"
 #include "base/random/random.h"
+#include "base/time/time.h"
 #include "base/utility/defer_op.h"
 #include "base/utility/pretty_printer.h"
 #include "base/utility/scoped_cleanup.h"
@@ -47,7 +48,6 @@
 #include "row_store_encoder.h"
 #include "rowset_merger.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
 #include "storage/base/merge_iterator.h"
 #include "storage/chunk_helper.h"
 #include "storage/compaction_utils.h"
diff --git a/be/src/storage/task/engine_checksum_task.cpp b/be/src/storage/task/engine_checksum_task.cpp
@@ -41,7 +41,6 @@
 #include "common/config_exec_fwd.h"
 #include "common/config_storage_fwd.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
 #include "storage/chunk_helper.h"
 #include "storage/tablet_reader.h"
 
diff --git a/be/src/storage/task/engine_clone_task.cpp b/be/src/storage/task/engine_clone_task.cpp
@@ -63,7 +63,6 @@
 #include "http/http_client.h"
 #include "platform/thrift_rpc_helper.h"
 #include "runtime/current_thread.h"
-#include "runtime/exec_env.h"
 #include "storage/rowset/rowset.h"
 #include "storage/rowset/rowset_factory.h"
 #include "storage/snapshot_manager.h"
diff --git a/be/src/storage/task/engine_compaction_control_task.cpp b/be/src/storage/task/engine_compaction_control_task.cpp
@@ -16,7 +16,6 @@
 
 #include <memory>
 
-#include "runtime/exec_env.h"
 #include "storage/compaction_manager.h"
 #include "storage/olap_define.h"
 #include "storage/storage_engine.h"
diff --git a/be/src/storage/task/engine_manual_compaction_task.cpp b/be/src/storage/task/engine_manual_compaction_task.cpp
@@ -19,7 +19,6 @@
 #include "base/format.h"
 #include "base/utility/defer_op.h"
 #include "common/config_compaction_fwd.h"
-#include "runtime/exec_env.h"
 #include "storage/base_compaction.h"
 #include "storage/chunk_helper.h"
 #include "storage/compaction_manager.h"
diff --git a/be/src/storage/task/engine_storage_migration_task.cpp b/be/src/storage/task/engine_storage_migration_task.cpp
diff --git a/be/src/storage/update_manager.cpp b/be/src/storage/update_manager.cpp
