milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[skip ci]fix cpplint (#3507) 

Signed-off-by: shengjun.li <shengjun.li@zilliz.com>
pull/3501/head^2
shengjun.li 2020-08-28 15:31:16 +08:00 committed by GitHub
parent d654d81b97
commit 378ddd0d6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/db/merge/MergeLayerStrategy.cpp
View File

@ -53,16 +53,16 @@ MergeLayerStrategy::RegroupSegments(const Partition2SegmentsMap& part2segment, i
// distribute segments to layers according to segment row count
SegmentInfoList temp_list = kv.second;
for (SegmentInfoList::iterator iter = temp_list.begin(); iter != temp_list.end();) {
for (auto iter = temp_list.begin(); iter != temp_list.end();) {
SegmentInfo& segment_info = *iter;
if (segment_info.row_count_ <= 0 || segment_info.row_count_ >= row_per_segment) {
iter = temp_list.erase(iter);
continue; // empty segment or full segment
}
for (auto layer_iter = layers.begin(); layer_iter != layers.end(); ++layer_iter) {
if (segment_info.row_count_ < layer_iter->first) {
layer_iter->second.push_back(segment_info);
for (auto& layer_iter : layers) {
if (segment_info.row_count_ < layer_iter.first) {
layer_iter.second.push_back(segment_info);
break;
}
}
@ -80,7 +80,7 @@ MergeLayerStrategy::RegroupSegments(const Partition2SegmentsMap& part2segment, i
}
if (segments.size() == 1) {
if (now - segments[0].create_on_ > (int64_t)(FORCE_MERGE_THREASHOLD * 1000)) {
if (now - segments[0].create_on_ > static_cast<int64_t>(FORCE_MERGE_THREASHOLD * 1000)) {
force_list.swap(segments);
}
}