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

Fix segment group add zone check bug and remove unused meta log (#1513)

Browse Source
This commit is contained in:
kangpinghuang
2019-07-19 17:03:19 +08:00
committed by ZHAO Chun
parent 227af49331
commit 74eb43206d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
be/src/olap/olap_meta.cpp
View File

@ -97,7 +97,6 @@ OLAPStatus OlapMeta::get(const int column_family_index, const std::string& key,
}
DorisMetrics::meta_read_request_duration_us.increment(duration_ns / 1000);
if (s.IsNotFound()) {
LOG(WARNING) << "rocks db key not found:" << key;
return OLAP_ERR_META_KEY_NOT_FOUND;
} else if (!s.ok()) {
LOG(WARNING) << "rocks db get key:" << key << " failed, reason:" << s.ToString();

4
be/src/olap/rowset/segment_group.cpp
View File

@ -276,7 +276,7 @@ OLAPStatus SegmentGroup::add_zone_maps_for_linked_schema_change(
OLAPStatus SegmentGroup::add_zone_maps(
const std::vector<std::pair<WrapperField*, WrapperField*>>& zone_map_fields) {
DCHECK(zone_map_fields.size() == _schema->num_key_columns());
DCHECK(_empty || zone_map_fields.size() == _schema->num_key_columns());
for (size_t i = 0; i < zone_map_fields.size(); ++i) {
const TabletColumn& column = _schema->column(i);
WrapperField* first = WrapperField::create(column);
@ -295,7 +295,7 @@ OLAPStatus SegmentGroup::add_zone_maps(
OLAPStatus SegmentGroup::add_zone_maps(
std::vector<std::pair<std::string, std::string> > &zone_map_strings,
std::vector<bool> &null_vec) {
DCHECK(zone_map_strings.size() == _schema->num_key_columns());
DCHECK(_empty || zone_map_strings.size() == _schema->num_key_columns());
for (size_t i = 0; i < zone_map_strings.size(); ++i) {
const TabletColumn& column = _schema->column(i);
WrapperField* first = WrapperField::create(column);