Skip to content

Set version for base_compaction #1347

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
chaoyli merged 1 commit into from
Jun 21, 2019
Merged

Set version for base_compaction #1347

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
4 changes: 4 additions & 0 deletions be/src/olap/merger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@ OLAPStatus Merger::merge(const vector<RowsetReaderSharedPtr>& rs_readers,
reader_params.reader_type = _reader_type;
reader_params.rs_readers = rs_readers;

if (_reader_type == READER_BASE_COMPACTION) {
reader_params.version = _rs_writer->version();
}

if (OLAP_SUCCESS != reader.init(reader_params)) {
LOG(WARNING) << "fail to initiate reader. tablet=" << _tablet->full_name();
return OLAP_ERR_INIT_FAILED;
Expand Down
1 change: 0 additions & 1 deletion be/src/olap/merger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class Merger {
RowsetWriterSharedPtr _rs_writer;
ReaderType _reader_type;
uint64_t _row_count;
Version _simple_merge_version;

DISALLOW_COPY_AND_ASSIGN(Merger);
};
Expand Down
1 change: 1 addition & 0 deletions be/src/olap/reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ OLAPStatus Reader::_capture_rs_readers(const ReaderParams& read_params) {
}

OLAPStatus Reader::_init_params(const ReaderParams& read_params) {
read_params.check_validation();
OLAPStatus res = OLAP_SUCCESS;
_aggregation = read_params.aggregation;
_reader_type = read_params.reader_type;
Expand Down
7 changes: 7 additions & 0 deletions be/src/olap/reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ struct ReaderParams {
ReaderParams() :
reader_type(READER_QUERY),
aggregation(false),
version(-1, 0),
profile(NULL),
runtime_state(NULL) {
start_key.clear();
Expand All @@ -77,6 +78,12 @@ struct ReaderParams {
rs_readers.clear();
}

void check_validation() const {
if (version.first == -1) {
LOG(FATAL) << "verison is not set. tablet=" << tablet->full_name();
}
}

std::string to_string() {
std::stringstream ss;

Expand Down