From ca195424c54ff5ef2b34b3b1e6b821982f027340 Mon Sep 17 00:00:00 2001 From: Xu Peng Date: Tue, 30 Apr 2019 18:44:00 +0800 Subject: [PATCH] refactor(db): refactor small part Former-commit-id: 58fc916c28a94ccecd67c58d5cf3620c51fbe4c4 --- cpp/src/db/DBImpl.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp index cba269c17b..646d6e79f2 100644 --- a/cpp/src/db/DBImpl.cpp +++ b/cpp/src/db/DBImpl.cpp @@ -213,25 +213,24 @@ Status DBImpl::merge_files(const std::string& group_id, const meta::DateT& date, return status; } - std::shared_ptr execution_engine( - new FaissExecutionEngine(group_file.dimension, group_file.location)); + FaissExecutionEngine index(group_file.dimension, group_file.location); meta::GroupFilesSchema updated; long index_size = 0; for (auto& file : files) { - execution_engine->Merge(file.location); + index.Merge(file.location); auto file_schema = file; file_schema.file_type = meta::GroupFileSchema::TO_DELETE; updated.push_back(file_schema); /* LOG(DEBUG) << "About to merge file " << file_schema.file_id << */ /* " of size=" << file_schema.rows; */ - index_size = execution_engine->Size(); + index_size = index.Size(); if (index_size >= _options.index_trigger_size) break; } - execution_engine->Serialize(); + index.Serialize(); if (index_size >= _options.index_trigger_size) { group_file.file_type = meta::GroupFileSchema::TO_INDEX; @@ -244,7 +243,7 @@ Status DBImpl::merge_files(const std::string& group_id, const meta::DateT& date, /* LOG(DEBUG) << "New merged file " << group_file.file_id << */ /* " of size=" << group_file.rows; */ - execution_engine->Cache(); + index.Cache(); return status; }