From 3958fe5a35c007e512ed4aefff6cd0ff81e3d977 Mon Sep 17 00:00:00 2001
From: Xu Peng <xupeng3112@163.com>
Date: Sun, 26 May 2019 15:17:46 +0800
Subject: [PATCH] refactor(db): add NextFileId

Former-commit-id: 51a1f75881a8a1f85e3fdc8ac7217218976cc11c
---
 cpp/src/db/DBMetaImpl.cpp | 14 +++++++++-----
 cpp/src/db/DBMetaImpl.h   |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cpp/src/db/DBMetaImpl.cpp b/cpp/src/db/DBMetaImpl.cpp
index 08ed0fda93..9b4e731f74 100644
--- a/cpp/src/db/DBMetaImpl.cpp
+++ b/cpp/src/db/DBMetaImpl.cpp
@@ -77,6 +77,14 @@ Status DBMetaImpl::NextGroupId(std::string& group_id) {
     return Status::OK();
 }
 
+Status DBMetaImpl::NextFileId(std::string& file_id) {
+    std::stringstream ss;
+    SimpleIDGenerator g;
+    ss << g.getNextIDNumber();
+    file_id = ss.str();
+    return Status::OK();
+}
+
 DBMetaImpl::DBMetaImpl(const DBMetaOptions& options_)
     : _options(options_) {
     initialize();
@@ -225,11 +233,8 @@ Status DBMetaImpl::add_group_file(GroupFileSchema& group_file) {
         return status;
     }
 
-    SimpleIDGenerator g;
-    std::stringstream ss;
-    ss << g.getNextIDNumber();
+    NextFileId(group_file.file_id);
     group_file.file_type = GroupFileSchema::NEW;
-    group_file.file_id = ss.str();
     group_file.dimension = group_info.dimension;
     group_file.size = 0;
     group_file.created_on = utils::GetMicroSecTimeStamp();
@@ -240,7 +245,6 @@ Status DBMetaImpl::add_group_file(GroupFileSchema& group_file) {
         try {
             auto id = ConnectorPtr->insert(group_file);
             group_file.id = id;
-            /* LOG(DEBUG) << "Add group_file of file_id=" << group_file.file_id; */
         } catch (...) {
             return Status::DBTransactionError("Add file Error");
         }
diff --git a/cpp/src/db/DBMetaImpl.h b/cpp/src/db/DBMetaImpl.h
index a957cf688c..6108860927 100644
--- a/cpp/src/db/DBMetaImpl.h
+++ b/cpp/src/db/DBMetaImpl.h
@@ -65,6 +65,7 @@ public:
     virtual ~DBMetaImpl();
 
 private:
+    Status NextFileId(std::string& file_id);
     Status NextGroupId(std::string& group_id);
     Status discard_files_of_size(long to_discard_size);
     Status get_group_no_lock(GroupSchema& group_info);