From bf0afceec32969961ad94e89ef155b788d4ca235 Mon Sep 17 00:00:00 2001 From: Xu Peng Date: Mon, 15 Apr 2019 16:34:47 +0800 Subject: [PATCH] fix(db): fix runtime error due to missing return value Former-commit-id: daa9d86441d94dd0c3d82a49d1d276676915f124 --- cpp/src/db/memvectors.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cpp/src/db/memvectors.cpp b/cpp/src/db/memvectors.cpp index abc6b67dfd..0dc019b733 100644 --- a/cpp/src/db/memvectors.cpp +++ b/cpp/src/db/memvectors.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include "memvectors.h" #include "db_meta.h" @@ -74,7 +75,7 @@ Status MemManager::add_vectors(const std::string& group_id_, size_t n_, const float* vectors_, IDNumbers& vector_ids_) { - std::lock_guard lock(_mutex); + std::unique_lock lock(_mutex); return add_vectors_no_lock(group_id_, n_, vectors_, vector_ids_); } @@ -92,11 +93,12 @@ Status MemManager::add_vectors_no_lock(const std::string& group_id, } Status MemManager::mark_memory_as_immutable() { - std::lock_guard lock(_mutex); + std::unique_lock lock(_mutex); for (auto& kv: _memMap) { _immMems.push_back(kv.second); } _memMap.clear(); + return Status::OK(); } /* bool MemManager::need_serialize(double interval) { */ @@ -118,7 +120,7 @@ Status MemManager::serialize() { mem->serialize(); } _immMems.clear(); - /* _last_compact_time = std::time(nullptr); */ + return Status::OK(); }