[fix](build) Resolve the conflicts when building be with java-udf (#11938)

This commit is contained in:
Adonis Ling
2022-08-20 18:24:32 +08:00
committed by GitHub
parent 28dba65d74
commit 982c5f06b5
3 changed files with 4 additions and 9 deletions

View File

@ -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 {

View File

@ -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
#endif

View File

@ -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"