You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2022/05/10 13:25:42 UTC
[incubator-doris] branch master updated: [refactor][style] Use clang-format to sort includes (#9483)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 718a51a388 [refactor][style] Use clang-format to sort includes (#9483)
718a51a388 is described below
commit 718a51a3883345548f325d7f4eb3856e682c4e8d
Author: Adonis Ling <ad...@gmail.com>
AuthorDate: Tue May 10 21:25:35 2022 +0800
[refactor][style] Use clang-format to sort includes (#9483)
---
.clang-format | 2 --
.gitignore | 1 +
be/src/common/configbase.h | 3 +--
be/src/common/signal_handler.h | 2 +-
be/src/common/status.cpp | 3 ++-
be/src/common/status.h | 6 +++---
be/src/env/env.cpp | 3 ++-
be/src/env/env.h | 2 +-
be/src/exec/base_scanner.h | 2 +-
be/src/exec/broker_scan_node.cpp | 2 +-
be/src/exec/broker_scanner.cpp | 3 ++-
be/src/exec/data_sink.cpp | 3 +--
be/src/exec/exec_node.cpp | 2 +-
be/src/exec/json_scanner.cpp | 3 ++-
be/src/exec/olap_common.h | 2 +-
be/src/exec/olap_scanner.h | 2 +-
.../exec/schema_scanner/schema_statistics_scanner.cpp | 1 +
be/src/exec/tablet_info.h | 1 -
be/src/exec/tablet_sink.cpp | 1 -
be/src/exprs/agg_fn_evaluator.h | 4 ++--
be/src/exprs/hll_function.h | 1 +
be/src/http/action/stream_load.cpp | 2 +-
be/src/http/action/stream_load_2pc.h | 1 +
be/src/http/action/tablets_distribution_action.h | 3 ++-
be/src/http/http_parser.h | 3 ++-
be/src/olap/bloom_filter.hpp | 2 +-
be/src/olap/bloom_filter_predicate.h | 2 +-
be/src/olap/data_dir.cpp | 3 +--
be/src/olap/fs/fs_util.h | 2 +-
be/src/olap/hll.h | 2 +-
be/src/olap/in_list_predicate.cpp | 2 +-
be/src/olap/iterators.h | 4 ++--
be/src/olap/memtable.cpp | 4 ++--
be/src/olap/memtable.h | 4 ++--
be/src/olap/memtable_flush_executor.cpp | 2 +-
be/src/olap/merger.cpp | 4 ++--
be/src/olap/olap_define.h | 1 +
be/src/olap/page_cache.cpp | 1 +
be/src/olap/reader.h | 2 +-
be/src/olap/rowset/alpha_rowset.cpp | 3 ++-
be/src/olap/rowset/beta_rowset_reader.cpp | 6 +++---
be/src/olap/rowset/segment_v2/binary_dict_page.h | 5 +++--
be/src/olap/storage_migration_v2.cpp | 6 +++---
be/src/olap/tablet_manager.cpp | 6 +++---
be/src/olap/tablet_meta_manager.cpp | 3 ++-
be/src/olap/task/engine_batch_load_task.cpp | 2 +-
be/src/olap/task/engine_checksum_task.cpp | 2 +-
be/src/olap/tuple_reader.h | 2 +-
be/src/runtime/fold_constant_executor.cpp | 18 ++++++++----------
be/src/runtime/large_int_value.h | 2 +-
be/src/runtime/load_channel_mgr.h | 2 +-
be/src/runtime/minidump.cpp | 3 +--
be/src/runtime/mysql_result_writer.h | 1 -
be/src/runtime/odbc_table_sink.cpp | 2 +-
be/src/runtime/result_sink.cpp | 3 +--
be/src/runtime/row_batch.cpp | 2 +-
be/src/runtime/runtime_filter_mgr.h | 4 ++--
be/src/runtime/runtime_state.cpp | 3 ++-
be/src/runtime/stream_load/stream_load_recorder.cpp | 1 -
be/src/runtime/string_value.h | 2 +-
be/src/runtime/tablets_channel.cpp | 2 +-
be/src/runtime/tablets_channel.h | 5 ++---
be/src/service/brpc.h | 4 +++-
be/src/service/doris_main.cpp | 5 ++---
be/src/service/http_service.h | 2 +-
be/src/util/blocking_queue.hpp | 3 ++-
be/src/util/errno.cpp | 1 +
be/src/util/histogram.cpp | 3 ++-
be/src/util/histogram.h | 4 ++--
be/src/util/logging.h | 2 +-
be/src/util/lru_cache.hpp | 2 +-
be/src/util/md5.h | 1 +
be/src/util/s3_storage_backend.cpp | 2 +-
be/src/util/semaphore.hpp | 2 +-
be/src/util/simd/lower_upper_impl.h | 1 +
be/src/util/simd/vstring_function.h | 5 +++--
be/src/util/string_parser.hpp | 3 +--
be/src/util/topn_counter.cpp | 8 +++++---
.../aggregate_function_min_max_by.cpp | 2 +-
.../aggregate_functions/aggregate_function_window.h | 2 +-
be/src/vec/columns/column_decimal.cpp | 2 +-
be/src/vec/columns/column_decimal.h | 2 +-
be/src/vec/columns/column_dictionary.h | 8 ++++----
be/src/vec/columns/column_set.h | 1 -
be/src/vec/columns/column_vector.cpp | 2 +-
be/src/vec/columns/columns_common.cpp | 2 +-
be/src/vec/common/arena.h | 3 +--
be/src/vec/common/mremap.cpp | 7 ++++---
be/src/vec/common/string_buffer.hpp | 4 ++--
be/src/vec/core/accurate_comparison.h | 1 -
be/src/vec/core/sort_description.h | 4 ++--
be/src/vec/data_types/data_type_array.h | 2 +-
be/src/vec/data_types/data_type_date.cpp | 2 +-
be/src/vec/exec/vassert_num_rows_node.cpp | 2 +-
be/src/vec/exec/vblocking_join_node.h | 1 -
be/src/vec/exec/vbroker_scan_node.cpp | 2 +-
be/src/vec/exec/vbroker_scanner.cpp | 5 +++--
be/src/vec/exec/vexcept_node.cpp | 2 +-
be/src/vec/exec/volap_scanner.h | 1 -
be/src/vec/exec/vsort_exec_exprs.h | 2 +-
be/src/vec/exec/vsort_node.cpp | 1 -
be/src/vec/exec/vunion_node.cpp | 1 -
be/src/vec/exprs/vin_predicate.cpp | 1 -
be/src/vec/exprs/vinfo_func.h | 6 +++---
be/src/vec/exprs/vtuple_is_null_predicate.cpp | 1 -
be/src/vec/functions/function_bitmap.cpp | 2 +-
be/src/vec/functions/function_cast.cpp | 1 +
be/src/vec/functions/function_datetime_floor_ceil.cpp | 4 ++--
be/src/vec/functions/function_hex.cpp | 2 +-
be/src/vec/functions/hll_cardinality.cpp | 2 +-
be/src/vec/functions/hll_empty.cpp | 4 ++--
be/src/vec/functions/hll_hash.cpp | 2 +-
be/src/vec/functions/in.cpp | 1 -
be/src/vec/functions/is_null.cpp | 4 ++--
be/src/vec/functions/math.cpp | 3 +--
be/src/vec/functions/nullif.cpp | 8 ++++----
be/src/vec/olap/vcollect_iterator.cpp | 1 +
be/src/vec/runtime/vdata_stream_recvr.cpp | 1 -
be/src/vec/runtime/vdatetime_value.cpp | 2 +-
be/src/vec/runtime/vsorted_run_merger.h | 1 -
be/src/vec/sink/vtablet_sink.cpp | 6 +++---
be/test/exprs/mock_vexpr.h | 2 +-
.../vec/aggregate_functions/agg_min_max_by_test.cpp | 2 +-
be/test/vec/exec/vbroker_scan_node_test.cpp | 10 +++++-----
be/test/vec/exec/vbroker_scanner_test.cpp | 2 +-
125 files changed, 178 insertions(+), 177 deletions(-)
diff --git a/.clang-format b/.clang-format
index cc1893a5e1..3b8b5704b9 100644
--- a/.clang-format
+++ b/.clang-format
@@ -14,5 +14,3 @@ ReflowComments: false
SortUsingDeclarations: false
SpacesBeforeTrailingComments: 1
SpaceBeforeCpp11BracedList: true
-#ignore include sort cause adjustment order may leads to compilation failure
-SortIncludes: false
diff --git a/.gitignore b/.gitignore
index b4ca5eea74..a293775c31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ derby.log
dependency-reduced-pom.xml
package-lock.json
yarn.lock
+ut_dir
# ignore all sub `/bin` and `/build` directory
**/build/
diff --git a/be/src/common/configbase.h b/be/src/common/configbase.h
index 26a59de94a..8e8f13b5c0 100644
--- a/be/src/common/configbase.h
+++ b/be/src/common/configbase.h
@@ -18,12 +18,11 @@
#pragma once
#include <cstdint>
-
+#include <functional>
#include <map>
#include <mutex>
#include <string>
#include <vector>
-#include <functional>
namespace doris {
class Status;
diff --git a/be/src/common/signal_handler.h b/be/src/common/signal_handler.h
index 1c19acf15b..f8f5184415 100644
--- a/be/src/common/signal_handler.h
+++ b/be/src/common/signal_handler.h
@@ -33,10 +33,10 @@
#pragma once
-#include <boost/stacktrace.hpp>
#include <glog/logging.h>
#include <gutil/macros.h>
+#include <boost/stacktrace.hpp>
#include <csignal>
#include <ctime>
#ifdef HAVE_UCONTEXT_H
diff --git a/be/src/common/status.cpp b/be/src/common/status.cpp
index ec120dc396..a9ebd84da1 100644
--- a/be/src/common/status.cpp
+++ b/be/src/common/status.cpp
@@ -4,9 +4,10 @@
#include "common/status.h"
-#include <boost/stacktrace.hpp>
#include <glog/logging.h>
+#include <boost/stacktrace.hpp>
+
#include "gutil/strings/fastmem.h" // for memcpy_inlined
namespace doris {
diff --git a/be/src/common/status.h b/be/src/common/status.h
index f9bdfc7acf..562c61e480 100644
--- a/be/src/common/status.h
+++ b/be/src/common/status.h
@@ -5,13 +5,13 @@
#pragma once
#include <fmt/format.h>
+#include <glog/logging.h>
+
+#include <boost/stacktrace.hpp>
#include <iostream>
#include <string>
#include <vector>
-#include <boost/stacktrace.hpp>
-#include <glog/logging.h>
-
#include "common/compiler_util.h"
#include "common/logging.h"
#include "gen_cpp/Status_types.h" // for TStatus
diff --git a/be/src/env/env.cpp b/be/src/env/env.cpp
index 2503f1cde4..dab94e0401 100644
--- a/be/src/env/env.cpp
+++ b/be/src/env/env.cpp
@@ -15,8 +15,9 @@
// specific language governing permissions and limitations
// under the License.
-#include "common/config.h"
#include "env/env.h"
+
+#include "common/config.h"
#include "env/env_posix.h"
namespace doris {
diff --git a/be/src/env/env.h b/be/src/env/env.h
index e8d44917b0..e4c1ee55bb 100644
--- a/be/src/env/env.h
+++ b/be/src/env/env.h
@@ -14,8 +14,8 @@
#include "common/status.h"
#include "gen_cpp/AgentService_types.h"
-#include "gen_cpp/olap_file.pb.h"
#include "gen_cpp/Types_types.h"
+#include "gen_cpp/olap_file.pb.h"
#include "util/slice.h"
namespace doris {
diff --git a/be/src/exec/base_scanner.h b/be/src/exec/base_scanner.h
index 3facf8155a..9c4179874e 100644
--- a/be/src/exec/base_scanner.h
+++ b/be/src/exec/base_scanner.h
@@ -19,9 +19,9 @@
#include "common/status.h"
#include "exprs/expr.h"
-#include "vec/exprs/vexpr.h"
#include "runtime/tuple.h"
#include "util/runtime_profile.h"
+#include "vec/exprs/vexpr.h"
namespace doris {
diff --git a/be/src/exec/broker_scan_node.cpp b/be/src/exec/broker_scan_node.cpp
index e1dbd255ec..513e653fb7 100644
--- a/be/src/exec/broker_scan_node.cpp
+++ b/be/src/exec/broker_scan_node.cpp
@@ -21,7 +21,6 @@
#include <sstream>
#include "common/object_pool.h"
-#include "vec/exec/vbroker_scanner.h"
#include "exec/json_scanner.h"
#include "exec/orc_scanner.h"
#include "exec/parquet_scanner.h"
@@ -32,6 +31,7 @@
#include "runtime/runtime_state.h"
#include "util/runtime_profile.h"
#include "util/thread.h"
+#include "vec/exec/vbroker_scanner.h"
namespace doris {
diff --git a/be/src/exec/broker_scanner.cpp b/be/src/exec/broker_scanner.cpp
index d35e8428a4..c394424092 100644
--- a/be/src/exec/broker_scanner.cpp
+++ b/be/src/exec/broker_scanner.cpp
@@ -18,9 +18,11 @@
#include "exec/broker_scanner.h"
#include <fmt/format.h>
+
#include <iostream>
#include <sstream>
+#include "common/consts.h"
#include "exec/broker_reader.h"
#include "exec/buffered_reader.h"
#include "exec/decompressor.h"
@@ -38,7 +40,6 @@
#include "runtime/stream_load/stream_load_pipe.h"
#include "runtime/tuple.h"
#include "util/utf8_check.h"
-#include "common/consts.h"
namespace doris {
diff --git a/be/src/exec/data_sink.cpp b/be/src/exec/data_sink.cpp
index e9b6eefa26..f6c1d21aa7 100644
--- a/be/src/exec/data_sink.cpp
+++ b/be/src/exec/data_sink.cpp
@@ -37,12 +37,11 @@
#include "runtime/result_file_sink.h"
#include "runtime/result_sink.h"
#include "runtime/runtime_state.h"
-
#include "vec/sink/result_sink.h"
#include "vec/sink/vdata_stream_sender.h"
+#include "vec/sink/vmysql_table_sink.h"
#include "vec/sink/vmysql_table_writer.h"
#include "vec/sink/vtablet_sink.h"
-#include "vec/sink/vmysql_table_sink.h"
namespace doris {
diff --git a/be/src/exec/exec_node.cpp b/be/src/exec/exec_node.cpp
index 1603324fcf..4dbd827605 100644
--- a/be/src/exec/exec_node.cpp
+++ b/be/src/exec/exec_node.cpp
@@ -67,6 +67,7 @@
#include "vec/exec/vaggregation_node.h"
#include "vec/exec/vanalytic_eval_node.h"
#include "vec/exec/vassert_num_rows_node.h"
+#include "vec/exec/vbroker_scan_node.h"
#include "vec/exec/vcross_join_node.h"
#include "vec/exec/vempty_set_node.h"
#include "vec/exec/ves_http_scan_node.h"
@@ -82,7 +83,6 @@
#include "vec/exec/vsort_node.h"
#include "vec/exec/vtable_function_node.h"
#include "vec/exec/vunion_node.h"
-#include "vec/exec/vbroker_scan_node.h"
#include "vec/exprs/vexpr.h"
namespace doris {
diff --git a/be/src/exec/json_scanner.cpp b/be/src/exec/json_scanner.cpp
index 9a58c0fae7..5e002ac44e 100644
--- a/be/src/exec/json_scanner.cpp
+++ b/be/src/exec/json_scanner.cpp
@@ -17,9 +17,10 @@
#include "exec/json_scanner.h"
-#include <algorithm>
#include <fmt/format.h>
+#include <algorithm>
+
#include "env/env.h"
#include "exec/broker_reader.h"
#include "exec/buffered_reader.h"
diff --git a/be/src/exec/olap_common.h b/be/src/exec/olap_common.h
index 737ebf1c27..70583e6bd8 100644
--- a/be/src/exec/olap_common.h
+++ b/be/src/exec/olap_common.h
@@ -18,12 +18,12 @@
#pragma once
#include <stdint.h>
-#include <variant>
#include <boost/lexical_cast.hpp>
#include <map>
#include <sstream>
#include <string>
+#include <variant>
#include "common/logging.h"
#include "exec/olap_utils.h"
diff --git a/be/src/exec/olap_scanner.h b/be/src/exec/olap_scanner.h
index 6fc9504318..21f11652b1 100644
--- a/be/src/exec/olap_scanner.h
+++ b/be/src/exec/olap_scanner.h
@@ -32,9 +32,9 @@
#include "gen_cpp/PlanNodes_types.h"
#include "olap/delete_handler.h"
#include "olap/olap_cond.h"
-#include "olap/tuple_reader.h"
#include "olap/rowset/column_data.h"
#include "olap/storage_engine.h"
+#include "olap/tuple_reader.h"
#include "runtime/descriptors.h"
#include "runtime/tuple.h"
#include "runtime/vectorized_row_batch.h"
diff --git a/be/src/exec/schema_scanner/schema_statistics_scanner.cpp b/be/src/exec/schema_scanner/schema_statistics_scanner.cpp
index 26ef280214..51835ed22a 100644
--- a/be/src/exec/schema_scanner/schema_statistics_scanner.cpp
+++ b/be/src/exec/schema_scanner/schema_statistics_scanner.cpp
@@ -16,6 +16,7 @@
// under the License.
#include "exec/schema_scanner/schema_statistics_scanner.h"
+
#include "runtime/primitive_type.h"
#include "runtime/string_value.h"
diff --git a/be/src/exec/tablet_info.h b/be/src/exec/tablet_info.h
index 3aad1f6c7c..40279a70fe 100644
--- a/be/src/exec/tablet_info.h
+++ b/be/src/exec/tablet_info.h
@@ -30,7 +30,6 @@
#include "runtime/descriptors.h"
#include "runtime/raw_value.h"
#include "runtime/tuple.h"
-
#include "vec/core/block.h"
namespace doris {
diff --git a/be/src/exec/tablet_sink.cpp b/be/src/exec/tablet_sink.cpp
index 4f3cfaaef6..1aa1bc5d5a 100644
--- a/be/src/exec/tablet_sink.cpp
+++ b/be/src/exec/tablet_sink.cpp
@@ -40,7 +40,6 @@
#include "util/threadpool.h"
#include "util/time.h"
#include "util/uid_util.h"
-
#include "vec/core/block.h"
#include "vec/sink/vtablet_sink.h"
diff --git a/be/src/exprs/agg_fn_evaluator.h b/be/src/exprs/agg_fn_evaluator.h
index f3f9dc96ac..10e450d504 100644
--- a/be/src/exprs/agg_fn_evaluator.h
+++ b/be/src/exprs/agg_fn_evaluator.h
@@ -23,13 +23,13 @@
#include <string>
#include <vector>
-#include "gen_cpp/Exprs_types.h"
-#include "udf/udf.h"
#include "exprs/expr_context.h"
#include "exprs/hybrid_map.h"
+#include "gen_cpp/Exprs_types.h"
#include "runtime/descriptors.h"
#include "runtime/runtime_state.h"
#include "runtime/tuple.h"
+#include "udf/udf.h"
#include "util/hash_util.hpp"
namespace doris {
diff --git a/be/src/exprs/hll_function.h b/be/src/exprs/hll_function.h
index 81d5cefdfa..9cce923452 100644
--- a/be/src/exprs/hll_function.h
+++ b/be/src/exprs/hll_function.h
@@ -18,6 +18,7 @@
#pragma once
#include <string>
+
#include "udf/udf.h"
namespace doris {
diff --git a/be/src/http/action/stream_load.cpp b/be/src/http/action/stream_load.cpp
index d0a1693440..583026d69f 100644
--- a/be/src/http/action/stream_load.cpp
+++ b/be/src/http/action/stream_load.cpp
@@ -28,6 +28,7 @@
#include <rapidjson/prettywriter.h>
#include <thrift/protocol/TDebugProtocol.h>
+#include "common/consts.h"
#include "common/logging.h"
#include "common/utils.h"
#include "gen_cpp/FrontendService.h"
@@ -59,7 +60,6 @@
#include "util/thrift_rpc_helper.h"
#include "util/time.h"
#include "util/uid_util.h"
-#include "common/consts.h"
namespace doris {
diff --git a/be/src/http/action/stream_load_2pc.h b/be/src/http/action/stream_load_2pc.h
index 63791e2e83..304e6a902f 100644
--- a/be/src/http/action/stream_load_2pc.h
+++ b/be/src/http/action/stream_load_2pc.h
@@ -18,6 +18,7 @@
#pragma once
#include <string>
+
#include "http/http_handler.h"
namespace doris {
diff --git a/be/src/http/action/tablets_distribution_action.h b/be/src/http/action/tablets_distribution_action.h
index 4cbc25e9ec..218882d6c2 100644
--- a/be/src/http/action/tablets_distribution_action.h
+++ b/be/src/http/action/tablets_distribution_action.h
@@ -17,9 +17,10 @@
#pragma once
+#include <string>
+
#include "http/http_handler.h"
#include "util/easy_json.h"
-#include <string>
namespace doris {
diff --git a/be/src/http/http_parser.h b/be/src/http/http_parser.h
index 304a6a9ac9..4e0ddd1fb1 100644
--- a/be/src/http/http_parser.h
+++ b/be/src/http/http_parser.h
@@ -17,8 +17,9 @@
#pragma once
-#include <stdint.h>
#include <stddef.h>
+#include <stdint.h>
+
#include <ostream>
namespace doris {
diff --git a/be/src/olap/bloom_filter.hpp b/be/src/olap/bloom_filter.hpp
index 824806f8f5..5c7cb5f9e6 100644
--- a/be/src/olap/bloom_filter.hpp
+++ b/be/src/olap/bloom_filter.hpp
@@ -20,8 +20,8 @@
#include <math.h>
-#include <string>
#include <sstream>
+#include <string>
#include "olap/olap_define.h"
#include "olap/utils.h"
diff --git a/be/src/olap/bloom_filter_predicate.h b/be/src/olap/bloom_filter_predicate.h
index 6a1c1d0856..a28d31249c 100644
--- a/be/src/olap/bloom_filter_predicate.h
+++ b/be/src/olap/bloom_filter_predicate.h
@@ -26,11 +26,11 @@
#include "olap/field.h"
#include "runtime/string_value.hpp"
#include "runtime/vectorized_row_batch.h"
+#include "vec/columns/column_dictionary.h"
#include "vec/columns/column_nullable.h"
#include "vec/columns/column_vector.h"
#include "vec/columns/predicate_column.h"
#include "vec/utils/util.hpp"
-#include "vec/columns/column_dictionary.h"
namespace doris {
diff --git a/be/src/olap/data_dir.cpp b/be/src/olap/data_dir.cpp
index 558e6a2a72..0383ca5eb2 100644
--- a/be/src/olap/data_dir.cpp
+++ b/be/src/olap/data_dir.cpp
@@ -23,8 +23,8 @@
#include <sys/file.h>
#include <sys/statfs.h>
#include <utime.h>
-#include <atomic>
+#include <atomic>
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/algorithm/string/split.hpp>
@@ -47,7 +47,6 @@
#include "util/file_utils.h"
#include "util/storage_backend.h"
#include "util/storage_backend_mgr.h"
-
#include "util/string_util.h"
using strings::Substitute;
diff --git a/be/src/olap/fs/fs_util.h b/be/src/olap/fs/fs_util.h
index 27d7fd37bf..7864037791 100644
--- a/be/src/olap/fs/fs_util.h
+++ b/be/src/olap/fs/fs_util.h
@@ -19,8 +19,8 @@
#include "common/status.h"
#include "gen_cpp/AgentService_types.h"
-#include "gen_cpp/olap_file.pb.h"
#include "gen_cpp/Types_types.h"
+#include "gen_cpp/olap_file.pb.h"
#include "olap/fs/block_manager.h"
namespace doris {
diff --git a/be/src/olap/hll.h b/be/src/olap/hll.h
index 70365fec9f..02368d6f67 100644
--- a/be/src/olap/hll.h
+++ b/be/src/olap/hll.h
@@ -18,12 +18,12 @@
#pragma once
#include <math.h>
+#include <parallel_hashmap/phmap.h>
#include <stdio.h>
#include <map>
#include <set>
#include <string>
-#include <parallel_hashmap/phmap.h>
#ifdef __x86_64__
#include <immintrin.h>
diff --git a/be/src/olap/in_list_predicate.cpp b/be/src/olap/in_list_predicate.cpp
index 4133f7d064..b33ef09c49 100644
--- a/be/src/olap/in_list_predicate.cpp
+++ b/be/src/olap/in_list_predicate.cpp
@@ -21,8 +21,8 @@
#include "runtime/string_value.hpp"
#include "runtime/vectorized_row_batch.h"
#include "vec/columns/column_dictionary.h"
-#include "vec/columns/predicate_column.h"
#include "vec/columns/column_nullable.h"
+#include "vec/columns/predicate_column.h"
namespace doris {
diff --git a/be/src/olap/iterators.h b/be/src/olap/iterators.h
index c13b8d894d..638069465c 100644
--- a/be/src/olap/iterators.h
+++ b/be/src/olap/iterators.h
@@ -20,9 +20,9 @@
#include <memory>
#include "common/status.h"
-#include "olap/olap_common.h"
-#include "olap/column_predicate.h"
#include "olap/block_column_predicate.h"
+#include "olap/column_predicate.h"
+#include "olap/olap_common.h"
#include "vec/core/block.h"
namespace doris {
diff --git a/be/src/olap/memtable.cpp b/be/src/olap/memtable.cpp
index 7b9521e775..eba4e7e733 100644
--- a/be/src/olap/memtable.cpp
+++ b/be/src/olap/memtable.cpp
@@ -24,9 +24,9 @@
#include "olap/schema.h"
#include "runtime/tuple.h"
#include "util/doris_metrics.h"
-#include "vec/core/field.h"
-#include "vec/aggregate_functions/aggregate_function_simple_factory.h"
#include "vec/aggregate_functions/aggregate_function_reader.h"
+#include "vec/aggregate_functions/aggregate_function_simple_factory.h"
+#include "vec/core/field.h"
namespace doris {
diff --git a/be/src/olap/memtable.h b/be/src/olap/memtable.h
index 4922bb62cd..910cd92270 100644
--- a/be/src/olap/memtable.h
+++ b/be/src/olap/memtable.h
@@ -24,9 +24,9 @@
#include "olap/skiplist.h"
#include "runtime/mem_tracker.h"
#include "util/tuple_row_zorder_compare.h"
-#include "vec/core/block.h"
-#include "vec/common/string_ref.h"
#include "vec/aggregate_functions/aggregate_function.h"
+#include "vec/common/string_ref.h"
+#include "vec/core/block.h"
namespace doris {
diff --git a/be/src/olap/memtable_flush_executor.cpp b/be/src/olap/memtable_flush_executor.cpp
index 1b25c07197..30c8852904 100644
--- a/be/src/olap/memtable_flush_executor.cpp
+++ b/be/src/olap/memtable_flush_executor.cpp
@@ -20,9 +20,9 @@
#include <functional>
#include "olap/memtable.h"
+#include "runtime/thread_context.h"
#include "util/scoped_cleanup.h"
#include "util/time.h"
-#include "runtime/thread_context.h"
namespace doris {
diff --git a/be/src/olap/merger.cpp b/be/src/olap/merger.cpp
index f55b08f437..c9fec74b25 100644
--- a/be/src/olap/merger.cpp
+++ b/be/src/olap/merger.cpp
@@ -21,11 +21,11 @@
#include <vector>
#include "olap/olap_define.h"
-#include "olap/tuple_reader.h"
-#include "vec/olap/block_reader.h"
#include "olap/row_cursor.h"
#include "olap/tablet.h"
+#include "olap/tuple_reader.h"
#include "util/trace.h"
+#include "vec/olap/block_reader.h"
namespace doris {
diff --git a/be/src/olap/olap_define.h b/be/src/olap/olap_define.h
index 6fb4b6cb21..fa8b2efd5f 100644
--- a/be/src/olap/olap_define.h
+++ b/be/src/olap/olap_define.h
@@ -22,6 +22,7 @@
#include <cstdlib>
#include <sstream>
#include <string>
+
#include "common/status.h"
namespace doris {
diff --git a/be/src/olap/page_cache.cpp b/be/src/olap/page_cache.cpp
index 6e6d2cfa29..c1b0aac1d8 100644
--- a/be/src/olap/page_cache.cpp
+++ b/be/src/olap/page_cache.cpp
@@ -16,6 +16,7 @@
// under the License.
#include "olap/page_cache.h"
+
#include "runtime/thread_context.h"
namespace doris {
diff --git a/be/src/olap/reader.h b/be/src/olap/reader.h
index 07fe87c81a..6b6650d80a 100644
--- a/be/src/olap/reader.h
+++ b/be/src/olap/reader.h
@@ -30,8 +30,8 @@
#include <vector>
#include "exprs/bloomfilter_predicate.h"
-#include "olap/column_predicate.h"
#include "olap/collect_iterator.h"
+#include "olap/column_predicate.h"
#include "olap/delete_handler.h"
#include "olap/olap_cond.h"
#include "olap/olap_define.h"
diff --git a/be/src/olap/rowset/alpha_rowset.cpp b/be/src/olap/rowset/alpha_rowset.cpp
index 4815ddf0a9..7f2e74c744 100644
--- a/be/src/olap/rowset/alpha_rowset.cpp
+++ b/be/src/olap/rowset/alpha_rowset.cpp
@@ -17,12 +17,13 @@
#include "olap/rowset/alpha_rowset.h"
+#include <util/file_utils.h>
+
#include "olap/row.h"
#include "olap/rowset/alpha_rowset_meta.h"
#include "olap/rowset/alpha_rowset_reader.h"
#include "olap/rowset/rowset_meta_manager.h"
#include "util/hash_util.hpp"
-#include <util/file_utils.h>
namespace doris {
diff --git a/be/src/olap/rowset/beta_rowset_reader.cpp b/be/src/olap/rowset/beta_rowset_reader.cpp
index ff16611528..9ab47159a8 100644
--- a/be/src/olap/rowset/beta_rowset_reader.cpp
+++ b/be/src/olap/rowset/beta_rowset_reader.cpp
@@ -16,18 +16,18 @@
// under the License.
#include "beta_rowset_reader.h"
+
#include <utility>
+
#include "olap/delete_handler.h"
#include "olap/generic_iterators.h"
-#include "vec/olap/vgeneric_iterators.h"
-
#include "olap/row_block.h"
#include "olap/row_block2.h"
#include "olap/row_cursor.h"
#include "olap/rowset/segment_v2/segment_iterator.h"
#include "olap/schema.h"
-
#include "vec/core/block.h"
+#include "vec/olap/vgeneric_iterators.h"
namespace doris {
diff --git a/be/src/olap/rowset/segment_v2/binary_dict_page.h b/be/src/olap/rowset/segment_v2/binary_dict_page.h
index fbe046caac..5fc4636c91 100644
--- a/be/src/olap/rowset/segment_v2/binary_dict_page.h
+++ b/be/src/olap/rowset/segment_v2/binary_dict_page.h
@@ -17,10 +17,11 @@
#pragma once
+#include <parallel_hashmap/phmap.h>
+
#include <functional>
#include <memory>
#include <string>
-#include <parallel_hashmap/phmap.h>
#include "gen_cpp/segment_v2.pb.h"
#include "gutil/hash/string_hash.h"
@@ -28,11 +29,11 @@
#include "olap/column_vector.h"
#include "olap/olap_common.h"
#include "olap/rowset/segment_v2/binary_plain_page.h"
+#include "olap/rowset/segment_v2/bitshuffle_page.h"
#include "olap/rowset/segment_v2/common.h"
#include "olap/rowset/segment_v2/options.h"
#include "olap/types.h"
#include "runtime/mem_pool.h"
-#include "olap/rowset/segment_v2/bitshuffle_page.h"
namespace doris {
namespace segment_v2 {
diff --git a/be/src/olap/storage_migration_v2.cpp b/be/src/olap/storage_migration_v2.cpp
index 180919a9ae..7c45be6b6d 100644
--- a/be/src/olap/storage_migration_v2.cpp
+++ b/be/src/olap/storage_migration_v2.cpp
@@ -22,9 +22,6 @@
#include <algorithm>
#include <vector>
-#include "rapidjson/document.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/stringbuffer.h"
#include "agent/cgroups_mgr.h"
#include "common/resource_tls.h"
@@ -38,6 +35,9 @@
#include "olap/storage_engine.h"
#include "olap/tablet.h"
#include "olap/wrapper_field.h"
+#include "rapidjson/document.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/stringbuffer.h"
#include "runtime/exec_env.h"
#include "runtime/thread_context.h"
#include "util/defer_op.h"
diff --git a/be/src/olap/tablet_manager.cpp b/be/src/olap/tablet_manager.cpp
index 5c4da665ea..331e5e3be4 100644
--- a/be/src/olap/tablet_manager.cpp
+++ b/be/src/olap/tablet_manager.cpp
@@ -28,9 +28,6 @@
#include <cstdio>
#include <cstdlib>
#include <filesystem>
-#include "rapidjson/document.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/stringbuffer.h"
#include "env/env.h"
#include "env/env_util.h"
@@ -49,6 +46,9 @@
#include "olap/tablet_meta.h"
#include "olap/tablet_meta_manager.h"
#include "olap/utils.h"
+#include "rapidjson/document.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/stringbuffer.h"
#include "runtime/thread_context.h"
#include "service/backend_options.h"
#include "util/doris_metrics.h"
diff --git a/be/src/olap/tablet_meta_manager.cpp b/be/src/olap/tablet_meta_manager.cpp
index 80b07e4475..f704532e73 100644
--- a/be/src/olap/tablet_meta_manager.cpp
+++ b/be/src/olap/tablet_meta_manager.cpp
@@ -17,8 +17,9 @@
#include "olap/tablet_meta_manager.h"
-#include <boost/algorithm/string/trim.hpp>
#include <fmt/format.h>
+
+#include <boost/algorithm/string/trim.hpp>
#include <fstream>
#include <sstream>
#include <string>
diff --git a/be/src/olap/task/engine_batch_load_task.cpp b/be/src/olap/task/engine_batch_load_task.cpp
index 13052c5784..5123db1d14 100644
--- a/be/src/olap/task/engine_batch_load_task.cpp
+++ b/be/src/olap/task/engine_batch_load_task.cpp
@@ -35,9 +35,9 @@
#include "olap/push_handler.h"
#include "olap/storage_engine.h"
#include "olap/tablet.h"
+#include "runtime/thread_context.h"
#include "util/doris_metrics.h"
#include "util/pretty_printer.h"
-#include "runtime/thread_context.h"
using apache::thrift::ThriftDebugString;
using std::list;
diff --git a/be/src/olap/task/engine_checksum_task.cpp b/be/src/olap/task/engine_checksum_task.cpp
index 92d6848b55..30ef01bc7e 100644
--- a/be/src/olap/task/engine_checksum_task.cpp
+++ b/be/src/olap/task/engine_checksum_task.cpp
@@ -18,8 +18,8 @@
#include "olap/task/engine_checksum_task.h"
#include "olap/row.h"
-#include "runtime/thread_context.h"
#include "olap/tuple_reader.h"
+#include "runtime/thread_context.h"
namespace doris {
diff --git a/be/src/olap/tuple_reader.h b/be/src/olap/tuple_reader.h
index d28a93d766..1475bec1b2 100644
--- a/be/src/olap/tuple_reader.h
+++ b/be/src/olap/tuple_reader.h
@@ -30,9 +30,9 @@
#include <vector>
#include "exprs/bloomfilter_predicate.h"
+#include "olap/collect_iterator.h"
#include "olap/column_predicate.h"
#include "olap/delete_handler.h"
-#include "olap/collect_iterator.h"
#include "olap/olap_cond.h"
#include "olap/olap_define.h"
#include "olap/reader.h"
diff --git a/be/src/runtime/fold_constant_executor.cpp b/be/src/runtime/fold_constant_executor.cpp
index 4707622c72..a10a0c5f8c 100644
--- a/be/src/runtime/fold_constant_executor.cpp
+++ b/be/src/runtime/fold_constant_executor.cpp
@@ -19,22 +19,20 @@
#include <map>
-#include "runtime/tuple_row.h"
+#include "common/object_pool.h"
+#include "common/status.h"
+#include "exprs/expr.h"
+#include "exprs/expr_context.h"
+#include "gen_cpp/PaloInternalService_types.h"
+#include "gen_cpp/internal_service.pb.h"
#include "runtime/exec_env.h"
+#include "runtime/mem_tracker.h"
#include "runtime/runtime_state.h"
#include "runtime/thread_context.h"
-#include "runtime/mem_tracker.h"
-#include "exprs/expr_context.h"
-#include "exprs/expr.h"
-#include "common/object_pool.h"
-#include "common/status.h"
-
+#include "runtime/tuple_row.h"
#include "vec/exprs/vexpr.h"
#include "vec/exprs/vexpr_context.h"
-#include "gen_cpp/internal_service.pb.h"
-#include "gen_cpp/PaloInternalService_types.h"
-
using std::string;
using std::map;
diff --git a/be/src/runtime/large_int_value.h b/be/src/runtime/large_int_value.h
index 68c1d47836..d7344aa917 100644
--- a/be/src/runtime/large_int_value.h
+++ b/be/src/runtime/large_int_value.h
@@ -17,11 +17,11 @@
#pragma once
+#include <fmt/format.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <fmt/format.h>
#include <iostream>
#include <sstream>
#include <string>
diff --git a/be/src/runtime/load_channel_mgr.h b/be/src/runtime/load_channel_mgr.h
index 121a9ae274..7e1c4450f0 100644
--- a/be/src/runtime/load_channel_mgr.h
+++ b/be/src/runtime/load_channel_mgr.h
@@ -28,13 +28,13 @@
#include "gen_cpp/Types_types.h"
#include "gen_cpp/internal_service.pb.h"
#include "gutil/ref_counted.h"
+#include "olap/lru_cache.h"
#include "runtime/load_channel.h"
#include "runtime/tablets_channel.h"
#include "runtime/thread_context.h"
#include "util/countdown_latch.h"
#include "util/thread.h"
#include "util/uid_util.h"
-#include "olap/lru_cache.h"
namespace doris {
diff --git a/be/src/runtime/minidump.cpp b/be/src/runtime/minidump.cpp
index bdcd6e9fa3..cf1f0611f6 100644
--- a/be/src/runtime/minidump.cpp
+++ b/be/src/runtime/minidump.cpp
@@ -20,13 +20,12 @@
#include <sys/stat.h>
#include <unistd.h>
+#include "client/linux/handler/exception_handler.h"
#include "common/config.h"
#include "env/env.h"
#include "util/file_utils.h"
#include "util/string_util.h"
-#include "client/linux/handler/exception_handler.h"
-
namespace doris {
int Minidump::_signo = SIGUSR1;
diff --git a/be/src/runtime/mysql_result_writer.h b/be/src/runtime/mysql_result_writer.h
index 8b96fec555..14f4ce7c99 100644
--- a/be/src/runtime/mysql_result_writer.h
+++ b/be/src/runtime/mysql_result_writer.h
@@ -20,7 +20,6 @@
#include "primitive_type.h"
#include "runtime/result_writer.h"
#include "runtime/runtime_state.h"
-
#include "vec/data_types/data_type.h"
namespace doris {
diff --git a/be/src/runtime/odbc_table_sink.cpp b/be/src/runtime/odbc_table_sink.cpp
index e95f893ad7..2bfa9ad64e 100644
--- a/be/src/runtime/odbc_table_sink.cpp
+++ b/be/src/runtime/odbc_table_sink.cpp
@@ -21,8 +21,8 @@
#include "exprs/expr.h"
#include "runtime/runtime_state.h"
-#include "util/runtime_profile.h"
#include "util/debug_util.h"
+#include "util/runtime_profile.h"
namespace doris {
diff --git a/be/src/runtime/result_sink.cpp b/be/src/runtime/result_sink.cpp
index b0d9c5f85a..cefe5d2181 100644
--- a/be/src/runtime/result_sink.cpp
+++ b/be/src/runtime/result_sink.cpp
@@ -23,13 +23,12 @@
#include "runtime/exec_env.h"
#include "runtime/file_result_writer.h"
#include "runtime/mem_tracker.h"
-#include "runtime/thread_context.h"
#include "runtime/mysql_result_writer.h"
#include "runtime/result_buffer_mgr.h"
#include "runtime/row_batch.h"
#include "runtime/runtime_state.h"
+#include "runtime/thread_context.h"
#include "util/uid_util.h"
-
#include "vec/exprs/vexpr.h"
namespace doris {
diff --git a/be/src/runtime/row_batch.cpp b/be/src/runtime/row_batch.cpp
index 54b2e7680e..520a5642f9 100644
--- a/be/src/runtime/row_batch.cpp
+++ b/be/src/runtime/row_batch.cpp
@@ -30,8 +30,8 @@
#include "runtime/collection_value.h"
#include "runtime/exec_env.h"
#include "runtime/runtime_state.h"
-#include "runtime/thread_context.h"
#include "runtime/string_value.h"
+#include "runtime/thread_context.h"
#include "runtime/tuple_row.h"
#include "vec/columns/column_vector.h"
#include "vec/core/block.h"
diff --git a/be/src/runtime/runtime_filter_mgr.h b/be/src/runtime/runtime_filter_mgr.h
index 8ccbb357d5..06f2ee6dd2 100644
--- a/be/src/runtime/runtime_filter_mgr.h
+++ b/be/src/runtime/runtime_filter_mgr.h
@@ -26,10 +26,10 @@
#include "common/object_pool.h"
#include "common/status.h"
#include "exprs/runtime_filter.h"
-#include "util/time.h"
-#include "util/uid_util.h"
#include "gen_cpp/PaloInternalService_types.h"
#include "gen_cpp/PlanNodes_types.h"
+#include "util/time.h"
+#include "util/uid_util.h"
namespace doris {
class TUniqueId;
diff --git a/be/src/runtime/runtime_state.cpp b/be/src/runtime/runtime_state.cpp
index 74e89873fd..3c9c81b0c7 100644
--- a/be/src/runtime/runtime_state.cpp
+++ b/be/src/runtime/runtime_state.cpp
@@ -20,8 +20,9 @@
#include "runtime/runtime_state.h"
-#include <boost/algorithm/string/join.hpp>
#include <fmt/format.h>
+
+#include <boost/algorithm/string/join.hpp>
#include <sstream>
#include <string>
diff --git a/be/src/runtime/stream_load/stream_load_recorder.cpp b/be/src/runtime/stream_load/stream_load_recorder.cpp
index 83ed85d234..46d0225e81 100644
--- a/be/src/runtime/stream_load/stream_load_recorder.cpp
+++ b/be/src/runtime/stream_load/stream_load_recorder.cpp
@@ -20,7 +20,6 @@
#include "common/config.h"
#include "common/status.h"
#include "rocksdb/db.h"
-
#include "rocksdb/options.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
diff --git a/be/src/runtime/string_value.h b/be/src/runtime/string_value.h
index 3c879383f8..f15b26571e 100644
--- a/be/src/runtime/string_value.h
+++ b/be/src/runtime/string_value.h
@@ -23,8 +23,8 @@
#include <string.h>
#include "udf/udf.h"
-#include "util/hash_util.hpp"
#include "util/cpu_info.h"
+#include "util/hash_util.hpp"
#include "vec/common/string_ref.h"
#ifdef __SSE4_2__
#include "util/sse_util.hpp"
diff --git a/be/src/runtime/tablets_channel.cpp b/be/src/runtime/tablets_channel.cpp
index 2ede953835..bc3535e88b 100644
--- a/be/src/runtime/tablets_channel.cpp
+++ b/be/src/runtime/tablets_channel.cpp
@@ -20,8 +20,8 @@
#include "exec/tablet_info.h"
#include "olap/memtable.h"
#include "runtime/row_batch.h"
-#include "runtime/tuple_row.h"
#include "runtime/thread_context.h"
+#include "runtime/tuple_row.h"
#include "util/doris_metrics.h"
namespace doris {
diff --git a/be/src/runtime/tablets_channel.h b/be/src/runtime/tablets_channel.h
index 5934c40108..5ad955c61c 100644
--- a/be/src/runtime/tablets_channel.h
+++ b/be/src/runtime/tablets_channel.h
@@ -25,16 +25,15 @@
#include "gen_cpp/PaloInternalService_types.h"
#include "gen_cpp/Types_types.h"
#include "gen_cpp/internal_service.pb.h"
+#include "gutil/strings/substitute.h"
+#include "olap/delta_writer.h"
#include "runtime/descriptors.h"
#include "runtime/mem_tracker.h"
#include "runtime/thread_context.h"
#include "util/bitmap.h"
#include "util/priority_thread_pool.hpp"
#include "util/uid_util.h"
-#include "gutil/strings/substitute.h"
-
#include "vec/core/block.h"
-#include "olap/delta_writer.h"
namespace doris {
diff --git a/be/src/service/brpc.h b/be/src/service/brpc.h
index 6e1b348ac7..932c130ef6 100644
--- a/be/src/service/brpc.h
+++ b/be/src/service/brpc.h
@@ -20,7 +20,9 @@
// all header need by brpc is contain in this file.
// include this file instead of include <brpc/xxx.h>.
-#include <service/brpc_conflict.h>
+// clang-format off
+#include "service/brpc_conflict.h"
+// clang-format on
#include <brpc/channel.h>
#include <brpc/closure_guard.h>
diff --git a/be/src/service/doris_main.cpp b/be/src/service/doris_main.cpp
index 259276809c..dd8804a56d 100644
--- a/be/src/service/doris_main.cpp
+++ b/be/src/service/doris_main.cpp
@@ -15,17 +15,16 @@
// specific language governing permissions and limitations
// under the License.
+#include <errno.h>
#include <gperftools/malloc_extension.h>
+#include <setjmp.h>
#include <sys/file.h>
#include <unistd.h>
#include <condition_variable>
#include <cstring>
-#include <errno.h>
#include <mutex>
-#include <setjmp.h>
#include <thread>
-#include <unistd.h>
#include <unordered_map>
#include "util/jni-util.h"
diff --git a/be/src/service/http_service.h b/be/src/service/http_service.h
index d319ea2b48..dea8c4141c 100644
--- a/be/src/service/http_service.h
+++ b/be/src/service/http_service.h
@@ -19,8 +19,8 @@
#include <memory>
-#include "common/status.h"
#include "common/object_pool.h"
+#include "common/status.h"
namespace doris {
diff --git a/be/src/util/blocking_queue.hpp b/be/src/util/blocking_queue.hpp
index 934c240f54..7ba33c37f1 100644
--- a/be/src/util/blocking_queue.hpp
+++ b/be/src/util/blocking_queue.hpp
@@ -20,9 +20,10 @@
#pragma once
-#include <list>
#include <unistd.h>
+
#include <condition_variable>
+#include <list>
#include <mutex>
#include "common/logging.h"
diff --git a/be/src/util/errno.cpp b/be/src/util/errno.cpp
index 3be386ddab..9e74ef7246 100644
--- a/be/src/util/errno.cpp
+++ b/be/src/util/errno.cpp
@@ -18,6 +18,7 @@
#include "util/errno.h"
#include <features.h>
+
#include <cstring>
#include "gutil/dynamic_annotations.h"
diff --git a/be/src/util/histogram.cpp b/be/src/util/histogram.cpp
index a081d0e012..082b87b517 100644
--- a/be/src/util/histogram.cpp
+++ b/be/src/util/histogram.cpp
@@ -18,9 +18,10 @@
#include "util/histogram.h"
#include <stdio.h>
-#include <limits>
+
#include <cinttypes>
#include <cmath>
+#include <limits>
namespace doris {
diff --git a/be/src/util/histogram.h b/be/src/util/histogram.h
index 4eea65f81a..c8dd6b8ed8 100644
--- a/be/src/util/histogram.h
+++ b/be/src/util/histogram.h
@@ -17,10 +17,10 @@
#pragma once
+#include <atomic>
+#include <map>
#include <string>
#include <vector>
-#include <map>
-#include <atomic>
#include "common/logging.h"
diff --git a/be/src/util/logging.h b/be/src/util/logging.h
index 605ddf14d6..1ae2230b65 100644
--- a/be/src/util/logging.h
+++ b/be/src/util/logging.h
@@ -24,8 +24,8 @@
#include <string>
#include "common/logging.h"
-#include "util/uid_util.h"
#include "gutil/walltime.h"
+#include "util/uid_util.h"
namespace doris {
diff --git a/be/src/util/lru_cache.hpp b/be/src/util/lru_cache.hpp
index 459acf0a14..c3c51e20ae 100644
--- a/be/src/util/lru_cache.hpp
+++ b/be/src/util/lru_cache.hpp
@@ -17,9 +17,9 @@
#pragma once
+#include <iterator>
#include <list>
#include <unordered_map>
-#include <iterator>
namespace doris {
diff --git a/be/src/util/md5.h b/be/src/util/md5.h
index 064040c859..b6dca97c2b 100644
--- a/be/src/util/md5.h
+++ b/be/src/util/md5.h
@@ -19,6 +19,7 @@
#include <openssl/md5.h>
#include <stddef.h>
+
#include <string>
namespace doris {
diff --git a/be/src/util/s3_storage_backend.cpp b/be/src/util/s3_storage_backend.cpp
index cb37d50963..ebbaa01cdd 100644
--- a/be/src/util/s3_storage_backend.cpp
+++ b/be/src/util/s3_storage_backend.cpp
@@ -24,8 +24,8 @@
#include <aws/s3/model/HeadObjectRequest.h>
#include <aws/s3/model/ListObjectsRequest.h>
#include <aws/s3/model/PutObjectRequest.h>
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string.hpp>
#include <filesystem>
#include <fstream>
#include <iostream>
diff --git a/be/src/util/semaphore.hpp b/be/src/util/semaphore.hpp
index 7be2f40df7..9b81a5a45a 100644
--- a/be/src/util/semaphore.hpp
+++ b/be/src/util/semaphore.hpp
@@ -17,8 +17,8 @@
#pragma once
-#include <mutex>
#include <condition_variable>
+#include <mutex>
namespace {
diff --git a/be/src/util/simd/lower_upper_impl.h b/be/src/util/simd/lower_upper_impl.h
index 5f475de95f..8c1367eb0d 100644
--- a/be/src/util/simd/lower_upper_impl.h
+++ b/be/src/util/simd/lower_upper_impl.h
@@ -21,6 +21,7 @@
#include <emmintrin.h>
#endif
#include <stdint.h>
+
#include <iostream>
#include <string>
diff --git a/be/src/util/simd/vstring_function.h b/be/src/util/simd/vstring_function.h
index a74a4f0ca6..6edf3564a3 100644
--- a/be/src/util/simd/vstring_function.h
+++ b/be/src/util/simd/vstring_function.h
@@ -17,11 +17,12 @@
#pragma once
-#include "util/simd/lower_upper_impl.h"
+#include <unistd.h>
#include <cstdint>
-#include <unistd.h>
+
#include "runtime/string_value.hpp"
+#include "util/simd/lower_upper_impl.h"
namespace doris {
diff --git a/be/src/util/string_parser.hpp b/be/src/util/string_parser.hpp
index b8b465c2c6..82549d186c 100644
--- a/be/src/util/string_parser.hpp
+++ b/be/src/util/string_parser.hpp
@@ -23,9 +23,8 @@
#include <cmath>
#include <cstdint>
#include <cstring>
-
-#include <string>
#include <limits>
+#include <string>
#include <type_traits>
#include "common/compiler_util.h"
diff --git a/be/src/util/topn_counter.cpp b/be/src/util/topn_counter.cpp
index 9f145fdff4..321612cf12 100644
--- a/be/src/util/topn_counter.cpp
+++ b/be/src/util/topn_counter.cpp
@@ -15,12 +15,14 @@
// specific language governing permissions and limitations
// under the License.
-#include <algorithm>
-#include <rapidjson/writer.h>
+#include "topn_counter.h"
+
#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
+
+#include <algorithm>
#include "gen_cpp/olap_common.pb.h"
-#include "topn_counter.h"
#include "slice.h"
namespace doris {
diff --git a/be/src/vec/aggregate_functions/aggregate_function_min_max_by.cpp b/be/src/vec/aggregate_functions/aggregate_function_min_max_by.cpp
index 765e1f05ee..0b88f5106e 100644
--- a/be/src/vec/aggregate_functions/aggregate_function_min_max_by.cpp
+++ b/be/src/vec/aggregate_functions/aggregate_function_min_max_by.cpp
@@ -15,9 +15,9 @@
// specific language governing permissions and limitations
// under the License.
-#include "vec/aggregate_functions/aggregate_function_min_max.h"
#include "vec/aggregate_functions/aggregate_function_min_max_by.h"
+#include "vec/aggregate_functions/aggregate_function_min_max.h"
#include "vec/aggregate_functions/aggregate_function_simple_factory.h"
#include "vec/aggregate_functions/factory_helpers.h"
#include "vec/aggregate_functions/helpers.h"
diff --git a/be/src/vec/aggregate_functions/aggregate_function_window.h b/be/src/vec/aggregate_functions/aggregate_function_window.h
index 33b73218c9..95fedc3e13 100644
--- a/be/src/vec/aggregate_functions/aggregate_function_window.h
+++ b/be/src/vec/aggregate_functions/aggregate_function_window.h
@@ -20,6 +20,7 @@
#pragma once
+#include "factory_helpers.h"
#include "vec/aggregate_functions/aggregate_function.h"
#include "vec/aggregate_functions/helpers.h"
#include "vec/columns/column_vector.h"
@@ -28,7 +29,6 @@
#include "vec/data_types/data_type_number.h"
#include "vec/data_types/data_type_string.h"
#include "vec/io/io_helper.h"
-#include "factory_helpers.h"
namespace doris::vectorized {
diff --git a/be/src/vec/columns/column_decimal.cpp b/be/src/vec/columns/column_decimal.cpp
index d7112551d3..5dc30a182d 100644
--- a/be/src/vec/columns/column_decimal.cpp
+++ b/be/src/vec/columns/column_decimal.cpp
@@ -20,12 +20,12 @@
#include "vec/columns/column_decimal.h"
+#include "util/simd/bits.h"
#include "vec/common/arena.h"
#include "vec/common/assert_cast.h"
#include "vec/common/exception.h"
#include "vec/common/sip_hash.h"
#include "vec/common/unaligned.h"
-#include "util/simd/bits.h"
template <typename T>
bool decimal_less(T x, T y, doris::vectorized::UInt32 x_scale, doris::vectorized::UInt32 y_scale);
diff --git a/be/src/vec/columns/column_decimal.h b/be/src/vec/columns/column_decimal.h
index 311dadb75d..4f3a2bc3d4 100644
--- a/be/src/vec/columns/column_decimal.h
+++ b/be/src/vec/columns/column_decimal.h
@@ -22,13 +22,13 @@
#include <cmath>
+#include "olap/decimal12.h"
#include "vec/columns/column.h"
#include "vec/columns/column_impl.h"
#include "vec/columns/column_vector_helper.h"
#include "vec/common/assert_cast.h"
#include "vec/common/typeid_cast.h"
#include "vec/core/field.h"
-#include "olap/decimal12.h"
namespace doris::vectorized {
diff --git a/be/src/vec/columns/column_dictionary.h b/be/src/vec/columns/column_dictionary.h
index 23aa4818b0..5a51afbeea 100644
--- a/be/src/vec/columns/column_dictionary.h
+++ b/be/src/vec/columns/column_dictionary.h
@@ -22,7 +22,10 @@
#include <algorithm>
#include "gutil/hash/string_hash.h"
+#include "olap/column_predicate.h"
+#include "olap/comparison_predicate.h"
#include "olap/decimal12.h"
+#include "olap/in_list_predicate.h"
#include "olap/uint24.h"
#include "runtime/string_value.h"
#include "util/slice.h"
@@ -32,11 +35,8 @@
#include "vec/columns/column_string.h"
#include "vec/columns/column_vector.h"
#include "vec/columns/predicate_column.h"
-#include "vec/core/types.h"
#include "vec/common/typeid_cast.h"
-#include "olap/column_predicate.h"
-#include "olap/comparison_predicate.h"
-#include "olap/in_list_predicate.h"
+#include "vec/core/types.h"
namespace doris::vectorized {
diff --git a/be/src/vec/columns/column_set.h b/be/src/vec/columns/column_set.h
index f9f7fe8365..3b330f8228 100644
--- a/be/src/vec/columns/column_set.h
+++ b/be/src/vec/columns/column_set.h
@@ -21,7 +21,6 @@
#pragma once
#include "exprs/hybrid_set.h"
-
#include "vec/columns/column_dummy.h"
namespace doris::vectorized {
diff --git a/be/src/vec/columns/column_vector.cpp b/be/src/vec/columns/column_vector.cpp
index 2d679432ed..acc7e4b9a2 100644
--- a/be/src/vec/columns/column_vector.cpp
+++ b/be/src/vec/columns/column_vector.cpp
@@ -27,6 +27,7 @@
#include <cstring>
#include "runtime/datetime_value.h"
+#include "util/simd/bits.h"
#include "vec/common/arena.h"
#include "vec/common/assert_cast.h"
#include "vec/common/bit_cast.h"
@@ -34,7 +35,6 @@
#include "vec/common/nan_utils.h"
#include "vec/common/sip_hash.h"
#include "vec/common/unaligned.h"
-#include "util/simd/bits.h"
namespace doris::vectorized {
diff --git a/be/src/vec/columns/columns_common.cpp b/be/src/vec/columns/columns_common.cpp
index 455e563a8c..22613d0e7f 100644
--- a/be/src/vec/columns/columns_common.cpp
+++ b/be/src/vec/columns/columns_common.cpp
@@ -22,11 +22,11 @@
#include <emmintrin.h>
#endif
+#include "util/simd/bits.h"
#include "vec/columns/column.h"
#include "vec/columns/column_vector.h"
#include "vec/columns/columns_common.h"
#include "vec/common/typeid_cast.h"
-#include "util/simd/bits.h"
namespace doris::vectorized {
diff --git a/be/src/vec/common/arena.h b/be/src/vec/common/arena.h
index 8789f5ac35..e136bae143 100644
--- a/be/src/vec/common/arena.h
+++ b/be/src/vec/common/arena.h
@@ -29,11 +29,10 @@
#if __has_include(<sanitizer/asan_interface.h>)
#include <sanitizer/asan_interface.h>
#endif
+#include "gutil/dynamic_annotations.h"
#include "vec/common/allocator.h"
#include "vec/common/memcpy_small.h"
-#include "gutil/dynamic_annotations.h"
-
namespace doris::vectorized {
/** Memory pool to append something. For example, short strings.
diff --git a/be/src/vec/common/mremap.cpp b/be/src/vec/common/mremap.cpp
index 4a446788d5..32152717a7 100644
--- a/be/src/vec/common/mremap.cpp
+++ b/be/src/vec/common/mremap.cpp
@@ -18,12 +18,13 @@
// https://github.com/ClickHouse/ClickHouse/blob/master/base/base/mremap.cpp
// and modified by Doris
+#include "vec/common/mremap.h"
+
+#include <errno.h>
+
#include <cstddef>
#include <cstdlib>
#include <cstring>
-#include <errno.h>
-
-#include "vec/common/mremap.h"
void* mremap_fallback(void* old_address, size_t old_size, size_t new_size, int flags, int mmap_prot,
int mmap_flags, int mmap_fd, off_t mmap_offset) {
diff --git a/be/src/vec/common/string_buffer.hpp b/be/src/vec/common/string_buffer.hpp
index b712871b5a..68ea3aca18 100644
--- a/be/src/vec/common/string_buffer.hpp
+++ b/be/src/vec/common/string_buffer.hpp
@@ -16,11 +16,11 @@
// under the License.
#pragma once
-#include <cstring>
#include <fmt/format.h>
-#include "vec/columns/column_string.h"
+#include <cstring>
+#include "vec/columns/column_string.h"
#include "vec/common/string_ref.h"
namespace doris::vectorized {
diff --git a/be/src/vec/core/accurate_comparison.h b/be/src/vec/core/accurate_comparison.h
index 6924c1eeca..fb2d7ca56a 100644
--- a/be/src/vec/core/accurate_comparison.h
+++ b/be/src/vec/core/accurate_comparison.h
@@ -25,7 +25,6 @@
#include "runtime/datetime_value.h"
#include "util/binary_cast.hpp"
-
#include "vec/common/nan_utils.h"
#include "vec/common/string_ref.h"
#include "vec/common/uint128.h"
diff --git a/be/src/vec/core/sort_description.h b/be/src/vec/core/sort_description.h
index b84c4fbdfb..cf4b820575 100644
--- a/be/src/vec/core/sort_description.h
+++ b/be/src/vec/core/sort_description.h
@@ -20,11 +20,11 @@
#pragma once
-#include "vector"
-#include "memory"
#include "cstddef"
+#include "memory"
#include "string"
#include "vec/core/field.h"
+#include "vector"
class Collator;
diff --git a/be/src/vec/data_types/data_type_array.h b/be/src/vec/data_types/data_type_array.h
index 5b67ac68ce..2cd9c45667 100644
--- a/be/src/vec/data_types/data_type_array.h
+++ b/be/src/vec/data_types/data_type_array.h
@@ -20,8 +20,8 @@
#pragma once
-#include "vec/data_types/data_type.h"
#include "vec/columns/column_array.h"
+#include "vec/data_types/data_type.h"
namespace doris::vectorized {
diff --git a/be/src/vec/data_types/data_type_date.cpp b/be/src/vec/data_types/data_type_date.cpp
index 0dcb3e9b82..a23dde0725 100644
--- a/be/src/vec/data_types/data_type_date.cpp
+++ b/be/src/vec/data_types/data_type_date.cpp
@@ -21,8 +21,8 @@
#include "vec/data_types/data_type_date.h"
#include "runtime/datetime_value.h"
-#include "vec/columns/columns_number.h"
#include "util/binary_cast.hpp"
+#include "vec/columns/columns_number.h"
#include "vec/runtime/vdatetime_value.h"
namespace doris::vectorized {
bool DataTypeDate::equals(const IDataType& rhs) const {
diff --git a/be/src/vec/exec/vassert_num_rows_node.cpp b/be/src/vec/exec/vassert_num_rows_node.cpp
index 0614b56631..e07983a23c 100644
--- a/be/src/vec/exec/vassert_num_rows_node.cpp
+++ b/be/src/vec/exec/vassert_num_rows_node.cpp
@@ -17,12 +17,12 @@
#include "vec/exec/vassert_num_rows_node.h"
-#include "vec/core/block.h"
#include "gen_cpp/PlanNodes_types.h"
#include "gutil/strings/substitute.h"
#include "runtime/row_batch.h"
#include "runtime/runtime_state.h"
#include "util/runtime_profile.h"
+#include "vec/core/block.h"
namespace doris::vectorized {
diff --git a/be/src/vec/exec/vblocking_join_node.h b/be/src/vec/exec/vblocking_join_node.h
index b6d2b7effd..7b28b0e2a5 100644
--- a/be/src/vec/exec/vblocking_join_node.h
+++ b/be/src/vec/exec/vblocking_join_node.h
@@ -23,7 +23,6 @@
#include "exec/exec_node.h"
#include "gen_cpp/PlanNodes_types.h"
-
#include "vec/core/block.h"
namespace doris {
diff --git a/be/src/vec/exec/vbroker_scan_node.cpp b/be/src/vec/exec/vbroker_scan_node.cpp
index 09338a1959..0386eb6a10 100644
--- a/be/src/vec/exec/vbroker_scan_node.cpp
+++ b/be/src/vec/exec/vbroker_scan_node.cpp
@@ -18,11 +18,11 @@
#include "vec/exec/vbroker_scan_node.h"
#include "gen_cpp/PlanNodes_types.h"
+#include "runtime/mem_tracker.h"
#include "runtime/runtime_state.h"
#include "runtime/string_value.h"
#include "runtime/tuple.h"
#include "runtime/tuple_row.h"
-#include "runtime/mem_tracker.h"
#include "util/runtime_profile.h"
#include "util/thread.h"
#include "util/types.h"
diff --git a/be/src/vec/exec/vbroker_scanner.cpp b/be/src/vec/exec/vbroker_scanner.cpp
index 39302099a6..dea6d55da5 100644
--- a/be/src/vec/exec/vbroker_scanner.cpp
+++ b/be/src/vec/exec/vbroker_scanner.cpp
@@ -18,13 +18,14 @@
#include "vec/exec/vbroker_scanner.h"
#include <fmt/format.h>
+
#include <iostream>
#include <sstream>
-#include "exec/text_converter.h"
#include "exec/exec_node.h"
-#include "exprs/expr_context.h"
#include "exec/plain_text_line_reader.h"
+#include "exec/text_converter.h"
+#include "exprs/expr_context.h"
#include "util/utf8_check.h"
namespace doris::vectorized {
diff --git a/be/src/vec/exec/vexcept_node.cpp b/be/src/vec/exec/vexcept_node.cpp
index 9176a75c8a..d6c133af83 100644
--- a/be/src/vec/exec/vexcept_node.cpp
+++ b/be/src/vec/exec/vexcept_node.cpp
@@ -21,9 +21,9 @@
#include "runtime/runtime_state.h"
#include "util/runtime_profile.h"
#include "vec/core/block.h"
+#include "vec/exec/vset_operation_node.h"
#include "vec/exprs/vexpr.h"
#include "vec/exprs/vexpr_context.h"
-#include "vec/exec/vset_operation_node.h"
namespace doris {
namespace vectorized {
diff --git a/be/src/vec/exec/volap_scanner.h b/be/src/vec/exec/volap_scanner.h
index f0a0221ca9..d054fdbf77 100644
--- a/be/src/vec/exec/volap_scanner.h
+++ b/be/src/vec/exec/volap_scanner.h
@@ -18,7 +18,6 @@
#pragma once
#include "exec/olap_scanner.h"
-
#include "vec/olap/block_reader.h"
namespace doris {
diff --git a/be/src/vec/exec/vsort_exec_exprs.h b/be/src/vec/exec/vsort_exec_exprs.h
index 6ed00f7d8e..8e471a5475 100644
--- a/be/src/vec/exec/vsort_exec_exprs.h
+++ b/be/src/vec/exec/vsort_exec_exprs.h
@@ -17,8 +17,8 @@
#pragma once
-#include "vec/exprs/vexpr.h"
#include "runtime/runtime_state.h"
+#include "vec/exprs/vexpr.h"
namespace doris {
diff --git a/be/src/vec/exec/vsort_node.cpp b/be/src/vec/exec/vsort_node.cpp
index 29e2a06d13..4d4284bc26 100644
--- a/be/src/vec/exec/vsort_node.cpp
+++ b/be/src/vec/exec/vsort_node.cpp
@@ -21,7 +21,6 @@
#include "runtime/row_batch.h"
#include "runtime/runtime_state.h"
#include "util/debug_util.h"
-
#include "vec/core/sort_block.h"
namespace doris::vectorized {
diff --git a/be/src/vec/exec/vunion_node.cpp b/be/src/vec/exec/vunion_node.cpp
index d1265726c4..cb410c3794 100644
--- a/be/src/vec/exec/vunion_node.cpp
+++ b/be/src/vec/exec/vunion_node.cpp
@@ -20,7 +20,6 @@
#include "gen_cpp/PlanNodes_types.h"
#include "runtime/runtime_state.h"
#include "util/runtime_profile.h"
-
#include "vec/core/block.h"
#include "vec/exprs/vexpr.h"
#include "vec/exprs/vexpr_context.h"
diff --git a/be/src/vec/exprs/vin_predicate.cpp b/be/src/vec/exprs/vin_predicate.cpp
index 24e7bd87f1..ca21787ca9 100644
--- a/be/src/vec/exprs/vin_predicate.cpp
+++ b/be/src/vec/exprs/vin_predicate.cpp
@@ -20,7 +20,6 @@
#include <string_view>
#include "exprs/create_predicate_function.h"
-
#include "vec/columns/column_set.h"
#include "vec/core/field.h"
#include "vec/data_types/data_type_factory.hpp"
diff --git a/be/src/vec/exprs/vinfo_func.h b/be/src/vec/exprs/vinfo_func.h
index ca4dd21b8a..e2f1fb09af 100644
--- a/be/src/vec/exprs/vinfo_func.h
+++ b/be/src/vec/exprs/vinfo_func.h
@@ -17,13 +17,13 @@
#pragma once
+#include <iostream>
+#include <string>
+
#include "vec/columns/column.h"
#include "vec/columns/column_const.h"
#include "vec/exprs/vexpr.h"
-#include <iostream>
-#include <string>
-
namespace doris {
class TExprNode;
diff --git a/be/src/vec/exprs/vtuple_is_null_predicate.cpp b/be/src/vec/exprs/vtuple_is_null_predicate.cpp
index f7330e991f..ad339e4ff3 100644
--- a/be/src/vec/exprs/vtuple_is_null_predicate.cpp
+++ b/be/src/vec/exprs/vtuple_is_null_predicate.cpp
@@ -20,7 +20,6 @@
#include <string_view>
#include "exprs/create_predicate_function.h"
-
#include "vec/core/field.h"
#include "vec/data_types/data_type_factory.hpp"
#include "vec/data_types/data_type_nullable.h"
diff --git a/be/src/vec/functions/function_bitmap.cpp b/be/src/vec/functions/function_bitmap.cpp
index 9aca8e78d9..f4752a3052 100644
--- a/be/src/vec/functions/function_bitmap.cpp
+++ b/be/src/vec/functions/function_bitmap.cpp
@@ -21,12 +21,12 @@
#include "gutil/strings/numbers.h"
#include "gutil/strings/split.h"
#include "util/string_parser.hpp"
+#include "vec/functions/function_always_not_nullable.h"
#include "vec/functions/function_bitmap_min_or_max.h"
#include "vec/functions/function_const.h"
#include "vec/functions/function_string.h"
#include "vec/functions/function_totype.h"
#include "vec/functions/simple_function_factory.h"
-#include "vec/functions/function_always_not_nullable.h"
namespace doris::vectorized {
diff --git a/be/src/vec/functions/function_cast.cpp b/be/src/vec/functions/function_cast.cpp
index 761440c917..9a0ec0ad61 100644
--- a/be/src/vec/functions/function_cast.cpp
+++ b/be/src/vec/functions/function_cast.cpp
@@ -18,6 +18,7 @@
// https://github.com/ClickHouse/ClickHouse/blob/master/src/Functions/FunctionsConversion.h
// and modified by Doris
#include "vec/functions/function_cast.h"
+
#include "vec/functions/simple_function_factory.h"
namespace doris::vectorized {
diff --git a/be/src/vec/functions/function_datetime_floor_ceil.cpp b/be/src/vec/functions/function_datetime_floor_ceil.cpp
index 511eb47f6e..abfd678e6b 100644
--- a/be/src/vec/functions/function_datetime_floor_ceil.cpp
+++ b/be/src/vec/functions/function_datetime_floor_ceil.cpp
@@ -15,10 +15,10 @@
// specific language governing permissions and limitations
// under the License.
-#include "vec/columns/column_vector.h"
#include "vec/columns/column_const.h"
-#include "vec/data_types/data_type_number.h"
+#include "vec/columns/column_vector.h"
#include "vec/data_types/data_type_date_time.h"
+#include "vec/data_types/data_type_number.h"
#include "vec/functions/simple_function_factory.h"
namespace doris::vectorized {
diff --git a/be/src/vec/functions/function_hex.cpp b/be/src/vec/functions/function_hex.cpp
index faed7027d8..add150791d 100644
--- a/be/src/vec/functions/function_hex.cpp
+++ b/be/src/vec/functions/function_hex.cpp
@@ -15,6 +15,7 @@
// specific language governing permissions and limitations
// under the License.
+#include "util/simd/vstring_function.h" //place this header file at last to compile
#include "vec/columns/column_complex.h"
#include "vec/data_types/data_type.h"
#include "vec/data_types/data_type_hll.h"
@@ -22,7 +23,6 @@
#include "vec/functions/function_string.h"
#include "vec/functions/function_totype.h"
#include "vec/functions/simple_function_factory.h"
-#include "util/simd/vstring_function.h" //place this header file at last to compile
namespace doris::vectorized {
template <typename Impl>
diff --git a/be/src/vec/functions/hll_cardinality.cpp b/be/src/vec/functions/hll_cardinality.cpp
index 238028b463..aea5cbe668 100644
--- a/be/src/vec/functions/hll_cardinality.cpp
+++ b/be/src/vec/functions/hll_cardinality.cpp
@@ -17,10 +17,10 @@
#include "exprs/hll_function.h"
#include "udf/udf.h"
+#include "vec/columns/column_complex.h"
#include "vec/data_types/number_traits.h"
#include "vec/functions/function_always_not_nullable.h"
#include "vec/functions/simple_function_factory.h"
-#include "vec/columns/column_complex.h"
namespace doris::vectorized {
diff --git a/be/src/vec/functions/hll_empty.cpp b/be/src/vec/functions/hll_empty.cpp
index fd593b9d29..145a947478 100644
--- a/be/src/vec/functions/hll_empty.cpp
+++ b/be/src/vec/functions/hll_empty.cpp
@@ -17,11 +17,11 @@
#include "exprs/hll_function.h"
#include "olap/hll.h"
+#include "vec/columns/column_complex.h"
+#include "vec/data_types/data_type_hll.h"
#include "vec/data_types/data_type_string.h"
#include "vec/functions/function_const.h"
#include "vec/functions/simple_function_factory.h"
-#include "vec/data_types/data_type_hll.h"
-#include "vec/columns/column_complex.h"
namespace doris::vectorized {
struct HLLEmptyImpl {
diff --git a/be/src/vec/functions/hll_hash.cpp b/be/src/vec/functions/hll_hash.cpp
index 540c69653a..bc7e1f5979 100644
--- a/be/src/vec/functions/hll_hash.cpp
+++ b/be/src/vec/functions/hll_hash.cpp
@@ -18,9 +18,9 @@
#include "exprs/hll_function.h"
#include "olap/hll.h"
#include "udf/udf.h"
+#include "vec/data_types/data_type_hll.h"
#include "vec/functions/function_always_not_nullable.h"
#include "vec/functions/simple_function_factory.h"
-#include "vec/data_types/data_type_hll.h"
namespace doris::vectorized {
diff --git a/be/src/vec/functions/in.cpp b/be/src/vec/functions/in.cpp
index b997b2b111..301d9b4e2f 100644
--- a/be/src/vec/functions/in.cpp
+++ b/be/src/vec/functions/in.cpp
@@ -19,7 +19,6 @@
#include <fmt/format.h>
#include "exprs/create_predicate_function.h"
-
#include "vec/columns/column_const.h"
#include "vec/columns/column_nullable.h"
#include "vec/columns/column_set.h"
diff --git a/be/src/vec/functions/is_null.cpp b/be/src/vec/functions/is_null.cpp
index fba201c30e..743a271f1b 100644
--- a/be/src/vec/functions/is_null.cpp
+++ b/be/src/vec/functions/is_null.cpp
@@ -18,9 +18,9 @@
// https://github.com/ClickHouse/ClickHouse/blob/master/src/Functions/IsNull.cpp
// and modified by Doris
-#include "vec/functions/simple_function_factory.h"
-#include "vec/data_types/data_type_number.h"
#include "vec/columns/column_nullable.h"
+#include "vec/data_types/data_type_number.h"
+#include "vec/functions/simple_function_factory.h"
namespace doris::vectorized {
diff --git a/be/src/vec/functions/math.cpp b/be/src/vec/functions/math.cpp
index 1e6952e1f6..6278d33567 100644
--- a/be/src/vec/functions/math.cpp
+++ b/be/src/vec/functions/math.cpp
@@ -17,9 +17,8 @@
#include "vec/core/types.h"
#include "vec/data_types/number_traits.h"
-#include "vec/functions/function_const.h"
-#include "vec/functions/function_binary_arithmetic.h"
#include "vec/functions/function_binary_arithmetic.h"
+#include "vec/functions/function_const.h"
#include "vec/functions/function_math_unary.h"
#include "vec/functions/function_math_unary_to_null_type.h"
#include "vec/functions/function_string.h"
diff --git a/be/src/vec/functions/nullif.cpp b/be/src/vec/functions/nullif.cpp
index 33420b5ff7..43ad488841 100644
--- a/be/src/vec/functions/nullif.cpp
+++ b/be/src/vec/functions/nullif.cpp
@@ -18,16 +18,16 @@
// https://github.com/ClickHouse/ClickHouse/blob/master/src/Functions/Nullif.cpp
// and modified by Doris
-#include "vec/functions/simple_function_factory.h"
#include "vec/columns/column_nullable.h"
-#include "vec/functions/function_helpers.h"
-#include "vec/utils/util.hpp"
-#include "vec/functions/function_string.h"
#include "vec/data_types/data_type_nothing.h"
#include "vec/data_types/data_type_nullable.h"
#include "vec/data_types/data_type_number.h"
#include "vec/data_types/get_least_supertype.h"
#include "vec/data_types/number_traits.h"
+#include "vec/functions/function_helpers.h"
+#include "vec/functions/function_string.h"
+#include "vec/functions/simple_function_factory.h"
+#include "vec/utils/util.hpp"
namespace doris::vectorized {
class FunctionNullIf : public IFunction {
diff --git a/be/src/vec/olap/vcollect_iterator.cpp b/be/src/vec/olap/vcollect_iterator.cpp
index 543f7012f7..de0a0625ab 100644
--- a/be/src/vec/olap/vcollect_iterator.cpp
+++ b/be/src/vec/olap/vcollect_iterator.cpp
@@ -16,6 +16,7 @@
// under the License.
#include "vec/olap/vcollect_iterator.h"
+
#include <memory>
#include "olap/rowset/beta_rowset_reader.h"
diff --git a/be/src/vec/runtime/vdata_stream_recvr.cpp b/be/src/vec/runtime/vdata_stream_recvr.cpp
index 180c31838c..66c2ebb4fe 100644
--- a/be/src/vec/runtime/vdata_stream_recvr.cpp
+++ b/be/src/vec/runtime/vdata_stream_recvr.cpp
@@ -21,7 +21,6 @@
#include "runtime/mem_tracker.h"
#include "runtime/thread_context.h"
#include "util/uid_util.h"
-
#include "vec/core/block.h"
#include "vec/core/materialize_block.h"
#include "vec/core/sort_cursor.h"
diff --git a/be/src/vec/runtime/vdatetime_value.cpp b/be/src/vec/runtime/vdatetime_value.cpp
index f2ad9baa30..373de608de 100644
--- a/be/src/vec/runtime/vdatetime_value.cpp
+++ b/be/src/vec/runtime/vdatetime_value.cpp
@@ -24,8 +24,8 @@
#include <limits>
#include <sstream>
-#include "util/timezone_utils.h"
#include "runtime/datetime_value.h"
+#include "util/timezone_utils.h"
namespace doris::vectorized {
diff --git a/be/src/vec/runtime/vsorted_run_merger.h b/be/src/vec/runtime/vsorted_run_merger.h
index fe066a6d17..05c463fec3 100644
--- a/be/src/vec/runtime/vsorted_run_merger.h
+++ b/be/src/vec/runtime/vsorted_run_merger.h
@@ -21,7 +21,6 @@
#include "common/object_pool.h"
#include "util/tuple_row_compare.h"
-
#include "vec/core/sort_cursor.h"
namespace doris {
diff --git a/be/src/vec/sink/vtablet_sink.cpp b/be/src/vec/sink/vtablet_sink.cpp
index 32e0e2148f..4794a0d003 100644
--- a/be/src/vec/sink/vtablet_sink.cpp
+++ b/be/src/vec/sink/vtablet_sink.cpp
@@ -18,13 +18,13 @@
#include "vec/sink/vtablet_sink.h"
#include "runtime/thread_context.h"
+#include "util/debug/sanitizer_scopes.h"
#include "util/doris_metrics.h"
+#include "util/proto_util.h"
+#include "util/time.h"
#include "vec/core/block.h"
#include "vec/exprs/vexpr.h"
#include "vec/exprs/vexpr_context.h"
-#include "util/debug/sanitizer_scopes.h"
-#include "util/time.h"
-#include "util/proto_util.h"
namespace doris {
namespace stream_load {
diff --git a/be/test/exprs/mock_vexpr.h b/be/test/exprs/mock_vexpr.h
index 57072f8e61..569a6b1d43 100644
--- a/be/test/exprs/mock_vexpr.h
+++ b/be/test/exprs/mock_vexpr.h
@@ -17,8 +17,8 @@
#pragma once
-#include <gtest/gtest.h>
#include <gmock/gmock.h>
+#include <gtest/gtest.h>
#include "vec/exprs/vexpr.h"
diff --git a/be/test/vec/aggregate_functions/agg_min_max_by_test.cpp b/be/test/vec/aggregate_functions/agg_min_max_by_test.cpp
index a25af83b18..9c82214bd2 100644
--- a/be/test/vec/aggregate_functions/agg_min_max_by_test.cpp
+++ b/be/test/vec/aggregate_functions/agg_min_max_by_test.cpp
@@ -20,8 +20,8 @@
#include "gtest/gtest.h"
#include "vec/aggregate_functions/aggregate_function.h"
-#include "vec/aggregate_functions/aggregate_function_simple_factory.h"
#include "vec/aggregate_functions/aggregate_function_min_max_by.h"
+#include "vec/aggregate_functions/aggregate_function_simple_factory.h"
#include "vec/columns/column_vector.h"
#include "vec/data_types/data_type.h"
#include "vec/data_types/data_type_number.h"
diff --git a/be/test/vec/exec/vbroker_scan_node_test.cpp b/be/test/vec/exec/vbroker_scan_node_test.cpp
index a0d11d3ac9..0683cf4b7a 100644
--- a/be/test/vec/exec/vbroker_scan_node_test.cpp
+++ b/be/test/vec/exec/vbroker_scan_node_test.cpp
@@ -23,16 +23,16 @@
#include <vector>
#include "common/object_pool.h"
-#include "exprs/binary_predicate.h"
-#include "runtime/primitive_type.h"
-#include "exprs/slot_ref.h"
-#include "exprs/literal.h"
-#include "runtime/mem_tracker.h"
#include "exec/local_file_reader.h"
+#include "exprs/binary_predicate.h"
#include "exprs/cast_functions.h"
+#include "exprs/literal.h"
+#include "exprs/slot_ref.h"
#include "gen_cpp/Descriptors_types.h"
#include "gen_cpp/PlanNodes_types.h"
#include "runtime/descriptors.h"
+#include "runtime/mem_tracker.h"
+#include "runtime/primitive_type.h"
#include "runtime/runtime_state.h"
#include "runtime/user_function_cache.h"
diff --git a/be/test/vec/exec/vbroker_scanner_test.cpp b/be/test/vec/exec/vbroker_scanner_test.cpp
index 5ead638bef..1a39c1f8e0 100644
--- a/be/test/vec/exec/vbroker_scanner_test.cpp
+++ b/be/test/vec/exec/vbroker_scanner_test.cpp
@@ -23,12 +23,12 @@
#include <vector>
#include "common/object_pool.h"
-#include "runtime/mem_tracker.h"
#include "exec/local_file_reader.h"
#include "exprs/cast_functions.h"
#include "gen_cpp/Descriptors_types.h"
#include "gen_cpp/PlanNodes_types.h"
#include "runtime/descriptors.h"
+#include "runtime/mem_tracker.h"
#include "runtime/runtime_state.h"
#include "runtime/user_function_cache.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org