From 062e370beea68b775a7f5fac89a980b40ea09e1b Mon Sep 17 00:00:00 2001
From: Xu Peng <xupeng3112@163.com>
Date: Tue, 16 Apr 2019 18:05:04 +0800
Subject: [PATCH] refactor(db): refactor options

Former-commit-id: 2631c7298346b6dcfbde0d43bc58f36e36eef807
---
 cpp/src/db/DBImpl.cpp   |  2 +-
 cpp/src/db/DBMetaImpl.h |  2 +-
 cpp/src/db/Options.cpp  |  1 +
 cpp/src/db/Options.h    | 33 ++++++++++++++++-----------------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp
index 0c35c355d5..e8deac9091 100644
--- a/cpp/src/db/DBImpl.cpp
+++ b/cpp/src/db/DBImpl.cpp
@@ -19,7 +19,7 @@ DBImpl::DBImpl(const Options& options_, const std::string& name_)
       _options(options_),
       _bg_compaction_scheduled(false),
       _shutting_down(false),
-      _pMeta(new meta::DBMetaImpl(*(_options.pMetaOptions))),
+      _pMeta(new meta::DBMetaImpl(_options.meta)),
       _pMemMgr(new MemManager(_pMeta)) {
     start_timer_task(options_.memory_sync_interval);
 }
diff --git a/cpp/src/db/DBMetaImpl.h b/cpp/src/db/DBMetaImpl.h
index cd84d86db5..4bf159cfd4 100644
--- a/cpp/src/db/DBMetaImpl.h
+++ b/cpp/src/db/DBMetaImpl.h
@@ -45,7 +45,7 @@ private:
 
     Status initialize();
 
-    const DBMetaOptions& _options;
+    const DBMetaOptions _options;
 
 }; // DBMetaImpl
 
diff --git a/cpp/src/db/Options.cpp b/cpp/src/db/Options.cpp
index 024f2aba5d..2757db1c64 100644
--- a/cpp/src/db/Options.cpp
+++ b/cpp/src/db/Options.cpp
@@ -1,5 +1,6 @@
 #include "Options.h"
 #include "Env.h"
+#include "DBMetaImpl.h"
 
 namespace zilliz {
 namespace vecwise {
diff --git a/cpp/src/db/Options.h b/cpp/src/db/Options.h
index 807bae38b2..cd26f05850 100644
--- a/cpp/src/db/Options.h
+++ b/cpp/src/db/Options.h
@@ -7,25 +7,8 @@ namespace zilliz {
 namespace vecwise {
 namespace engine {
 
-class MetaOptions;
 class Env;
 
-struct Options {
-    Options();
-    uint16_t  memory_sync_interval = 10;
-    uint16_t  raw_file_merge_trigger_number = 100;
-    size_t  raw_to_index_trigger_size = 100000;
-    std::shared_ptr<MetaOptions> pMetaOptions;
-    Env* env;
-}; // Options
-
-
-struct GroupOptions {
-    size_t dimension;
-    bool has_id = false;
-}; // GroupOptions
-
-
 struct MetaOptions {
 }; // MetaOptions
 
@@ -36,6 +19,22 @@ struct DBMetaOptions : public MetaOptions {
 }; // DBMetaOptions
 
 
+struct Options {
+    Options();
+    uint16_t  memory_sync_interval = 10;
+    uint16_t  raw_file_merge_trigger_number = 100;
+    size_t  raw_to_index_trigger_size = 100000;
+    Env* env;
+    DBMetaOptions meta;
+}; // Options
+
+
+struct GroupOptions {
+    size_t dimension;
+    bool has_id = false;
+}; // GroupOptions
+
+
 } // namespace engine
 } // namespace vecwise
 } // namespace zilliz