From 2d08fc415fa1af460d7f88ddce2e53dba8d25787 Mon Sep 17 00:00:00 2001
From: Xu Peng <xupeng3112@163.com>
Date: Sun, 26 May 2019 13:24:02 +0800
Subject: [PATCH] refactor(db): add NextGroupId in DBMetaImpl

Former-commit-id: 56deb4603db20ac4ef677f1851a1e76e703a234f
---
 cpp/src/db/DBMetaImpl.cpp | 14 +++++++++-----
 cpp/src/db/DBMetaImpl.h   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cpp/src/db/DBMetaImpl.cpp b/cpp/src/db/DBMetaImpl.cpp
index aee1aa3f..08ed0fda 100644
--- a/cpp/src/db/DBMetaImpl.cpp
+++ b/cpp/src/db/DBMetaImpl.cpp
@@ -69,6 +69,14 @@ void DBMetaImpl::GetGroupFilePath(GroupFileSchema& group_file) {
     group_file.location = ss.str();
 }
 
+Status DBMetaImpl::NextGroupId(std::string& group_id) {
+    std::stringstream ss;
+    SimpleIDGenerator g;
+    ss << g.getNextIDNumber();
+    group_id = ss.str();
+    return Status::OK();
+}
+
 DBMetaImpl::DBMetaImpl(const DBMetaOptions& options_)
     : _options(options_) {
     initialize();
@@ -134,10 +142,7 @@ Status DBMetaImpl::delete_group_partitions(const std::string& group_id,
 
 Status DBMetaImpl::add_group(GroupSchema& group_info) {
     if (group_info.group_id == "") {
-        std::stringstream ss;
-        SimpleIDGenerator g;
-        ss << g.getNextIDNumber();
-        group_info.group_id = ss.str();
+        NextGroupId(group_info.group_id);
     }
     group_info.files_cnt = 0;
     group_info.id = -1;
@@ -147,7 +152,6 @@ Status DBMetaImpl::add_group(GroupSchema& group_info) {
         try {
             auto id = ConnectorPtr->insert(group_info);
             group_info.id = id;
-            /* LOG(DEBUG) << "Add group " << id; */
         } catch (...) {
             return Status::DBTransactionError("Add Group Error");
         }
diff --git a/cpp/src/db/DBMetaImpl.h b/cpp/src/db/DBMetaImpl.h
index 20f91b84..a957cf68 100644
--- a/cpp/src/db/DBMetaImpl.h
+++ b/cpp/src/db/DBMetaImpl.h
@@ -65,7 +65,7 @@ public:
     virtual ~DBMetaImpl();
 
 private:
-
+    Status NextGroupId(std::string& group_id);
     Status discard_files_of_size(long to_discard_size);
     Status get_group_no_lock(GroupSchema& group_info);
     std::string GetGroupPath(const std::string& group_id);
-- 
GitLab