From 982c5f06b5af6c6be221dad7780abc2a8a3fbe37 Mon Sep 17 00:00:00 2001
From: Adonis Ling <adonis0147@gmail.com>
Date: Sat, 20 Aug 2022 18:24:32 +0800
Subject: [PATCH] [fix](build) Resolve the conflicts when building be with
 java-udf (#11938)

---
 be/src/util/jni-util.h                                    | 4 +---
 .../aggregate_functions/aggregate_function_java_udaf.h    | 8 ++------
 be/src/vec/functions/function_java_udf.cpp                | 1 +
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/be/src/util/jni-util.h b/be/src/util/jni-util.h
index 58610d468c..ff3c40609b 100644
--- a/be/src/util/jni-util.h
+++ b/be/src/util/jni-util.h
@@ -18,13 +18,11 @@
 #pragma once
 
 #ifdef LIBJVM
-#include <hdfs/hdfs.h>
 #include <jni.h>
 
 #include "common/status.h"
 #include "gutil/macros.h"
-#include "gutil/strings/substitute.h"
-#include "util//thrift_util.h"
+#include "util/thrift_util.h"
 
 namespace doris {
 
diff --git a/be/src/vec/aggregate_functions/aggregate_function_java_udaf.h b/be/src/vec/aggregate_functions/aggregate_function_java_udaf.h
index 6030b99e7a..4c86d3b996 100644
--- a/be/src/vec/aggregate_functions/aggregate_function_java_udaf.h
+++ b/be/src/vec/aggregate_functions/aggregate_function_java_udaf.h
@@ -26,18 +26,14 @@
 #include <memory>
 
 #include "common/status.h"
-#include "gen_cpp/Exprs_types.h"
+#include "gutil/strings/substitute.h"
 #include "runtime/user_function_cache.h"
 #include "util/jni-util.h"
 #include "vec/aggregate_functions/aggregate_function.h"
 #include "vec/columns/column_string.h"
-#include "vec/common/exception.h"
 #include "vec/common/string_ref.h"
-#include "vec/core/block.h"
-#include "vec/core/column_numbers.h"
 #include "vec/core/field.h"
 #include "vec/core/types.h"
-#include "vec/data_types/data_type_string.h"
 #include "vec/io/io_helper.h"
 
 namespace doris::vectorized {
@@ -395,4 +391,4 @@ private:
 };
 
 } // namespace doris::vectorized
-#endif
\ No newline at end of file
+#endif
diff --git a/be/src/vec/functions/function_java_udf.cpp b/be/src/vec/functions/function_java_udf.cpp
index ce7d4579d1..ddb5b2cf17 100644
--- a/be/src/vec/functions/function_java_udf.cpp
+++ b/be/src/vec/functions/function_java_udf.cpp
@@ -24,6 +24,7 @@
 #include <sstream>
 
 #include "gen_cpp/Exprs_types.h"
+#include "gutil/strings/substitute.h"
 #include "runtime/exec_env.h"
 #include "runtime/user_function_cache.h"
 #include "util/jni-util.h"