admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-29 23:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(db): typedef ptr for memvectors

Browse Source 
Former-commit-id: 92289614937b7803fc41bf5cb7d50f468192aaa4
This commit is contained in:
Xu Peng 2019-05-05 12:55:42 +08:00
parent c64e8c9621
commit 72f096bfca
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cpp/src/db/DBImpl.h
View File

@ -22,6 +22,7 @@ template <typename EngineT>
class DBImpl : public DB {
public:
typedef typename meta::Meta::Ptr MetaPtr;
typedef typename MemManager<EngineT>::Ptr MemManagerPtr;
DBImpl(const Options& options);
@ -49,7 +50,6 @@ public:
virtual ~DBImpl();
private:
typedef MemManager<EngineT> MemManagerT;
void background_build_index();
Status build_index(const meta::GroupFileSchema&);
@ -81,7 +81,7 @@ private:
std::condition_variable bg_build_index_finish_signal_;
MetaPtr _pMeta;
std::shared_ptr<MemManagerT> _pMemMgr;
MemManagerPtr _pMemMgr;
}; // DBImpl

6
cpp/src/db/MemManager.cpp
View File

@ -72,7 +72,7 @@ MemVectors<EngineT>::~MemVectors() {
*/
template<typename EngineT>
typename MemManager<EngineT>::VectorsPtr MemManager<EngineT>::get_mem_by_group(
typename MemManager<EngineT>::MemVectorsPtr MemManager<EngineT>::get_mem_by_group(
const std::string& group_id) {
auto memIt = _memMap.find(group_id);
if (memIt != _memMap.end()) {
@ -86,7 +86,7 @@ typename MemManager<EngineT>::VectorsPtr MemManager<EngineT>::get_mem_by_group(
return nullptr;
}
_memMap[group_id] = VectorsPtr(new MemVectors<EngineT>(_pMeta, group_file, options_));
_memMap[group_id] = MemVectorsPtr(new MemVectors<EngineT>(_pMeta, group_file, options_));
return _memMap[group_id];
}
@ -104,7 +104,7 @@ Status MemManager<EngineT>::add_vectors_no_lock(const std::string& group_id,
size_t n,
const float* vectors,
IDNumbers& vector_ids) {
VectorsPtr mem = get_mem_by_group(group_id);
MemVectorsPtr mem = get_mem_by_group(group_id);
if (mem == nullptr) {
return Status::NotFound("Group " + group_id + " not found!");
}

11
cpp/src/db/MemManager.h
View File

@ -24,6 +24,7 @@ class MemVectors {
public:
typedef typename EngineT::Ptr EnginePtr;
typedef typename meta::Meta::Ptr MetaPtr;
typedef std::shared_ptr<MemVectors<EngineT>> Ptr;
explicit MemVectors(const std::shared_ptr<meta::Meta>&,
const meta::GroupFileSchema&, const Options&);
@ -58,14 +59,14 @@ private:
template<typename EngineT>
class MemManager {
public:
typedef MemVectors<EngineT> ItemT;
typedef std::shared_ptr<ItemT> VectorsPtr;
typedef typename meta::Meta::Ptr MetaPtr;
typedef typename MemVectors<EngineT>::Ptr MemVectorsPtr;
typedef std::shared_ptr<MemManager<EngineT>> Ptr;
MemManager(const std::shared_ptr<meta::Meta>& meta_, const Options& options)
: _pMeta(meta_), options_(options) {}
VectorsPtr get_mem_by_group(const std::string& group_id_);
MemVectorsPtr get_mem_by_group(const std::string& group_id_);
Status add_vectors(const std::string& group_id_,
size_t n_, const float* vectors_, IDNumbers& vector_ids_);
@ -77,8 +78,8 @@ private:
size_t n_, const float* vectors_, IDNumbers& vector_ids_);
Status mark_memory_as_immutable();
typedef std::map<std::string, VectorsPtr> MemMap;
typedef std::vector<VectorsPtr> ImmMemPool;
typedef std::map<std::string, MemVectorsPtr> MemMap;
typedef std::vector<MemVectorsPtr> ImmMemPool;
MemMap _memMap;
ImmMemPool _immMems;
MetaPtr _pMeta;