Skip to content
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

Jump to bottom

[BUG] Fix segment group add zone map bug when schema change. #4526

Merged
merged 4 commits into from
Sep 4, 2020
Merged

[BUG] Fix segment group add zone map bug when schema change. #4526

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea1fc6c
fix
ZhangYu0123 Sep 3, 2020
20417fa
add comment
ZhangYu0123 Sep 3, 2020
7643afc
add comment
ZhangYu0123 Sep 3, 2020
630ece5
Update be/src/olap/rowset/segment_group.cpp
ZhangYu0123 Sep 3, 2020
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
35 changes: 24 additions & 11 deletions be/src/olap/rowset/segment_group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,32 +258,45 @@ OLAPStatus SegmentGroup::add_zone_maps_for_linked_schema_change(

for (size_t i = 0; i < zonemap_col_num; ++i) {

// in duplicated table update from 0.11 to 0.12, zone map index may be missed
// in duplicated table update from 0.11 to 0.12, zone map index may be missed and may not a new column.
if (_schema->keys_type() == DUP_KEYS &&
schema_mapping[i].ref_column != -1 &&
schema_mapping[i].ref_column >= zone_map_fields.size()) {
continue;
break; // _zone_maps follows _schema column index
ZhangYu0123 marked this conversation as resolved.
Show resolved Hide resolved
}
const TabletColumn& column = _schema->column(i);

WrapperField* first = WrapperField::create(column);
DCHECK(first != NULL) << "failed to allocate memory for field: " << i;

WrapperField* second = WrapperField::create(column);
DCHECK(second != NULL) << "failed to allocate memory for field: " << i;
// nullptr is checked in olap_cond.cpp eval, note: When we apply column statistic, Field can be NULL when type is Varchar.
WrapperField* first = nullptr;
WrapperField* second = nullptr;

// when this is no ref_column (add new column), fill default value
if (schema_mapping[i].ref_column == -1 || schema_mapping[i].ref_column >= zone_map_fields.size()) {
// ref_column == -1 means this is a new column.
// for new column, use default value to fill into column_statistics
if (schema_mapping[i].default_value != nullptr) {
first = WrapperField::create(column);
DCHECK(first != nullptr) << "failed to allocate memory for field: " << i;
first->copy(schema_mapping[i].default_value);
second = WrapperField::create(column);
DCHECK(second != nullptr) << "failed to allocate memory for field: " << i;
second->copy(schema_mapping[i].default_value);
}
}
} else {
// use src column's zone map value to fill
first->copy(zone_map_fields[schema_mapping[i].ref_column].first);
second->copy(zone_map_fields[schema_mapping[i].ref_column].second);
WrapperField* wfirst = zone_map_fields[schema_mapping[i].ref_column].first;
WrapperField* wsecond = zone_map_fields[schema_mapping[i].ref_column].second;

if (wfirst != nullptr) {
first = WrapperField::create(column);
DCHECK(first != nullptr) << "failed to allocate memory for field: " << i;
first->copy(wfirst);
}

if (wsecond != nullptr) {
second = WrapperField::create(column);
DCHECK(second != nullptr) << "failed to allocate memory for field: " << i;
second->copy(wsecond);
}
}

_zone_maps.push_back(std::make_pair(first, second));
Expand Down