update

Former-commit-id: 45b443d3533ec64f2a029ccdd8cecb1b38142b9b

cpp/src/db/Factories.h

@@ -42,10 +42,6 @@ struct MemManagerFactory {
     static MemManagerAbstractPtr Build(const std::shared_ptr<meta::Meta> &meta, const Options &options);
 };
 
-struct MemManagerFactory {
-    static MemManagerAbstractPtr Build(const std::shared_ptr<meta::Meta>& meta, const Options& options);
-};
-
 } // namespace engine
 } // namespace milvus
 } // namespace zilliz

cpp/src/db/MemManager.h

@@ -17,6 +17,7 @@
 #include <memory>
 #include <mutex>
 
+
 namespace zilliz {
 namespace milvus {
 namespace engine {

cpp/src/db/MemManagerAbstract.h

@@ -2,6 +2,7 @@
 
 #include <set>
 
+
 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<MemManagerAbstract>;

cpp/src/db/MemTable.cpp

 #include "MemTable.h"
 #include "Log.h"
 
+
 namespace zilliz {
 namespace milvus {
 namespace engine {

cpp/src/db/MemTable.h

@@ -6,6 +6,7 @@
 
 #include <mutex>
 
+
 namespace zilliz {
 namespace milvus {
 namespace engine {

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

cpp/src/db/MemTableFile.h

@@ -5,6 +5,7 @@
 #include "VectorSource.h"
 #include "ExecutionEngine.h"
 
+
 namespace zilliz {
 namespace milvus {
 namespace engine {

cpp/src/db/NewMemManager.cpp

@@ -5,6 +5,7 @@
 
 #include <thread>
 
+
 namespace zilliz {
 namespace milvus {
 namespace engine {

cpp/src/db/NewMemManager.h

@@ -11,6 +11,7 @@
 #include <memory>
 #include <mutex>
 
+
 namespace zilliz {
 namespace milvus {
 namespace engine {

cpp/src/db/VectorSource.cpp

@@ -4,6 +4,7 @@
 #include "Log.h"
 #include "metrics/Metrics.h"
 
+
 namespace zilliz {
 namespace milvus {
 namespace engine {

cpp/src/db/VectorSource.h

@@ -5,6 +5,7 @@
 #include "IDGenerator.h"
 #include "ExecutionEngine.h"
 
+
 namespace zilliz {
 namespace milvus {
 namespace engine {

cpp/unittest/db/mem_test.cpp

@@ -15,6 +15,7 @@
 #include <fstream>
 #include <iostream>
 
+
 using namespace zilliz::milvus;
 
 namespace {
@@ -145,6 +146,9 @@ TEST_F(NewMemManagerTest, MEM_TABLE_TEST) {
 
     engine::VectorSource::Ptr source_100 = std::make_shared<engine::VectorSource>(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());
 }