database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix creating rollup bug from multi SegmentGroups generated streaming … (#1287)

Browse Source 
In streaming load, one version will generate multi SegmentGroups.
Upon creating rollup, the previous code only check version exists or not.
Instead, every SegmentGroup should be checked independently.
This commit is contained in:
lichaoyong
2019-06-12 16:21:14 +08:00
committed by GitHub
parent 5dea4fb414
commit 6be806aa39
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
be/src/olap/olap_table.cpp
View File

@ -1867,8 +1867,19 @@ void OLAPTable::_list_files_with_suffix(const string& file_suffix, set<string>*
}
}
bool OLAPTable::has_version(const Version& version) const {
return (_data_sources.find(version) != _data_sources.end());
bool OLAPTable::has_segment_group(const Version& version, const SegmentGroup* new_segment_group) const {
auto it = _data_sources.find(version);
if (it == _data_sources.end()) {
return false;
}
bool exist = false;
for (auto segment_group : it->second) {
if (segment_group->segment_group_id() == new_segment_group->segment_group_id()) {
exist = true;
break;
}
}
return exist;
}
void OLAPTable::list_versions(vector<Version>* versions) const {

2
be/src/olap/olap_table.h
View File

@ -234,7 +234,7 @@ public:
void list_index_files(std::set<std::string>* filenames) const;
bool has_version(const Version& version) const;
bool has_segment_group(const Version& version, const SegmentGroup* new_segment_group) const;
void list_versions(std::vector<Version>* versions) const;

2
be/src/olap/schema_change.cpp
View File

@ -2106,7 +2106,7 @@ OLAPStatus SchemaChangeHandler::_alter_table(SchemaChangeParams* sc_params) {
sc_params->ref_olap_table->obtain_header_wrlock();
sc_params->new_olap_table->obtain_header_wrlock();
if (!sc_params->new_olap_table->has_version((*it)->version())) {
if (!sc_params->new_olap_table->has_segment_group((*it)->version(), new_segment_group)) {
// register version
std::vector<SegmentGroup*> segment_group_vec;
segment_group_vec.push_back(new_segment_group);