Skip to content

[refactor](renamefile) rename some files according to the class names #28606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 4 commits into from
Dec 19, 2023
Merged

[refactor](renamefile) rename some files according to the class names #28606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14a2ade
[refactor](renamefile) rename some files according to the class names
Doris-Extras Dec 19, 2023
915a8c2
f
Doris-Extras Dec 19, 2023
d9dd29e
f
Doris-Extras Dec 19, 2023
3dd92fe
f
Doris-Extras Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions be/src/exec/data_sink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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"
#include "vec/sink/vtablet_sink.h"
#include "vec/sink/vtablet_sink_v2.h"

namespace doris {
class DescriptorTbl;
Expand Down
2 changes: 1 addition & 1 deletion be/src/olap/merger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@
#include "common/logging.h"
#include "olap/olap_common.h"
#include "olap/olap_define.h"
#include "olap/reader.h"
#include "olap/rowid_conversion.h"
#include "olap/rowset/rowset.h"
#include "olap/rowset/rowset_meta.h"
#include "olap/rowset/rowset_writer.h"
#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"
Expand Down
2 changes: 1 addition & 1 deletion be/src/olap/rowset/segcompaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
#include "olap/merger.h"
#include "olap/olap_common.h"
#include "olap/olap_define.h"
#include "olap/reader.h"
#include "olap/rowset/beta_rowset.h"
#include "olap/rowset/rowset_meta.h"
#include "olap/rowset/rowset_writer_context.h"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion be/src/olap/reader.cpp → be/src/olap/tablet_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.

#include "olap/reader.h"
#include "olap/tablet_reader.h"

#include <gen_cpp/olap_file.pb.h>
#include <gen_cpp/segment_v2.pb.h>
Expand Down
0 be/src/olap/reader.h → be/src/olap/tablet_reader.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion be/src/olap/task/engine_checksum_task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
#include "io/io_common.h"
#include "olap/olap_common.h"
#include "olap/olap_define.h"
#include "olap/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"
Expand Down
2 changes: 1 addition & 1 deletion be/src/pipeline/exec/olap_table_sink_operator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion be/src/pipeline/exec/olap_table_sink_v2_operator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/exec/scan/new_olap_scan_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@
#include "common/object_pool.h"
#include "common/status.h"
#include "exec/exec_node.h"
#include "olap/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"
Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/exec/scan/new_olap_scanner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
#include "common/factory_creator.h"
#include "common/status.h"
#include "olap/data_dir.h"
#include "olap/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"

Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/olap/block_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <vector>

#include "common/status.h"
#include "olap/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"
Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/olap/vcollect_iterator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#include <ext/pb_ds/priority_queue.hpp>
#endif

#include "olap/reader.h"
#include "olap/rowset/rowset_reader.h"
#include "olap/tablet_reader.h"
#include "vec/core/block.h"

namespace __gnu_pbds {
Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/olap/vertical_block_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
#include "common/compiler_util.h" // IWYU pragma: keep
#include "common/status.h"
#include "olap/iterators.h"
#include "olap/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"
Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/sink/group_commit_block_sink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
#include "runtime/runtime_state.h"
#include "util/doris_metrics.h"
#include "vec/exprs/vexpr.h"
#include "vec/sink/volap_table_sink.h"
#include "vec/sink/vtablet_finder.h"
#include "vec/sink/vtablet_sink.h"

namespace doris {

Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/sink/group_commit_block_sink.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion be/src/vec/sink/vtablet_sink.cpp → be/src/vec/sink/volap_table_sink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <brpc/http_header.h>
#include <brpc/http_method.h>
Expand Down
0 be/src/vec/sink/vtablet_sink.h → be/src/vec/sink/volap_table_sink.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion be/src/vec/sink/vtablet_sink_v2.cpp → be/src/vec/sink/volap_table_sink_v2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <gen_cpp/DataSinks_types.h>
#include <gen_cpp/Descriptors_types.h>
Expand Down
0 be/src/vec/sink/vtablet_sink_v2.h → be/src/vec/sink/volap_table_sink_v2.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion be/src/vec/sink/writer/vtablet_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/volap_table_sink.h"
#include "vec/sink/vrow_distribution.h"
#include "vec/sink/vtablet_sink.h"

#ifdef DEBUG
#include <unordered_set>
Expand Down
3 changes: 1 addition & 2 deletions be/test/vec/exec/vtablet_sink_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/vtablet_sink.h"

#include <brpc/closure_guard.h>
#include <brpc/server.h>
#include <gen_cpp/DataSinks_types.h>
Expand Down Expand Up @@ -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 {
Expand Down