From 9d9e46c3464fb732f885f44bea22363f68cf386f Mon Sep 17 00:00:00 2001 From: zhiru Date: Mon, 8 Jul 2019 15:07:03 +0800 Subject: [PATCH] update Former-commit-id: 45b443d3533ec64f2a029ccdd8cecb1b38142b9b --- cpp/src/db/Factories.h | 4 ---- cpp/src/db/MemManager.h | 1 + cpp/src/db/MemManagerAbstract.h | 7 +------ cpp/src/db/MemTable.cpp | 1 + cpp/src/db/MemTable.h | 1 + cpp/src/db/MemTableFile.cpp | 26 -------------------------- cpp/src/db/MemTableFile.h | 1 + cpp/src/db/NewMemManager.cpp | 1 + cpp/src/db/NewMemManager.h | 1 + cpp/src/db/VectorSource.cpp | 1 + cpp/src/db/VectorSource.h | 1 + cpp/unittest/db/mem_test.cpp | 7 ++++--- 12 files changed, 13 insertions(+), 39 deletions(-) diff --git a/cpp/src/db/Factories.h b/cpp/src/db/Factories.h index aff7f80e0..8b6e7b100 100644 --- a/cpp/src/db/Factories.h +++ b/cpp/src/db/Factories.h @@ -42,10 +42,6 @@ struct MemManagerFactory { static MemManagerAbstractPtr Build(const std::shared_ptr &meta, const Options &options); }; -struct MemManagerFactory { - static MemManagerAbstractPtr Build(const std::shared_ptr& meta, const Options& options); -}; - } // namespace engine } // namespace milvus } // namespace zilliz diff --git a/cpp/src/db/MemManager.h b/cpp/src/db/MemManager.h index 0d328bf36..5ad3d08b6 100644 --- a/cpp/src/db/MemManager.h +++ b/cpp/src/db/MemManager.h @@ -17,6 +17,7 @@ #include #include + namespace zilliz { namespace milvus { namespace engine { diff --git a/cpp/src/db/MemManagerAbstract.h b/cpp/src/db/MemManagerAbstract.h index 195f0dde7..943c454e4 100644 --- a/cpp/src/db/MemManagerAbstract.h +++ b/cpp/src/db/MemManagerAbstract.h @@ -2,6 +2,7 @@ #include + namespace zilliz { namespace milvus { namespace engine { @@ -22,12 +23,6 @@ class MemManagerAbstract { virtual size_t GetCurrentMem() = 0; - virtual size_t GetCurrentMutableMem() = 0; - - virtual size_t GetCurrentImmutableMem() = 0; - - virtual size_t GetCurrentMem() = 0; - }; // MemManagerAbstract using MemManagerAbstractPtr = std::shared_ptr; diff --git a/cpp/src/db/MemTable.cpp b/cpp/src/db/MemTable.cpp index c88e7f1e0..e05aa058a 100644 --- a/cpp/src/db/MemTable.cpp +++ b/cpp/src/db/MemTable.cpp @@ -1,6 +1,7 @@ #include "MemTable.h" #include "Log.h" + namespace zilliz { namespace milvus { namespace engine { diff --git a/cpp/src/db/MemTable.h b/cpp/src/db/MemTable.h index f973b3f26..198fcc228 100644 --- a/cpp/src/db/MemTable.h +++ b/cpp/src/db/MemTable.h @@ -6,6 +6,7 @@ #include + namespace zilliz { namespace milvus { namespace engine { diff --git a/cpp/src/db/MemTableFile.cpp b/cpp/src/db/MemTableFile.cpp index fb77a6ac3..649a680cf 100644 --- a/cpp/src/db/MemTableFile.cpp +++ b/cpp/src/db/MemTableFile.cpp @@ -103,32 +103,6 @@ Status MemTableFile::Serialize() { return status; } -Status MemTableFile::Serialize() { - - auto start_time = METRICS_NOW_TIME; - - auto size = GetCurrentMem(); - - execution_engine_->Serialize(); - auto end_time = METRICS_NOW_TIME; - auto total_time = METRICS_MICROSECONDS(start_time, end_time); - table_file_schema_.size_ = size; - - server::Metrics::GetInstance().DiskStoreIOSpeedGaugeSet((double)size/total_time); - - table_file_schema_.file_type_ = (size >= options_.index_trigger_size) ? - meta::TableFileSchema::TO_INDEX : meta::TableFileSchema::RAW; - - auto status = meta_->UpdateTableFile(table_file_schema_); - - LOG(DEBUG) << "New " << ((table_file_schema_.file_type_ == meta::TableFileSchema::RAW) ? "raw" : "to_index") - << " file " << table_file_schema_.file_id_ << " of size " << (double)size / (double)M << " M"; - - execution_engine_->Cache(); - - return status; -} - } // namespace engine } // namespace milvus } // namespace zilliz \ No newline at end of file diff --git a/cpp/src/db/MemTableFile.h b/cpp/src/db/MemTableFile.h index 36d5c1bb2..4d0011b36 100644 --- a/cpp/src/db/MemTableFile.h +++ b/cpp/src/db/MemTableFile.h @@ -5,6 +5,7 @@ #include "VectorSource.h" #include "ExecutionEngine.h" + namespace zilliz { namespace milvus { namespace engine { diff --git a/cpp/src/db/NewMemManager.cpp b/cpp/src/db/NewMemManager.cpp index 57d44a903..e4903d75a 100644 --- a/cpp/src/db/NewMemManager.cpp +++ b/cpp/src/db/NewMemManager.cpp @@ -5,6 +5,7 @@ #include + namespace zilliz { namespace milvus { namespace engine { diff --git a/cpp/src/db/NewMemManager.h b/cpp/src/db/NewMemManager.h index f83af9006..5b933c94c 100644 --- a/cpp/src/db/NewMemManager.h +++ b/cpp/src/db/NewMemManager.h @@ -11,6 +11,7 @@ #include #include + namespace zilliz { namespace milvus { namespace engine { diff --git a/cpp/src/db/VectorSource.cpp b/cpp/src/db/VectorSource.cpp index 52b3e4034..74c07ae1f 100644 --- a/cpp/src/db/VectorSource.cpp +++ b/cpp/src/db/VectorSource.cpp @@ -4,6 +4,7 @@ #include "Log.h" #include "metrics/Metrics.h" + namespace zilliz { namespace milvus { namespace engine { diff --git a/cpp/src/db/VectorSource.h b/cpp/src/db/VectorSource.h index 9d2abec3c..7092805a6 100644 --- a/cpp/src/db/VectorSource.h +++ b/cpp/src/db/VectorSource.h @@ -5,6 +5,7 @@ #include "IDGenerator.h" #include "ExecutionEngine.h" + namespace zilliz { namespace milvus { namespace engine { diff --git a/cpp/unittest/db/mem_test.cpp b/cpp/unittest/db/mem_test.cpp index 6b07a0599..860a66538 100644 --- a/cpp/unittest/db/mem_test.cpp +++ b/cpp/unittest/db/mem_test.cpp @@ -15,6 +15,7 @@ #include #include + using namespace zilliz::milvus; namespace { @@ -145,6 +146,9 @@ TEST_F(NewMemManagerTest, MEM_TABLE_TEST) { engine::VectorSource::Ptr source_100 = std::make_shared(n_100, vectors_100.data()); + engine::MemTable mem_table(TABLE_NAME, impl_, options); + + status = mem_table.Add(source_100); ASSERT_TRUE(status.ok()); engine::IDNumbers vector_ids = source_100->GetVectorIds(); ASSERT_EQ(vector_ids.size(), 100); @@ -188,9 +192,6 @@ TEST_F(NewMemManagerTest, MEM_TABLE_TEST) { status = mem_table.Serialize(); ASSERT_TRUE(status.ok()); - status = memTable.Serialize(); - ASSERT_TRUE(status.ok()); - status = impl_->DropAll(); ASSERT_TRUE(status.ok()); } -- GitLab