Skip to content

[refactor](load) change segcompaction worker interface #22928

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
dataroaring merged 1 commit into from
Aug 15, 2023
Merged

[refactor](load) change segcompaction worker interface #22928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions be/src/olap/rowset/segcompaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
namespace doris {
using namespace ErrorCode;

SegcompactionWorker::SegcompactionWorker(BetaRowsetWriter* writer) : _writer(writer) {}

Status SegcompactionWorker::_get_segcompaction_reader(
SegCompactionCandidatesSharedPtr segments, TabletSharedPtr tablet,
std::shared_ptr<Schema> schema, OlapReaderStatistics* stat,
Expand Down Expand Up @@ -149,8 +151,8 @@ Status SegcompactionWorker::_delete_original_segments(uint32_t begin, uint32_t e
}

Status SegcompactionWorker::_check_correctness(OlapReaderStatistics& reader_stat,
Merger::Statistics& merger_stat, uint64_t begin,
uint64_t end) {
Merger::Statistics& merger_stat, uint32_t begin,
uint32_t end) {
uint64_t raw_rows_read = reader_stat.raw_rows_read; /* total rows read before merge */
uint64_t sum_src_row = 0; /* sum of rows in each involved source segments */
uint64_t filtered_rows = merger_stat.filtered_rows; /* rows filtered by del conditions */
Expand Down Expand Up @@ -186,7 +188,7 @@ Status SegcompactionWorker::_check_correctness(OlapReaderStatistics& reader_stat
}

Status SegcompactionWorker::_create_segment_writer_for_segcompaction(
std::unique_ptr<segment_v2::SegmentWriter>* writer, uint64_t begin, uint64_t end) {
std::unique_ptr<segment_v2::SegmentWriter>* writer, uint32_t begin, uint32_t end) {
return _writer->_create_segment_writer_for_segcompaction(writer, begin, end);
}

Expand Down
6 changes: 3 additions & 3 deletions be/src/olap/rowset/segcompaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class SegcompactionWorker {
friend class BetaRowsetWriter;

public:
SegcompactionWorker(BetaRowsetWriter* writer) { _writer = writer; }
SegcompactionWorker(BetaRowsetWriter* writer);

void compact_segments(SegCompactionCandidatesSharedPtr segments);

Expand All @@ -59,7 +59,7 @@ class SegcompactionWorker {

private:
Status _create_segment_writer_for_segcompaction(
std::unique_ptr<segment_v2::SegmentWriter>* writer, uint64_t begin, uint64_t end);
std::unique_ptr<segment_v2::SegmentWriter>* writer, uint32_t begin, uint32_t end);
Status _get_segcompaction_reader(SegCompactionCandidatesSharedPtr segments,
TabletSharedPtr tablet, std::shared_ptr<Schema> schema,
OlapReaderStatistics* stat,
Expand All @@ -70,7 +70,7 @@ class SegcompactionWorker {
uint32_t end);
Status _delete_original_segments(uint32_t begin, uint32_t end);
Status _check_correctness(OlapReaderStatistics& reader_stat, Merger::Statistics& merger_stat,
uint64_t begin, uint64_t end);
uint32_t begin, uint32_t end);
Status _do_compact_segments(SegCompactionCandidatesSharedPtr segments);

private:
Expand Down