From 013a1f0e7dd3f65764697b363fd12899e6527206 Mon Sep 17 00:00:00 2001 From: chen qingxiang <67679556+godchen0212@users.noreply.github.com> Date: Sat, 29 Aug 2020 12:07:34 +0800 Subject: [PATCH] fix issue #3286 (#3494) * fix issue #3286 Signed-off-by: godchen0212 * format code Signed-off-by: godchen0212 --- core/src/config/ServerConfig.cpp | 5 ++++- core/src/db/DBImpl.cpp | 4 ++-- core/src/db/SnapshotHandlers.cpp | 2 +- core/src/db/SnapshotUtils.cpp | 2 +- core/src/db/insert/MemSegment.cpp | 2 +- core/src/db/snapshot/CompoundOperations.cpp | 2 +- core/src/scheduler/TaskTable.cpp | 4 ++++ core/src/server/delivery/request/LoadCollectionReq.cpp | 2 +- core/src/server/grpc_impl/GrpcRequestHandler.cpp | 3 ++- core/src/server/web_impl/handler/WebRequestHandler.cpp | 4 +++- core/src/utils/CommonUtil.cpp | 2 +- 11 files changed, 21 insertions(+), 11 deletions(-) diff --git a/core/src/config/ServerConfig.cpp b/core/src/config/ServerConfig.cpp index 8e2cc5be..8cf00a14 100644 --- a/core/src/config/ServerConfig.cpp +++ b/core/src/config/ServerConfig.cpp @@ -58,7 +58,10 @@ ParseGPUDevices(const std::string& str) { device_set.insert(std::stoll(device.substr(3))); } - for (auto dev : device_set) devices.push_back(dev); + devices.reserve(device_set.size()); + for (auto dev : device_set) { + devices.push_back(dev); + } return devices; } diff --git a/core/src/db/DBImpl.cpp b/core/src/db/DBImpl.cpp index 4d61ad31..b871865e 100644 --- a/core/src/db/DBImpl.cpp +++ b/core/src/db/DBImpl.cpp @@ -699,7 +699,7 @@ DBImpl::ListIDInSegment(const std::string& collection_name, int64_t segment_id, std::vector temp_ids; temp_ids.reserve(delete_ids.size()); std::copy(delete_ids.begin(), delete_ids.end(), std::back_inserter(temp_ids)); - std::sort(temp_ids.begin(), temp_ids.end(), std::greater()); + std::sort(temp_ids.begin(), temp_ids.end(), std::greater<>()); for (auto offset : temp_ids) { entity_ids.erase(entity_ids.begin() + offset, entity_ids.begin() + offset + 1); } @@ -979,7 +979,7 @@ DBImpl::BackgroundBuildIndexTask(std::vector collection_names) { std::unique_lock lock(build_index_mutex_); - for (auto collection_name : collection_names) { + for (const auto& collection_name : collection_names) { snapshot::ScopedSnapshotT latest_ss; auto status = snapshot::Snapshots::GetInstance().GetSnapshot(latest_ss, collection_name); if (!status.ok()) { diff --git a/core/src/db/SnapshotHandlers.cpp b/core/src/db/SnapshotHandlers.cpp index bbadda65..f29912fb 100644 --- a/core/src/db/SnapshotHandlers.cpp +++ b/core/src/db/SnapshotHandlers.cpp @@ -105,7 +105,7 @@ GetEntityByIdSegmentHandler::Handle(const snapshot::SegmentPtr& segment) { std::vector ids_in_this_segment; std::vector offsets; - for (IDNumbers::iterator it = ids_left_.begin(); it != ids_left_.end();) { + for (auto it = ids_left_.begin(); it != ids_left_.end();) { idx_t id = *it; // fast check using bloom filter if (!id_bloom_filter_ptr->Check(id)) { diff --git a/core/src/db/SnapshotUtils.cpp b/core/src/db/SnapshotUtils.cpp index e1e1bbd3..5086da57 100644 --- a/core/src/db/SnapshotUtils.cpp +++ b/core/src/db/SnapshotUtils.cpp @@ -210,7 +210,7 @@ GetSnapshotInfo(const std::string& collection_name, milvus::json& json_info) { const engine::snapshot::FieldPtr& field = iter.second->GetField(); auto& elements = iter.second->GetElementVistors(); - for (auto pair : elements) { + for (const auto& pair : elements) { if (pair.second == nullptr || pair.second->GetElement() == nullptr) { continue; } diff --git a/core/src/db/insert/MemSegment.cpp b/core/src/db/insert/MemSegment.cpp index 47ff76a4..beab06db 100644 --- a/core/src/db/insert/MemSegment.cpp +++ b/core/src/db/insert/MemSegment.cpp @@ -228,7 +228,7 @@ MemSegment::ApplyDeleteToMem() { if (uid_data->data_.size() / sizeof(idx_t) != chunk->count_) { continue; // invalid uid data? } - idx_t* uid = (idx_t*)(uid_data->data_.data()); + auto uid = reinterpret_cast(uid_data->data_.data()); // calculte delete offsets std::vector offsets; diff --git a/core/src/db/snapshot/CompoundOperations.cpp b/core/src/db/snapshot/CompoundOperations.cpp index 97d8a8dc..2402fa5d 100644 --- a/core/src/db/snapshot/CompoundOperations.cpp +++ b/core/src/db/snapshot/CompoundOperations.cpp @@ -416,7 +416,7 @@ DropAllIndexOperation::PreCheck() { return Status(SS_INVALID_CONTEX_ERROR, emsg.str()); } - for (auto stale_fe : context_.stale_field_elements) { + for (const auto& stale_fe : context_.stale_field_elements) { if (!GetStartedSS()->GetResource(stale_fe->GetID())) { std::stringstream emsg; emsg << GetRepr() << ". Specified field element " << stale_fe->GetName(); diff --git a/core/src/scheduler/TaskTable.cpp b/core/src/scheduler/TaskTable.cpp index 370889ec..d083bf5d 100644 --- a/core/src/scheduler/TaskTable.cpp +++ b/core/src/scheduler/TaskTable.cpp @@ -190,6 +190,8 @@ TaskTable::PickToLoad(uint64_t limit) { cross = true; indexes.push_back(index); ++pick_count; + } else { + cross = true; } } // rc.ElapseFromBegin("PickToLoad "); @@ -262,6 +264,8 @@ TaskTable::PickToExecute(uint64_t limit) { cross = true; indexes.push_back(index); ++pick_count; + } else { + cross = true; } } // rc.ElapseFromBegin("PickToExecute "); diff --git a/core/src/server/delivery/request/LoadCollectionReq.cpp b/core/src/server/delivery/request/LoadCollectionReq.cpp index 7b74885d..b8579d69 100644 --- a/core/src/server/delivery/request/LoadCollectionReq.cpp +++ b/core/src/server/delivery/request/LoadCollectionReq.cpp @@ -50,7 +50,7 @@ LoadCollectionReq::OnExecute() { // TODO(yukun): if PreloadCollection interface needs to add field names as params std::vector field_names; - for (auto field_it : fields_schema) { + for (const auto& field_it : fields_schema) { field_names.emplace_back(field_it.first->GetName()); } diff --git a/core/src/server/grpc_impl/GrpcRequestHandler.cpp b/core/src/server/grpc_impl/GrpcRequestHandler.cpp index d41adb69..a93810d3 100644 --- a/core/src/server/grpc_impl/GrpcRequestHandler.cpp +++ b/core/src/server/grpc_impl/GrpcRequestHandler.cpp @@ -367,7 +367,7 @@ ConstructEntityResults(const std::vector& attrs, const std::v std::string vector_field_name; bool set_valid_row = false; - for (auto field_name : field_names) { + for (const auto& field_name : field_names) { if (!attrs.empty()) { if (attrs[0].attr_type_.find(field_name) != attrs[0].attr_type_.end()) { auto grpc_field = response->add_fields(); @@ -1252,6 +1252,7 @@ GrpcRequestHandler::Flush(::grpc::ServerContext* context, const ::milvus::grpc:: LOG_SERVER_INFO_ << LogOut("Request [%s] %s begin.", GetContext(context)->ReqID().c_str(), __func__); std::vector collection_names; + collection_names.reserve(collection_names.size()); for (int32_t i = 0; i < request->collection_name_array().size(); i++) { collection_names.push_back(request->collection_name_array(i)); } diff --git a/core/src/server/web_impl/handler/WebRequestHandler.cpp b/core/src/server/web_impl/handler/WebRequestHandler.cpp index 709e787a..3859161d 100644 --- a/core/src/server/web_impl/handler/WebRequestHandler.cpp +++ b/core/src/server/web_impl/handler/WebRequestHandler.cpp @@ -90,7 +90,7 @@ CopyStructuredData(const nlohmann::json& json, std::vector& raw) { values.resize(size); raw.resize(size * sizeof(T)); size_t offset = 0; - for (auto data : json) { + for (const auto& data : json) { values[offset] = data.get(); ++offset; } @@ -1770,6 +1770,8 @@ WebRequestHandler::GetEntity(const milvus::server::web::OString& collection_name std::vector ids; StringHelpFunctions::SplitStringByDelimeter(query_ids->c_str(), ",", ids); std::vector entity_ids; + + entity_ids.reserve(ids.size()); for (auto& id : ids) { entity_ids.push_back(std::stol(id)); } diff --git a/core/src/utils/CommonUtil.cpp b/core/src/utils/CommonUtil.cpp index c19121a1..0ee80d0f 100644 --- a/core/src/utils/CommonUtil.cpp +++ b/core/src/utils/CommonUtil.cpp @@ -84,7 +84,7 @@ RemoveDirectory(const std::string& path) { if (strcmp(dmsg->d_name, ".") != 0 && strcmp(dmsg->d_name, "..") != 0) { snprintf(file_name, buf_size, folder_name.c_str(), dmsg->d_name); std::string tmp = file_name; - if (tmp.find(".") == std::string::npos) { + if (tmp.find('.') == std::string::npos) { RemoveDirectory(file_name); } remove(file_name); -- GitLab