compile 2

morningman · morningman · commit 1187c821ee1e · 2026-03-08T23:16:47.000-07:00
diff --git a/be/src/exec/scan/jdbc_scanner.cpp b/be/src/exec/scan/jdbc_scanner.cpp
@@ -27,9 +27,9 @@
 #include "runtime/runtime_profile.h"
 #include "runtime/runtime_state.h"
 #include "util/jdbc_utils.h"
-#include "vec/core/block.h"
-#include "vec/exec/format/table/jdbc_jni_reader.h"
-#include "vec/exprs/vexpr_context.h"
+#include "core/block/block.h"
+#include "format/table/jdbc_jni_reader.h"
+#include "exprs/vexpr_context.h"
 
 namespace doris::vectorized {
 
diff --git a/be/src/exprs/aggregate/aggregate_function_java_udaf.h b/be/src/exprs/aggregate/aggregate_function_java_udaf.h
@@ -31,15 +31,15 @@
 #include "common/status.h"
 #include "runtime/user_function_cache.h"
 #include "util/jni-util.h"
-#include "vec/aggregate_functions/aggregate_function.h"
-#include "vec/columns/column_array.h"
-#include "vec/columns/column_map.h"
-#include "vec/columns/column_string.h"
-#include "vec/common/string_ref.h"
-#include "vec/core/field.h"
-#include "vec/core/types.h"
-#include "vec/exec/jni_data_bridge.h"
-#include "vec/io/io_helper.h"
+#include "exprs/aggregate/aggregate_function.h"
+#include "core/column/column_array.h"
+#include "core/column/column_map.h"
+#include "core/column/column_string.h"
+#include "core/string_ref.h"
+#include "core/field.h"
+#include "core/types.h"
+#include "format/jni/jni_data_bridge.h"
+#include "util/io_helper.h"
 
 namespace doris::vectorized {
 #include "common/compile_check_begin.h"
diff --git a/be/src/exprs/function/function_java_udf.cpp b/be/src/exprs/function/function_java_udf.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "vec/functions/function_java_udf.h"
+#include "exprs/function/function_java_udf.h"
 
 #include <bthread/bthread.h>
 
@@ -27,8 +27,8 @@
 #include "runtime/exec_env.h"
 #include "runtime/user_function_cache.h"
 #include "util/jni-util.h"
-#include "vec/core/block.h"
-#include "vec/exec/jni_data_bridge.h"
+#include "core/block/block.h"
+#include "format/jni/jni_data_bridge.h"
 
 const char* EXECUTOR_CLASS = "org/apache/doris/udf/UdfExecutor";
 const char* EXECUTOR_CTOR_SIGNATURE = "([B)V";
diff --git a/be/src/exprs/function/function_python_udf.cpp b/be/src/exprs/function/function_python_udf.cpp
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "vec/functions/function_python_udf.h"
+#include "exprs/function/function_python_udf.h"
 
 #include <arrow/record_batch.h>
 #include <arrow/type_fwd.h>
@@ -35,7 +35,7 @@
 #include "util/arrow/block_convertor.h"
 #include "util/arrow/row_batch.h"
 #include "util/timezone_utils.h"
-#include "vec/core/block.h"
+#include "core/block/block.h"
 
 namespace doris::vectorized {
 
diff --git a/be/src/exprs/table_function/udf_table_function.cpp b/be/src/exprs/table_function/udf_table_function.cpp
@@ -15,22 +15,22 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "vec/exprs/table_function/udf_table_function.h"
+#include "exprs/table_function/udf_table_function.h"
 
 #include <glog/logging.h>
 
 #include "runtime/user_function_cache.h"
-#include "vec/columns/column_array.h"
-#include "vec/columns/column_nullable.h"
-#include "vec/common/assert_cast.h"
-#include "vec/core/block.h"
-#include "vec/core/column_numbers.h"
-#include "vec/core/types.h"
-#include "vec/data_types/data_type_array.h"
-#include "vec/data_types/data_type_factory.hpp"
-#include "vec/exec/jni_data_bridge.h"
-#include "vec/exprs/vexpr.h"
-#include "vec/exprs/vexpr_context.h"
+#include "core/column/column_array.h"
+#include "core/column/column_nullable.h"
+#include "core/assert_cast.h"
+#include "core/block/block.h"
+#include "core/block/column_numbers.h"
+#include "core/types.h"
+#include "core/data_type/data_type_array.h"
+#include "core/data_type/data_type_factory.hpp"
+#include "format/jni/jni_data_bridge.h"
+#include "exprs/vexpr.h"
+#include "exprs/vexpr_context.h"
 
 namespace doris::vectorized {
 #include "common/compile_check_begin.h"
diff --git a/be/src/format/jni_reader.cpp b/be/src/format/jni_reader.cpp
@@ -23,13 +23,12 @@
 #include <ostream>
 #include <sstream>
 
+#include "core/block/block.h"
 #include "core/types.h"
 #include "runtime/descriptors.h"
 #include "runtime/runtime_state.h"
 #include "util/jni-util.h"
-#include "vec/core/block.h"
-#include "vec/core/types.h"
-#include "vec/exec/jni_data_bridge.h"
+#include "format/jni/jni_data_bridge.h"
 
 namespace doris {
 #include "common/compile_check_begin.h"
diff --git a/be/src/format/table/hudi_jni_reader.cpp b/be/src/format/table/hudi_jni_reader.cpp
@@ -22,7 +22,6 @@
 #include "core/types.h"
 #include "runtime/descriptors.h"
 #include "runtime/runtime_state.h"
-#include "vec/core/types.h"
 
 namespace doris {
 class RuntimeProfile;
diff --git a/be/src/format/table/hudi_jni_reader.h b/be/src/format/table/hudi_jni_reader.h
@@ -24,8 +24,8 @@
 #include <vector>
 
 #include "common/status.h"
-#include "exec/olap_common.h"
-#include "vec/exec/format/jni_reader.h"
+#include "storage/olap_common.h"
+#include "format/jni_reader.h"
 
 namespace doris {
 class RuntimeProfile;
diff --git a/be/src/format/table/iceberg_sys_table_jni_reader.cpp b/be/src/format/table/iceberg_sys_table_jni_reader.cpp
@@ -19,7 +19,7 @@
 
 #include "runtime/runtime_state.h"
 #include "util/string_util.h"
-#include "vec/exec/jni_data_bridge.h"
+#include "format/jni/jni_data_bridge.h"
 
 namespace doris::vectorized {
 #include "common/compile_check_begin.h"
diff --git a/be/src/format/table/jdbc_jni_reader.cpp b/be/src/format/table/jdbc_jni_reader.cpp
@@ -22,13 +22,13 @@
 #include "runtime/descriptors.h"
 #include "runtime/types.h"
 #include "util/jdbc_utils.h"
-#include "vec/columns/column_nullable.h"
-#include "vec/core/block.h"
-#include "vec/core/types.h"
-#include "vec/data_types/data_type_nullable.h"
-#include "vec/data_types/data_type_string.h"
-#include "vec/exec/jni_data_bridge.h"
-#include "vec/functions/simple_function_factory.h"
+#include "core/column/column_nullable.h"
+#include "core/block/block.h"
+#include "core/types.h"
+#include "core/data_type/data_type_nullable.h"
+#include "core/data_type/data_type_string.h"
+#include "format/jni/jni_data_bridge.h"
+#include "exprs/function/simple_function_factory.h"
 
 namespace doris::vectorized {
 #include "common/compile_check_begin.h"
diff --git a/be/src/format/table/max_compute_jni_reader.cpp b/be/src/format/table/max_compute_jni_reader.cpp
@@ -25,8 +25,7 @@
 
 #include "core/types.h"
 #include "runtime/descriptors.h"
-#include "vec/core/types.h"
-#include "vec/exec/jni_data_bridge.h"
+#include "format/jni/jni_data_bridge.h"
 
 namespace doris {
 class RuntimeProfile;
diff --git a/be/src/format/table/max_compute_jni_reader.h b/be/src/format/table/max_compute_jni_reader.h
@@ -24,9 +24,9 @@
 #include <vector>
 
 #include "common/status.h"
-#include "exec/olap_common.h"
+#include "storage/olap_common.h"
 #include "runtime/descriptors.h"
-#include "vec/exec/format/jni_reader.h"
+#include "format/jni_reader.h"
 
 namespace doris {
 class RuntimeProfile;
diff --git a/be/src/format/table/paimon_jni_reader.cpp b/be/src/format/table/paimon_jni_reader.cpp
@@ -22,8 +22,7 @@
 #include "core/types.h"
 #include "runtime/descriptors.h"
 #include "runtime/runtime_state.h"
-#include "vec/core/types.h"
-#include "vec/exec/jni_data_bridge.h"
+#include "format/jni/jni_data_bridge.h"
 
 namespace doris {
 class RuntimeProfile;
diff --git a/be/src/format/table/trino_connector_jni_reader.cpp b/be/src/format/table/trino_connector_jni_reader.cpp
@@ -22,8 +22,7 @@
 #include "core/types.h"
 #include "runtime/descriptors.h"
 #include "util/jni-util.h"
-#include "vec/core/types.h"
-#include "vec/exec/jni_data_bridge.h"
+#include "format/jni/jni_data_bridge.h"
 
 namespace doris {
 class RuntimeProfile;
diff --git a/be/src/format/transformer/vjni_format_transformer.cpp b/be/src/format/transformer/vjni_format_transformer.cpp
@@ -15,10 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include "vec/runtime/vjni_format_transformer.h"
+#include "format/transformer/vjni_format_transformer.h"
 
 #include "runtime/runtime_state.h"
-#include "vec/exec/jni_data_bridge.h"
+#include "format/jni/jni_data_bridge.h"
 
 namespace doris::vectorized {
 
diff --git a/be/src/service/internal_service.cpp b/be/src/service/internal_service.cpp
@@ -40,9 +40,9 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/stat.h>
-#include <vec/data_types/data_type.h>
-#include <vec/exec/format/jni_reader.h>
-#include <vec/sink/varrow_flight_result_writer.h>
+#include <core/data_type/data_type.h>
+#include <format/jni_reader.h>
+#include <exec/sink/writer/varrow_flight_result_writer.h>
 
 #include <algorithm>
 #include <exception>
