From 14a2ade465ab3a3a5a76e29a90b517495b1b5c19 Mon Sep 17 00:00:00 2001 From: yiguolei Date: Tue, 19 Dec 2023 09:55:10 +0800 Subject: [PATCH 1/4] [refactor](renamefile) rename some files according to the class names --- be/src/olap/merger.cpp | 2 +- be/src/olap/rowset/segcompaction.cpp | 2 +- be/src/olap/{reader.cpp => tablet_reader.cpp} | 2 +- be/src/olap/{reader.h => tablet_reader.h} | 0 be/src/olap/task/engine_checksum_task.cpp | 2 +- be/src/vec/sink/group_commit_block_sink.cpp | 2 +- be/src/vec/sink/group_commit_block_sink.h | 2 +- be/src/vec/sink/{vtablet_sink.cpp => volap_table_sink.cpp} | 2 +- be/src/vec/sink/{vtablet_sink.h => volap_table_sink.h} | 0 .../vec/sink/{vtablet_sink_v2.cpp => volap_table_sink_v2.cpp} | 2 +- be/src/vec/sink/{vtablet_sink_v2.h => volap_table_sink_v2.h} | 0 be/src/vec/sink/writer/vtablet_writer.cpp | 2 +- 12 files changed, 9 insertions(+), 9 deletions(-) rename be/src/olap/{reader.cpp => tablet_reader.cpp} (99%) rename be/src/olap/{reader.h => tablet_reader.h} (100%) rename be/src/vec/sink/{vtablet_sink.cpp => volap_table_sink.cpp} (99%) rename be/src/vec/sink/{vtablet_sink.h => volap_table_sink.h} (100%) rename be/src/vec/sink/{vtablet_sink_v2.cpp => volap_table_sink_v2.cpp} (98%) rename be/src/vec/sink/{vtablet_sink_v2.h => volap_table_sink_v2.h} (100%) diff --git a/be/src/olap/merger.cpp b/be/src/olap/merger.cpp index 9a57bcd3874270..f5e9f123a1d327 100644 --- a/be/src/olap/merger.cpp +++ b/be/src/olap/merger.cpp @@ -35,7 +35,7 @@ #include "common/logging.h" #include "olap/olap_common.h" #include "olap/olap_define.h" -#include "olap/reader.h" +#include "olap/tablet_reader.h" #include "olap/rowid_conversion.h" #include "olap/rowset/rowset.h" #include "olap/rowset/rowset_meta.h" diff --git a/be/src/olap/rowset/segcompaction.cpp b/be/src/olap/rowset/segcompaction.cpp index c772ba711a4b66..417eb326176855 100644 --- a/be/src/olap/rowset/segcompaction.cpp +++ b/be/src/olap/rowset/segcompaction.cpp @@ -45,7 +45,7 @@ #include "olap/merger.h" #include "olap/olap_common.h" #include "olap/olap_define.h" -#include "olap/reader.h" +#include "olap/tablet_reader.h" #include "olap/rowset/beta_rowset.h" #include "olap/rowset/rowset_meta.h" #include "olap/rowset/rowset_writer_context.h" diff --git a/be/src/olap/reader.cpp b/be/src/olap/tablet_reader.cpp similarity index 99% rename from be/src/olap/reader.cpp rename to be/src/olap/tablet_reader.cpp index 68365b66fcd927..ea945e6c4231b0 100644 --- a/be/src/olap/reader.cpp +++ b/be/src/olap/tablet_reader.cpp @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "olap/reader.h" +#include "olap/tablet_reader.h" #include #include diff --git a/be/src/olap/reader.h b/be/src/olap/tablet_reader.h similarity index 100% rename from be/src/olap/reader.h rename to be/src/olap/tablet_reader.h diff --git a/be/src/olap/task/engine_checksum_task.cpp b/be/src/olap/task/engine_checksum_task.cpp index 9b72c6f48d9c1f..a79a0b33032511 100644 --- a/be/src/olap/task/engine_checksum_task.cpp +++ b/be/src/olap/task/engine_checksum_task.cpp @@ -27,7 +27,7 @@ #include "io/io_common.h" #include "olap/olap_common.h" #include "olap/olap_define.h" -#include "olap/reader.h" +#include "olap/tablet_reader.h" #include "olap/rowset/rowset.h" #include "olap/storage_engine.h" #include "olap/tablet.h" diff --git a/be/src/vec/sink/group_commit_block_sink.cpp b/be/src/vec/sink/group_commit_block_sink.cpp index bb5c5c70d0c587..370044ff035634 100644 --- a/be/src/vec/sink/group_commit_block_sink.cpp +++ b/be/src/vec/sink/group_commit_block_sink.cpp @@ -22,7 +22,7 @@ #include "util/doris_metrics.h" #include "vec/exprs/vexpr.h" #include "vec/sink/vtablet_finder.h" -#include "vec/sink/vtablet_sink.h" +#include "vec/sink/volap_table_sink.h" namespace doris { diff --git a/be/src/vec/sink/group_commit_block_sink.h b/be/src/vec/sink/group_commit_block_sink.h index 2ae37be368a29b..79a60b03f91db8 100644 --- a/be/src/vec/sink/group_commit_block_sink.h +++ b/be/src/vec/sink/group_commit_block_sink.h @@ -18,7 +18,7 @@ #pragma once #include "exec/data_sink.h" #include "vec/exprs/vexpr_fwd.h" -#include "vec/sink/vtablet_sink.h" +#include "vec/sink/volap_table_sink.h" namespace doris { diff --git a/be/src/vec/sink/vtablet_sink.cpp b/be/src/vec/sink/volap_table_sink.cpp similarity index 99% rename from be/src/vec/sink/vtablet_sink.cpp rename to be/src/vec/sink/volap_table_sink.cpp index f47a89978e4ce5..7d607d5f003bfd 100644 --- a/be/src/vec/sink/vtablet_sink.cpp +++ b/be/src/vec/sink/volap_table_sink.cpp @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "vec/sink/vtablet_sink.h" +#include "vec/sink/volap_table_sink.h" #include #include diff --git a/be/src/vec/sink/vtablet_sink.h b/be/src/vec/sink/volap_table_sink.h similarity index 100% rename from be/src/vec/sink/vtablet_sink.h rename to be/src/vec/sink/volap_table_sink.h diff --git a/be/src/vec/sink/vtablet_sink_v2.cpp b/be/src/vec/sink/volap_table_sink_v2.cpp similarity index 98% rename from be/src/vec/sink/vtablet_sink_v2.cpp rename to be/src/vec/sink/volap_table_sink_v2.cpp index e75bebba89fcd8..a41b77ace53cab 100644 --- a/be/src/vec/sink/vtablet_sink_v2.cpp +++ b/be/src/vec/sink/volap_table_sink_v2.cpp @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "vec/sink/vtablet_sink_v2.h" +#include "vec/sink/volap_table_sink_v2.h" #include #include diff --git a/be/src/vec/sink/vtablet_sink_v2.h b/be/src/vec/sink/volap_table_sink_v2.h similarity index 100% rename from be/src/vec/sink/vtablet_sink_v2.h rename to be/src/vec/sink/volap_table_sink_v2.h diff --git a/be/src/vec/sink/writer/vtablet_writer.cpp b/be/src/vec/sink/writer/vtablet_writer.cpp index 67f4ed378decc5..6e6113bf3d8b58 100644 --- a/be/src/vec/sink/writer/vtablet_writer.cpp +++ b/be/src/vec/sink/writer/vtablet_writer.cpp @@ -53,7 +53,7 @@ #include "vec/exprs/vexpr_fwd.h" #include "vec/runtime/vdatetime_value.h" #include "vec/sink/vrow_distribution.h" -#include "vec/sink/vtablet_sink.h" +#include "vec/sink/volap_table_sink.h" #ifdef DEBUG #include From 915a8c29bf613f93c708ac91b3cbba1b0dd1a069 Mon Sep 17 00:00:00 2001 From: yiguolei Date: Tue, 19 Dec 2023 10:06:57 +0800 Subject: [PATCH 2/4] f --- be/src/exec/data_sink.cpp | 4 ++-- be/src/pipeline/exec/olap_table_sink_operator.h | 2 +- be/src/pipeline/exec/olap_table_sink_v2_operator.h | 2 +- be/src/vec/exec/scan/new_olap_scan_node.cpp | 2 +- be/src/vec/exec/scan/new_olap_scanner.h | 2 +- be/src/vec/olap/block_reader.h | 2 +- be/src/vec/olap/vcollect_iterator.h | 2 +- be/src/vec/olap/vertical_block_reader.h | 2 +- be/test/vec/exec/vtablet_sink_test.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/be/src/exec/data_sink.cpp b/be/src/exec/data_sink.cpp index 2c50928ec495d3..9b8e255b0a051a 100644 --- a/be/src/exec/data_sink.cpp +++ b/be/src/exec/data_sink.cpp @@ -37,8 +37,8 @@ #include "vec/sink/vmemory_scratch_sink.h" #include "vec/sink/vresult_file_sink.h" #include "vec/sink/vresult_sink.h" -#include "vec/sink/vtablet_sink.h" -#include "vec/sink/vtablet_sink_v2.h" +#include "vec/sink/volap_table_sink.h" +#include "vec/sink/volap_table_sink_v2.h" namespace doris { class DescriptorTbl; diff --git a/be/src/pipeline/exec/olap_table_sink_operator.h b/be/src/pipeline/exec/olap_table_sink_operator.h index 9075e3cb03f599..55fea64c6346e4 100644 --- a/be/src/pipeline/exec/olap_table_sink_operator.h +++ b/be/src/pipeline/exec/olap_table_sink_operator.h @@ -19,7 +19,7 @@ #include "operator.h" #include "pipeline/pipeline_x/operator.h" -#include "vec/sink/vtablet_sink.h" +#include "vec/sink/volap_table_sink.h" namespace doris { diff --git a/be/src/pipeline/exec/olap_table_sink_v2_operator.h b/be/src/pipeline/exec/olap_table_sink_v2_operator.h index 08a6a39d56df65..5c8cce62b8b5a8 100644 --- a/be/src/pipeline/exec/olap_table_sink_v2_operator.h +++ b/be/src/pipeline/exec/olap_table_sink_v2_operator.h @@ -19,7 +19,7 @@ #include "operator.h" #include "pipeline/pipeline_x/operator.h" -#include "vec/sink/vtablet_sink_v2.h" +#include "vec/sink/volap_table_sink_v2.h" namespace doris { diff --git a/be/src/vec/exec/scan/new_olap_scan_node.cpp b/be/src/vec/exec/scan/new_olap_scan_node.cpp index 9813d549bd419f..5a5ff93a0ff9a5 100644 --- a/be/src/vec/exec/scan/new_olap_scan_node.cpp +++ b/be/src/vec/exec/scan/new_olap_scan_node.cpp @@ -39,7 +39,7 @@ #include "common/object_pool.h" #include "common/status.h" #include "exec/exec_node.h" -#include "olap/reader.h" +#include "olap/tablet_reader.h" #include "olap/rowset/rowset.h" #include "olap/rowset/rowset_reader.h" #include "olap/storage_engine.h" diff --git a/be/src/vec/exec/scan/new_olap_scanner.h b/be/src/vec/exec/scan/new_olap_scanner.h index 36e6475fca5453..4dbdc5300d0e74 100644 --- a/be/src/vec/exec/scan/new_olap_scanner.h +++ b/be/src/vec/exec/scan/new_olap_scanner.h @@ -29,7 +29,7 @@ #include "common/factory_creator.h" #include "common/status.h" #include "olap/data_dir.h" -#include "olap/reader.h" +#include "olap/tablet_reader.h" #include "olap/rowset/rowset_meta.h" #include "olap/rowset/rowset_reader.h" #include "olap/tablet.h" diff --git a/be/src/vec/olap/block_reader.h b/be/src/vec/olap/block_reader.h index 00c8ae4009f66b..eb843e5db083a6 100644 --- a/be/src/vec/olap/block_reader.h +++ b/be/src/vec/olap/block_reader.h @@ -24,7 +24,7 @@ #include #include "common/status.h" -#include "olap/reader.h" +#include "olap/tablet_reader.h" #include "olap/rowset/rowset_reader.h" #include "olap/utils.h" #include "vec/aggregate_functions/aggregate_function.h" diff --git a/be/src/vec/olap/vcollect_iterator.h b/be/src/vec/olap/vcollect_iterator.h index 2c53d987130de2..ba5e7ad07b2111 100644 --- a/be/src/vec/olap/vcollect_iterator.h +++ b/be/src/vec/olap/vcollect_iterator.h @@ -33,7 +33,7 @@ #include #endif -#include "olap/reader.h" +#include "olap/tablet_reader.h" #include "olap/rowset/rowset_reader.h" #include "vec/core/block.h" diff --git a/be/src/vec/olap/vertical_block_reader.h b/be/src/vec/olap/vertical_block_reader.h index 9230bf211e31b0..6f0d57e5698166 100644 --- a/be/src/vec/olap/vertical_block_reader.h +++ b/be/src/vec/olap/vertical_block_reader.h @@ -29,7 +29,7 @@ #include "common/compiler_util.h" // IWYU pragma: keep #include "common/status.h" #include "olap/iterators.h" -#include "olap/reader.h" +#include "olap/tablet_reader.h" #include "olap/tablet.h" #include "olap/utils.h" #include "vec/aggregate_functions/aggregate_function.h" diff --git a/be/test/vec/exec/vtablet_sink_test.cpp b/be/test/vec/exec/vtablet_sink_test.cpp index 890333465e8eb4..8e856d6e7d03d7 100644 --- a/be/test/vec/exec/vtablet_sink_test.cpp +++ b/be/test/vec/exec/vtablet_sink_test.cpp @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -#include "vec/sink/vtablet_sink.h" +#include "vec/sink/volap_table_sink.h" #include #include From d9dd29ea4f924af9d81983598aed65663ad5c464 Mon Sep 17 00:00:00 2001 From: yiguolei Date: Tue, 19 Dec 2023 10:46:00 +0800 Subject: [PATCH 3/4] f --- be/src/olap/merger.cpp | 2 +- be/src/olap/rowset/segcompaction.cpp | 2 +- be/src/olap/task/engine_checksum_task.cpp | 2 +- be/src/vec/exec/scan/new_olap_scan_node.cpp | 2 +- be/src/vec/exec/scan/new_olap_scanner.h | 2 +- be/src/vec/olap/block_reader.h | 2 +- be/src/vec/olap/vcollect_iterator.h | 2 +- be/src/vec/olap/vertical_block_reader.h | 2 +- be/src/vec/sink/group_commit_block_sink.cpp | 2 +- be/src/vec/sink/writer/vtablet_writer.cpp | 2 +- be/test/vec/exec/vtablet_sink_test.cpp | 3 +-- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/be/src/olap/merger.cpp b/be/src/olap/merger.cpp index f5e9f123a1d327..714eb04e4d9e0c 100644 --- a/be/src/olap/merger.cpp +++ b/be/src/olap/merger.cpp @@ -35,7 +35,6 @@ #include "common/logging.h" #include "olap/olap_common.h" #include "olap/olap_define.h" -#include "olap/tablet_reader.h" #include "olap/rowid_conversion.h" #include "olap/rowset/rowset.h" #include "olap/rowset/rowset_meta.h" @@ -43,6 +42,7 @@ #include "olap/rowset/segment_v2/segment_writer.h" #include "olap/storage_engine.h" #include "olap/tablet.h" +#include "olap/tablet_reader.h" #include "olap/utils.h" #include "util/slice.h" #include "vec/core/block.h" diff --git a/be/src/olap/rowset/segcompaction.cpp b/be/src/olap/rowset/segcompaction.cpp index 417eb326176855..be92557da237d6 100644 --- a/be/src/olap/rowset/segcompaction.cpp +++ b/be/src/olap/rowset/segcompaction.cpp @@ -45,7 +45,6 @@ #include "olap/merger.h" #include "olap/olap_common.h" #include "olap/olap_define.h" -#include "olap/tablet_reader.h" #include "olap/rowset/beta_rowset.h" #include "olap/rowset/rowset_meta.h" #include "olap/rowset/rowset_writer_context.h" @@ -55,6 +54,7 @@ #include "olap/rowset/segment_v2/segment_writer.h" #include "olap/schema.h" #include "olap/storage_engine.h" +#include "olap/tablet_reader.h" #include "olap/tablet_schema.h" #include "runtime/thread_context.h" #include "util/debug_points.h" diff --git a/be/src/olap/task/engine_checksum_task.cpp b/be/src/olap/task/engine_checksum_task.cpp index a79a0b33032511..ff977df3d32c47 100644 --- a/be/src/olap/task/engine_checksum_task.cpp +++ b/be/src/olap/task/engine_checksum_task.cpp @@ -27,11 +27,11 @@ #include "io/io_common.h" #include "olap/olap_common.h" #include "olap/olap_define.h" -#include "olap/tablet_reader.h" #include "olap/rowset/rowset.h" #include "olap/storage_engine.h" #include "olap/tablet.h" #include "olap/tablet_manager.h" +#include "olap/tablet_reader.h" #include "olap/utils.h" #include "runtime/memory/mem_tracker_limiter.h" #include "runtime/thread_context.h" diff --git a/be/src/vec/exec/scan/new_olap_scan_node.cpp b/be/src/vec/exec/scan/new_olap_scan_node.cpp index 5a5ff93a0ff9a5..ec13214900394d 100644 --- a/be/src/vec/exec/scan/new_olap_scan_node.cpp +++ b/be/src/vec/exec/scan/new_olap_scan_node.cpp @@ -39,12 +39,12 @@ #include "common/object_pool.h" #include "common/status.h" #include "exec/exec_node.h" -#include "olap/tablet_reader.h" #include "olap/rowset/rowset.h" #include "olap/rowset/rowset_reader.h" #include "olap/storage_engine.h" #include "olap/tablet.h" #include "olap/tablet_manager.h" +#include "olap/tablet_reader.h" #include "runtime/decimalv2_value.h" #include "runtime/define_primitive_type.h" #include "runtime/query_statistics.h" diff --git a/be/src/vec/exec/scan/new_olap_scanner.h b/be/src/vec/exec/scan/new_olap_scanner.h index 4dbdc5300d0e74..ae094b84f0390e 100644 --- a/be/src/vec/exec/scan/new_olap_scanner.h +++ b/be/src/vec/exec/scan/new_olap_scanner.h @@ -29,10 +29,10 @@ #include "common/factory_creator.h" #include "common/status.h" #include "olap/data_dir.h" -#include "olap/tablet_reader.h" #include "olap/rowset/rowset_meta.h" #include "olap/rowset/rowset_reader.h" #include "olap/tablet.h" +#include "olap/tablet_reader.h" #include "olap/tablet_schema.h" #include "vec/exec/scan/vscanner.h" diff --git a/be/src/vec/olap/block_reader.h b/be/src/vec/olap/block_reader.h index eb843e5db083a6..ed6d1ba02284e2 100644 --- a/be/src/vec/olap/block_reader.h +++ b/be/src/vec/olap/block_reader.h @@ -24,8 +24,8 @@ #include #include "common/status.h" -#include "olap/tablet_reader.h" #include "olap/rowset/rowset_reader.h" +#include "olap/tablet_reader.h" #include "olap/utils.h" #include "vec/aggregate_functions/aggregate_function.h" #include "vec/columns/column.h" diff --git a/be/src/vec/olap/vcollect_iterator.h b/be/src/vec/olap/vcollect_iterator.h index ba5e7ad07b2111..06b17329163388 100644 --- a/be/src/vec/olap/vcollect_iterator.h +++ b/be/src/vec/olap/vcollect_iterator.h @@ -33,8 +33,8 @@ #include #endif -#include "olap/tablet_reader.h" #include "olap/rowset/rowset_reader.h" +#include "olap/tablet_reader.h" #include "vec/core/block.h" namespace __gnu_pbds { diff --git a/be/src/vec/olap/vertical_block_reader.h b/be/src/vec/olap/vertical_block_reader.h index 6f0d57e5698166..d3c500cbd8ee93 100644 --- a/be/src/vec/olap/vertical_block_reader.h +++ b/be/src/vec/olap/vertical_block_reader.h @@ -29,8 +29,8 @@ #include "common/compiler_util.h" // IWYU pragma: keep #include "common/status.h" #include "olap/iterators.h" -#include "olap/tablet_reader.h" #include "olap/tablet.h" +#include "olap/tablet_reader.h" #include "olap/utils.h" #include "vec/aggregate_functions/aggregate_function.h" #include "vec/columns/column.h" diff --git a/be/src/vec/sink/group_commit_block_sink.cpp b/be/src/vec/sink/group_commit_block_sink.cpp index 370044ff035634..22c52e749f449f 100644 --- a/be/src/vec/sink/group_commit_block_sink.cpp +++ b/be/src/vec/sink/group_commit_block_sink.cpp @@ -21,8 +21,8 @@ #include "runtime/runtime_state.h" #include "util/doris_metrics.h" #include "vec/exprs/vexpr.h" -#include "vec/sink/vtablet_finder.h" #include "vec/sink/volap_table_sink.h" +#include "vec/sink/vtablet_finder.h" namespace doris { diff --git a/be/src/vec/sink/writer/vtablet_writer.cpp b/be/src/vec/sink/writer/vtablet_writer.cpp index 6e6113bf3d8b58..585bc636a70c8c 100644 --- a/be/src/vec/sink/writer/vtablet_writer.cpp +++ b/be/src/vec/sink/writer/vtablet_writer.cpp @@ -52,8 +52,8 @@ #include "vec/data_types/data_type.h" #include "vec/exprs/vexpr_fwd.h" #include "vec/runtime/vdatetime_value.h" -#include "vec/sink/vrow_distribution.h" #include "vec/sink/volap_table_sink.h" +#include "vec/sink/vrow_distribution.h" #ifdef DEBUG #include diff --git a/be/test/vec/exec/vtablet_sink_test.cpp b/be/test/vec/exec/vtablet_sink_test.cpp index 8e856d6e7d03d7..81c2bdc4b072e3 100644 --- a/be/test/vec/exec/vtablet_sink_test.cpp +++ b/be/test/vec/exec/vtablet_sink_test.cpp @@ -14,8 +14,6 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -#include "vec/sink/volap_table_sink.h" - #include #include #include @@ -48,6 +46,7 @@ #include "util/threadpool.h" #include "vec/core/block.h" #include "vec/core/column_with_type_and_name.h" +#include "vec/sink/volap_table_sink.h" namespace google { namespace protobuf { From 3dd92fe5c4a4b986ed8cfe82898ce481ed559370 Mon Sep 17 00:00:00 2001 From: yiguolei Date: Tue, 19 Dec 2023 11:09:28 +0800 Subject: [PATCH 4/4] f --- be/src/exec/data_sink.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/be/src/exec/data_sink.cpp b/be/src/exec/data_sink.cpp index 9b8e255b0a051a..2742ccd163e581 100644 --- a/be/src/exec/data_sink.cpp +++ b/be/src/exec/data_sink.cpp @@ -35,10 +35,10 @@ #include "vec/sink/multi_cast_data_stream_sink.h" #include "vec/sink/vdata_stream_sender.h" #include "vec/sink/vmemory_scratch_sink.h" -#include "vec/sink/vresult_file_sink.h" -#include "vec/sink/vresult_sink.h" #include "vec/sink/volap_table_sink.h" #include "vec/sink/volap_table_sink_v2.h" +#include "vec/sink/vresult_file_sink.h" +#include "vec/sink/vresult_sink.h" namespace doris { class DescriptorTbl;