From c2cfc98b772326705af6494f797f057d3d145ade 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: 53812504248a4a81f2f65ee07e81ad2d5e31eb38
---
 cpp/src/db/DBImpl.cpp   |  2 +-
 cpp/src/db/DBMetaImpl.h |  2 +-
 cpp/src/db/Options.cpp  |  1 +
 cpp/src/db/Options.h    | 23 +++++++++++------------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp
index 0c35c355..e8deac90 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 cd84d86d..4bf159cf 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 024f2aba..2757db1c 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 807bae38..cd26f058 100644
--- a/cpp/src/db/Options.h
+++ b/cpp/src/db/Options.h
@@ -7,16 +7,25 @@ namespace zilliz {
 namespace vecwise {
 namespace engine {
 
-class MetaOptions;
 class Env;
 
+struct MetaOptions {
+}; // MetaOptions
+
+
+struct DBMetaOptions : public MetaOptions {
+    std::string backend_uri;
+    std::string dbname;
+}; // 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;
-    std::shared_ptr<MetaOptions> pMetaOptions;
     Env* env;
+    DBMetaOptions meta;
 }; // Options
 
 
@@ -26,16 +35,6 @@ struct GroupOptions {
 }; // GroupOptions
 
 
-struct MetaOptions {
-}; // MetaOptions
-
-
-struct DBMetaOptions : public MetaOptions {
-    std::string backend_uri;
-    std::string dbname;
-}; // DBMetaOptions
-
-
 } // namespace engine
 } // namespace vecwise
 } // namespace zilliz
-- 
GitLab