Skip to content

Commit e0866b1

Browse files
morningmanmorningman
committed
compile 1
1 parent 731cddb commit e0866b1

17 files changed

+79
-106
lines changed

‎be/src/exec/scan/file_scanner.cpp‎

Lines changed: 14 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
#include "vec/exec/scan/file_scanner.h"
18+
#include "exec/scan/file_scanner.h"
1919

2020
#include <fmt/format.h>
2121
#include <gen_cpp/Exprs_types.h>
@@ -37,6 +37,16 @@
3737
#include "common/config.h"
3838
#include "common/logging.h"
3939
#include "common/status.h"
40+
#include "core/block/column_with_type_and_name.h"
41+
#include "core/block/columns_with_type_and_name.h"
42+
#include "core/column/column.h"
43+
#include "core/column/column_nullable.h"
44+
#include "core/column/column_vector.h"
45+
#include "core/data_type/data_type.h"
46+
#include "core/data_type/data_type_nullable.h"
47+
#include "core/data_type/data_type_string.h"
48+
#include "core/string_ref.h"
49+
#include "exec/common/stringop_substring.h"
4050
#include "exec/rowid_fetcher.h"
4151
#include "exec/scan/scan_node.h"
4252
#include "exprs/aggregate/aggregate_function.h"
@@ -57,6 +67,7 @@
5767
#include "format/table/hudi_jni_reader.h"
5868
#include "format/table/hudi_reader.h"
5969
#include "format/table/iceberg_reader.h"
70+
#include "format/table/jdbc_jni_reader.h"
6071
#include "format/table/lakesoul_jni_reader.h"
6172
#include "format/table/max_compute_jni_reader.h"
6273
#include "format/table/paimon_cpp_reader.h"
@@ -67,50 +78,12 @@
6778
#include "format/table/transactional_hive_reader.h"
6879
#include "format/table/trino_connector_jni_reader.h"
6980
#include "format/text/text_reader.h"
81+
#include "format/wal/wal_reader.h"
7082
#include "io/cache/block_file_cache_profile.h"
7183
#include "load/group_commit/wal/wal_reader.h"
7284
#include "runtime/descriptors.h"
85+
#include "runtime/runtime_profile.h"
7386
#include "runtime/runtime_state.h"
74-
#include "util/runtime_profile.h"
75-
#include "vec/aggregate_functions/aggregate_function.h"
76-
#include "vec/columns/column.h"
77-
#include "vec/columns/column_nullable.h"
78-
#include "vec/columns/column_vector.h"
79-
#include "vec/common/string_ref.h"
80-
#include "vec/core/column_with_type_and_name.h"
81-
#include "vec/core/columns_with_type_and_name.h"
82-
#include "vec/data_types/data_type.h"
83-
#include "vec/data_types/data_type_nullable.h"
84-
#include "vec/data_types/data_type_string.h"
85-
#include "vec/exec/format/arrow/arrow_stream_reader.h"
86-
#include "vec/exec/format/csv/csv_reader.h"
87-
#include "vec/exec/format/json/new_json_reader.h"
88-
#include "vec/exec/format/native/native_reader.h"
89-
#include "vec/exec/format/orc/vorc_reader.h"
90-
#include "vec/exec/format/parquet/vparquet_reader.h"
91-
#include "vec/exec/format/table/hive_reader.h"
92-
#include "vec/exec/format/table/hudi_jni_reader.h"
93-
#include "vec/exec/format/table/hudi_reader.h"
94-
#include "vec/exec/format/table/iceberg_reader.h"
95-
#include "vec/exec/format/table/jdbc_jni_reader.h"
96-
#include "vec/exec/format/table/max_compute_jni_reader.h"
97-
#include "vec/exec/format/table/paimon_cpp_reader.h"
98-
#include "vec/exec/format/table/paimon_jni_reader.h"
99-
#include "vec/exec/format/table/paimon_predicate_converter.h"
100-
#include "vec/exec/format/table/paimon_reader.h"
101-
#include "vec/exec/format/table/remote_doris_reader.h"
102-
#include "vec/exec/format/table/transactional_hive_reader.h"
103-
#include "vec/exec/format/table/trino_connector_jni_reader.h"
104-
#include "vec/exec/format/text/text_reader.h"
105-
#include "vec/exec/format/wal/wal_reader.h"
106-
#include "vec/exec/scan/scan_node.h"
107-
#include "vec/exprs/vexpr.h"
108-
#include "vec/exprs/vexpr_context.h"
109-
#include "vec/exprs/vexpr_fwd.h"
110-
#include "vec/exprs/vslot_ref.h"
111-
#include "vec/functions/function.h"
112-
#include "vec/functions/simple_function_factory.h"
113-
#include "vec/utils/stringop_substring.h"
11487

11588
namespace cctz {
11689
class time_zone;

‎be/src/exec/scan/file_scanner.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929
#include "common/factory_creator.h"
3030
#include "common/global_types.h"
3131
#include "common/status.h"
32-
#include "exec/olap_common.h"
32+
#include "core/block/block.h"
33+
#include "exec/operator/file_scan_operator.h"
34+
#include "exprs/vexpr_fwd.h"
35+
#include "format/generic_reader.h"
36+
#include "format/orc/vorc_reader.h"
37+
#include "format/parquet/vparquet_reader.h"
3338
#include "io/io_common.h"
34-
#include "pipeline/exec/file_scan_operator.h"
3539
#include "runtime/descriptors.h"
36-
#include "util/runtime_profile.h"
37-
#include "vec/core/block.h"
38-
#include "vec/exec/format/generic_reader.h"
39-
#include "vec/exec/format/orc/vorc_reader.h"
40-
#include "vec/exec/format/parquet/vparquet_reader.h"
41-
#include "vec/exprs/vexpr_fwd.h"
40+
#include "runtime/runtime_profile.h"
41+
#include "storage/olap_common.h"
4242

4343
namespace doris {
4444
class RuntimeState;

‎be/src/exec/scan/jdbc_scanner.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
#include "common/logging.h"
2626
#include "runtime/descriptors.h"
27+
#include "runtime/runtime_profile.h"
2728
#include "runtime/runtime_state.h"
2829
#include "util/jdbc_utils.h"
29-
#include "util/runtime_profile.h"
3030
#include "vec/core/block.h"
3131
#include "vec/exec/format/table/jdbc_jni_reader.h"
3232
#include "vec/exprs/vexpr_context.h"

‎be/src/exec/scan/jdbc_scanner.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
#include "common/factory_creator.h"
2828
#include "common/global_types.h"
2929
#include "common/status.h"
30-
#include "pipeline/exec/jdbc_scan_operator.h"
31-
#include "util/runtime_profile.h"
32-
#include "vec/exec/format/table/jdbc_jni_reader.h"
33-
#include "vec/exec/scan/scanner.h"
30+
#include "exec/operator/jdbc_scan_operator.h"
31+
#include "exec/scan/scanner.h"
32+
#include "format/table/jdbc_jni_reader.h"
33+
#include "runtime/runtime_profile.h"
3434

3535
namespace doris {
3636
class RuntimeState;

‎be/src/exec/sink/writer/vjdbc_table_writer.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
#include <sstream>
2424

2525
#include "common/logging.h"
26+
#include "core/block/block.h"
27+
#include "exprs/vexpr.h"
28+
#include "exprs/vexpr_context.h"
2629
#include "runtime/runtime_state.h"
2730
#include "util/jdbc_utils.h"
28-
#include "vec/core/block.h"
29-
#include "vec/exprs/vexpr.h"
30-
#include "vec/exprs/vexpr_context.h"
3131

3232
namespace doris {
3333
namespace vectorized {

‎be/src/exec/sink/writer/vjdbc_table_writer.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include <vector>
2727

2828
#include "common/status.h"
29-
#include "vec/runtime/vjni_format_transformer.h"
30-
#include "vec/sink/writer/async_result_writer.h"
29+
#include "exec/sink/writer/async_result_writer.h"
30+
#include "format/transformer/vjni_format_transformer.h"
3131

3232
namespace doris {
3333
namespace vectorized {
@@ -67,4 +67,4 @@ class VJdbcTableWriter final : public AsyncResultWriter {
6767
};
6868

6969
} // namespace vectorized
70-
} // namespace doris
70+
} // namespace doris

‎be/src/format/jni/jni_data_bridge.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,22 @@
2222
#include <sstream>
2323
#include <variant>
2424

25+
#include "core/block/block.h"
26+
#include "core/column/column_array.h"
27+
#include "core/column/column_map.h"
28+
#include "core/column/column_nullable.h"
29+
#include "core/column/column_string.h"
30+
#include "core/column/column_struct.h"
31+
#include "core/column/column_varbinary.h"
32+
#include "core/data_type/data_type_array.h"
33+
#include "core/data_type/data_type_map.h"
34+
#include "core/data_type/data_type_nullable.h"
35+
#include "core/data_type/data_type_struct.h"
36+
#include "core/data_type/data_type_varbinary.h"
37+
#include "core/types.h"
2538
#include "runtime/decimalv2_value.h"
2639
#include "runtime/define_primitive_type.h"
2740
#include "runtime/primitive_type.h"
28-
#include "vec/columns/column_array.h"
29-
#include "vec/columns/column_map.h"
30-
#include "vec/columns/column_nullable.h"
31-
#include "vec/columns/column_string.h"
32-
#include "vec/columns/column_struct.h"
33-
#include "vec/columns/column_varbinary.h"
34-
#include "vec/core/block.h"
35-
#include "vec/core/types.h"
36-
#include "vec/data_types/data_type_array.h"
37-
#include "vec/data_types/data_type_map.h"
38-
#include "vec/data_types/data_type_nullable.h"
39-
#include "vec/data_types/data_type_struct.h"
40-
#include "vec/data_types/data_type_varbinary.h"
4141

4242
namespace doris::vectorized {
4343
#include "common/compile_check_begin.h"

‎be/src/format/jni/jni_data_bridge.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
#include <vector>
2424

2525
#include "common/status.h"
26-
#include "runtime/define_primitive_type.h"
27-
#include "runtime/primitive_type.h"
28-
#include "runtime/types.h"
29-
#include "vec/aggregate_functions/aggregate_function.h"
30-
#include "vec/columns/column_decimal.h"
31-
#include "vec/common/string_ref.h"
32-
#include "vec/data_types/data_type.h"
26+
#include "core/column/column_decimal.h"
27+
#include "core/data_type/data_type.h"
28+
#include "core/data_type/define_primitive_type.h"
29+
#include "core/data_type/primitive_type.h"
30+
#include "core/string_ref.h"
31+
#include "core/types.h"
32+
#include "exprs/aggregate/aggregate_function.h"
3333

3434
namespace doris {
3535
#include "common/compile_check_begin.h"

‎be/src/format/jni_reader.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
#include <ostream>
2424
#include <sstream>
2525

26+
#include "core/types.h"
2627
#include "runtime/descriptors.h"
2728
#include "runtime/runtime_state.h"
28-
#include "runtime/types.h"
2929
#include "util/jni-util.h"
3030
#include "vec/core/block.h"
3131
#include "vec/core/types.h"

‎be/src/format/jni_reader.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
#include <vector>
2727

2828
#include "common/status.h"
29+
#include "format/generic_reader.h"
30+
#include "format/jni/jni_data_bridge.h"
31+
#include "runtime/runtime_profile.h"
2932
#include "util/jni-util.h"
3033
#include "util/profile_collector.h"
31-
#include "util/runtime_profile.h"
3234
#include "util/string_util.h"
33-
#include "vec/exec/format/generic_reader.h"
34-
#include "vec/exec/jni_data_bridge.h"
3535

3636
namespace doris {
3737
#include "common/compile_check_begin.h"

0 commit comments

Comments
 (0)