From dee2f9c6c31bb2f84a59a98473c521846587a583 Mon Sep 17 00:00:00 2001
From: Xinyi Zou <zouxinyi02@gmail.com>
Date: Wed, 6 Nov 2024 17:03:44 +0800
Subject: [PATCH] 3

---
 .../arrow_flight/arrow_flight_batch_reader.cpp    |  5 +++++
 .../arrow_flight/arrow_flight_batch_reader.h      | 15 ++++++++++-----
 .../service/arrow_flight/flight_sql_service.cpp   |  6 ++----
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/be/src/service/arrow_flight/arrow_flight_batch_reader.cpp b/be/src/service/arrow_flight/arrow_flight_batch_reader.cpp
index 5e178694028b3a..8f261911857552 100644
--- a/be/src/service/arrow_flight/arrow_flight_batch_reader.cpp
+++ b/be/src/service/arrow_flight/arrow_flight_batch_reader.cpp
@@ -18,17 +18,22 @@
 #include "service/arrow_flight/arrow_flight_batch_reader.h"
 
 #include <arrow/status.h>
+#include <arrow/type.h>
 #include <gen_cpp/internal_service.pb.h>
 
 #include <utility>
 
 #include "runtime/exec_env.h"
+#include "runtime/memory/mem_tracker_limiter.h"
 #include "runtime/result_buffer_mgr.h"
+#include "runtime/thread_context.h"
 #include "service/backend_options.h"
 #include "util/arrow/block_convertor.h"
 #include "util/arrow/row_batch.h"
 #include "util/arrow/utils.h"
 #include "util/brpc_client_cache.h"
+#include "util/ref_count_closure.h"
+#include "util/string_util.h"
 #include "vec/core/block.h"
 
 namespace doris::flight {
diff --git a/be/src/service/arrow_flight/arrow_flight_batch_reader.h b/be/src/service/arrow_flight/arrow_flight_batch_reader.h
index f962681eb6fc65..1b5681fca98d85 100644
--- a/be/src/service/arrow_flight/arrow_flight_batch_reader.h
+++ b/be/src/service/arrow_flight/arrow_flight_batch_reader.h
@@ -21,15 +21,18 @@
 #include <gen_cpp/Types_types.h>
 
 #include <memory>
-#include <mutex>
 #include <utility>
 
 #include "arrow/record_batch.h"
 #include "runtime/exec_env.h"
-#include "util/ref_count_closure.h"
-#include "util/runtime_profile.h"
 
-namespace doris::flight {
+namespace doris {
+
+namespace vectorized {
+class Block;
+} // namespace vectorized
+
+namespace flight {
 
 struct QueryStatement {
 public:
@@ -101,4 +104,6 @@ class ArrowFlightBatchRemoteReader : public ArrowFlightBatchReaderBase {
     std::string _arrow_schema_field_names;
 };
 
-} // namespace doris::flight
+} // namespace flight
+
+} // namespace doris
diff --git a/be/src/service/arrow_flight/flight_sql_service.cpp b/be/src/service/arrow_flight/flight_sql_service.cpp
index 3306abe9179574..90ee3edfbea72b 100644
--- a/be/src/service/arrow_flight/flight_sql_service.cpp
+++ b/be/src/service/arrow_flight/flight_sql_service.cpp
@@ -29,8 +29,7 @@
 #include "util/arrow/utils.h"
 #include "util/uid_util.h"
 
-namespace doris {
-namespace flight {
+namespace doris::flight {
 
 class FlightSqlServer::Impl {
 private:
@@ -148,5 +147,4 @@ Status FlightSqlServer::join() {
     return Status::OK();
 }
 
-} // namespace flight
-} // namespace doris
+} // namespace doris::flight