Skip to content

Fix tablet null pointer and wrong number of rows #1424

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 2 commits into from
Jul 3, 2019
Merged

Fix tablet null pointer and wrong number of rows #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69e012f
Fix tablet null pointer and wrong number of rows
Jul 3, 2019
139577f
Fix tablet null pointer and wrong number of rows
Jul 3, 2019
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
2 changes: 1 addition & 1 deletion be/src/exec/olap_scanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Status OlapScanner::_prepare(
if (acquire_reader_st != OLAP_SUCCESS) {
LOG(WARNING) << "fail to init reader.res=" << acquire_reader_st;
std::stringstream ss;
ss << "failed to initialize storage reader. tablet=" << _params.tablet->full_name()
ss << "failed to initialize storage reader. tablet=" << _tablet->full_name()
<< ", res=" << acquire_reader_st << ", backend=" << BackendOptions::get_localhost();
return Status::InternalError(ss.str().c_str());
}
Expand Down
12 changes: 11 additions & 1 deletion be/src/olap/rowset/alpha_rowset_writer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ OLAPStatus AlphaRowsetWriter::add_rowset(RowsetSharedPtr rowset) {
_cur_segment_group->set_num_segments(segment_group->num_segments());
_cur_segment_group->add_zone_maps_for_linked_schema_change(segment_group->get_zone_maps());
RETURN_NOT_OK(flush());
_num_rows_written += alpha_rowset->num_rows();
_num_rows_written += segment_group->num_rows();
}
return OLAP_SUCCESS;
}
Expand Down Expand Up @@ -308,6 +308,16 @@ bool AlphaRowsetWriter::_validate_rowset() {
return false;
}
}
int64_t num_rows = 0;
for (auto& segment_group : _segment_groups) {
num_rows += segment_group->num_rows();
}
if (num_rows != _current_rowset_meta->num_rows()) {
LOG(WARNING) << "num_rows between rowset and segment_groups do not match. "
<< "num_rows of segment_groups:" << num_rows
<< ", num_rows of rowset:" << _current_rowset_meta->num_rows();
return false;
}
return true;
}

Expand Down