From 7fe5346f14d8383c8ef265547a200da727a7fc75 Mon Sep 17 00:00:00 2001
From: Xu Peng <xupeng3112@163.com>
Date: Mon, 27 May 2019 19:06:42 +0800
Subject: [PATCH] refactor(db): Archive

Former-commit-id: 21f153c1a57ad4bb706f6b177a10d45faf88ed99
---
 cpp/src/db/DBImpl.cpp          |  4 ++--
 cpp/src/db/DBMetaImpl.cpp      | 16 ++++++++--------
 cpp/src/db/DBMetaImpl.h        |  2 +-
 cpp/src/db/Meta.h              |  2 +-
 cpp/unittest/db/meta_tests.cpp |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp
index f3978447..057573be 100644
--- a/cpp/src/db/DBImpl.cpp
+++ b/cpp/src/db/DBImpl.cpp
@@ -312,7 +312,7 @@ Status DBImpl<EngineT>::background_merge_files(const std::string& table_id) {
         merge_files(table_id, kv.first, kv.second);
     }
 
-    _pMeta->archive_files();
+    _pMeta->Archive();
 
     try_build_index();
 
@@ -350,7 +350,7 @@ Status DBImpl<EngineT>::build_index(const meta::TableFileSchema& file) {
         << " from file " << to_remove.file_id;
 
     index->Cache();
-    _pMeta->archive_files();
+    _pMeta->Archive();
 
     return Status::OK();
 }
diff --git a/cpp/src/db/DBMetaImpl.cpp b/cpp/src/db/DBMetaImpl.cpp
index 4210822d..4871d5a5 100644
--- a/cpp/src/db/DBMetaImpl.cpp
+++ b/cpp/src/db/DBMetaImpl.cpp
@@ -433,7 +433,7 @@ Status DBMetaImpl::GetTableFile(TableFileSchema& file_schema) {
 }
 
 // PXU TODO: Support Swap
-Status DBMetaImpl::archive_files() {
+Status DBMetaImpl::Archive() {
     auto& criterias = _options.archive_conf.GetCriterias();
     if (criterias.size() == 0) {
         return Status::OK();
@@ -496,7 +496,7 @@ Status DBMetaImpl::Size(long& result) {
 }
 
 Status DBMetaImpl::discard_files_of_size(long to_discard_size) {
-    LOG(DEBUG) << "Abort to discard size=" << to_discard_size;
+    LOG(DEBUG) << "About to discard size=" << to_discard_size;
     if (to_discard_size <= 0) {
         return Status::OK();
     }
@@ -507,15 +507,15 @@ Status DBMetaImpl::discard_files_of_size(long to_discard_size) {
                                           order_by(&TableFileSchema::id),
                                           limit(10));
         std::vector<int> ids;
+        TableFileSchema table_file;
 
         for (auto& file : selected) {
             if (to_discard_size <= 0) break;
-            TableFileSchema group_file;
-            group_file.id = std::get<0>(file);
-            group_file.size = std::get<1>(file);
-            ids.push_back(group_file.id);
-            LOG(DEBUG) << "Discard group_file.id=" << group_file.id << " group_file.size=" << group_file.size;
-            to_discard_size -= group_file.size;
+            table_file.id = std::get<0>(file);
+            table_file.size = std::get<1>(file);
+            ids.push_back(table_file.id);
+            LOG(DEBUG) << "Discard table_file.id=" << table_file.file_id << " table_file.size=" << table_file.size;
+            to_discard_size -= table_file.size;
         }
 
         if (ids.size() == 0) {
diff --git a/cpp/src/db/DBMetaImpl.h b/cpp/src/db/DBMetaImpl.h
index fbc3aa1d..8832c30a 100644
--- a/cpp/src/db/DBMetaImpl.h
+++ b/cpp/src/db/DBMetaImpl.h
@@ -42,7 +42,7 @@ public:
 
     virtual Status files_to_index(TableFilesSchema&) override;
 
-    virtual Status archive_files() override;
+    virtual Status Archive() override;
 
     virtual Status Size(long& result) override;
 
diff --git a/cpp/src/db/Meta.h b/cpp/src/db/Meta.h
index 060d8c77..6a0993a9 100644
--- a/cpp/src/db/Meta.h
+++ b/cpp/src/db/Meta.h
@@ -44,7 +44,7 @@ public:
 
     virtual Status Size(long& result) = 0;
 
-    virtual Status archive_files() = 0;
+    virtual Status Archive() = 0;
 
     virtual Status files_to_index(TableFilesSchema&) = 0;
 
diff --git a/cpp/unittest/db/meta_tests.cpp b/cpp/unittest/db/meta_tests.cpp
index 7e4e2bf1..8051d2eb 100644
--- a/cpp/unittest/db/meta_tests.cpp
+++ b/cpp/unittest/db/meta_tests.cpp
@@ -123,7 +123,7 @@ TEST_F(MetaTest, ARCHIVE_TEST_DAYS) {
         days.push_back(day);
     }
 
-    impl.archive_files();
+    impl.Archive();
     int i = 0;
 
     for (auto file : files) {
@@ -166,7 +166,7 @@ TEST_F(MetaTest, ARCHIVE_TEST_DISK) {
         files.push_back(table_file);
     }
 
-    impl.archive_files();
+    impl.Archive();
     int i = 0;
 
     for (auto file : files) {
-- 
GitLab