4

Author: morningman

be/src/exprs/function/function_python_udf.cpp

@@ -29,12 +29,11 @@
 
 #include "common/status.h"
 #include "core/block/block.h"
+#include "format/arrow/arrow_block_convertor.h"
 #include "runtime/user_function_cache.h"
 #include "udf/python/python_server.h"
 #include "udf/python/python_udf_client.h"
 #include "udf/python/python_udf_meta.h"
-#include "util/arrow/block_convertor.h"
-#include "util/arrow/row_batch.h"
 #include "util/timezone_utils.h"
 
 namespace doris::vectorized {

be/src/format/jni/jni_data_bridge.cpp

@@ -468,7 +468,7 @@ std::string JniDataBridge::get_jni_type_with_different_string(const DataTypePtr&
         return buffer.str();
     }
     // bitmap, hll, quantile_state, jsonb are transferred as strings via JNI
-    case TYPE_OBJECT:
+    case TYPE_BITMAP:
         [[fallthrough]];
     case TYPE_HLL:
         [[fallthrough]];

be/src/service/internal_service.cpp

@@ -80,7 +80,6 @@
 #include "io/fs/local_file_system.h"
 #include "io/fs/stream_load_pipe.h"
 #include "io/io_common.h"
-#include "olap/data_dir.h"
 #include "olap/delta_writer.h"
 #include "olap/olap_common.h"
 #include "olap/olap_define.h"
@@ -115,6 +114,7 @@
 #include "runtime/workload_group/workload_group_manager.h"
 #include "service/backend_options.h"
 #include "service/point_query_executor.h"
+#include "storage/data_dir.h"
 #include "util/arrow/row_batch.h"
 #include "util/async_io.h"
 #include "util/brpc_client_cache.h"