From fbe1278a3ab0a68e551abfb73d8f1dd779b50f77 Mon Sep 17 00:00:00 2001
From: Xu Peng <xupeng3112@163.com>
Date: Mon, 27 May 2019 18:17:13 +0800
Subject: [PATCH] refactor(db): DropPartitionsByDates

Former-commit-id: 2534fa34f690ba60788e3619b6a87a9a7ed8650e
---
 cpp/src/db/DB.h                | 2 --
 cpp/src/db/DBImpl.cpp          | 6 ------
 cpp/src/db/DBImpl.h            | 1 -
 cpp/src/db/DBMetaImpl.cpp      | 4 ++--
 cpp/src/db/DBMetaImpl.h        | 4 ++--
 cpp/src/db/Meta.h              | 4 ++--
 cpp/unittest/db/meta_tests.cpp | 6 +++---
 7 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/cpp/src/db/DB.h b/cpp/src/db/DB.h
index 1307d8ed97..b120927ef5 100644
--- a/cpp/src/db/DB.h
+++ b/cpp/src/db/DB.h
@@ -23,8 +23,6 @@ public:
 
     virtual Status add_group(meta::TableSchema& table_schema_) = 0;
     virtual Status get_group(meta::TableSchema& table_schema_) = 0;
-    virtual Status delete_vectors(const std::string& table_id,
-            const meta::DatesT& dates) = 0;
     virtual Status has_group(const std::string& table_id_, bool& has_or_not_) = 0;
     virtual Status get_group_files(const std::string& table_id_,
                                    const int date_delta_,
diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp
index 0a09386e2a..2cbf6900c9 100644
--- a/cpp/src/db/DBImpl.cpp
+++ b/cpp/src/db/DBImpl.cpp
@@ -44,12 +44,6 @@ Status DBImpl<EngineT>::get_group(meta::TableSchema& table_schema) {
     return _pMeta->DescribeTable(table_schema);
 }
 
-template<typename EngineT>
-Status DBImpl<EngineT>::delete_vectors(const std::string& table_id,
-        const meta::DatesT& dates) {
-    return _pMeta->delete_group_partitions(table_id, dates);
-}
-
 template<typename EngineT>
 Status DBImpl<EngineT>::has_group(const std::string& table_id, bool& has_or_not) {
     return _pMeta->HasTable(table_id, has_or_not);
diff --git a/cpp/src/db/DBImpl.h b/cpp/src/db/DBImpl.h
index 19025cf2fd..55741a5937 100644
--- a/cpp/src/db/DBImpl.h
+++ b/cpp/src/db/DBImpl.h
@@ -35,7 +35,6 @@ public:
 
     virtual Status add_group(meta::TableSchema& table_schema) override;
     virtual Status get_group(meta::TableSchema& table_schema) override;
-    virtual Status delete_vectors(const std::string& table_id, const meta::DatesT& dates) override;
     virtual Status has_group(const std::string& table_id_, bool& has_or_not_) override;
 
     virtual Status get_group_files(const std::string& table_id_,
diff --git a/cpp/src/db/DBMetaImpl.cpp b/cpp/src/db/DBMetaImpl.cpp
index b04445cc70..1686a45233 100644
--- a/cpp/src/db/DBMetaImpl.cpp
+++ b/cpp/src/db/DBMetaImpl.cpp
@@ -111,8 +111,8 @@ Status DBMetaImpl::initialize() {
 }
 
 // PXU TODO: Temp solution. Will fix later
-Status DBMetaImpl::delete_group_partitions(const std::string& table_id,
-            const meta::DatesT& dates) {
+Status DBMetaImpl::DropPartitionsByDates(const std::string& table_id,
+            const DatesT& dates) {
     if (dates.size() == 0) {
         return Status::OK();
     }
diff --git a/cpp/src/db/DBMetaImpl.h b/cpp/src/db/DBMetaImpl.h
index f1350cceda..399c891474 100644
--- a/cpp/src/db/DBMetaImpl.h
+++ b/cpp/src/db/DBMetaImpl.h
@@ -24,8 +24,8 @@ public:
     virtual Status HasTable(const std::string& table_id, bool& has_or_not) override;
 
     virtual Status CreateTableFile(TableFileSchema& file_schema) override;
-    virtual Status delete_group_partitions(const std::string& table_id,
-            const meta::DatesT& dates) override;
+    virtual Status DropPartitionsByDates(const std::string& table_id,
+            const DatesT& dates) override;
 
     virtual Status has_group_file(const std::string& table_id_,
                                   const std::string& file_id_,
diff --git a/cpp/src/db/Meta.h b/cpp/src/db/Meta.h
index 6fd00a9663..052ff4956b 100644
--- a/cpp/src/db/Meta.h
+++ b/cpp/src/db/Meta.h
@@ -27,8 +27,8 @@ public:
     virtual Status HasTable(const std::string& table_id, bool& has_or_not) = 0;
 
     virtual Status CreateTableFile(TableFileSchema& file_schema) = 0;
-    virtual Status delete_group_partitions(const std::string& table_id,
-            const meta::DatesT& dates) = 0;
+    virtual Status DropPartitionsByDates(const std::string& table_id,
+            const DatesT& dates) = 0;
 
     virtual Status has_group_file(const std::string& table_id_,
                                   const std::string& file_id_,
diff --git a/cpp/unittest/db/meta_tests.cpp b/cpp/unittest/db/meta_tests.cpp
index 0c8b3f34b9..b016b947e4 100644
--- a/cpp/unittest/db/meta_tests.cpp
+++ b/cpp/unittest/db/meta_tests.cpp
@@ -65,14 +65,14 @@ TEST_F(MetaTest, table_file_TEST) {
 
     meta::DatesT dates;
     dates.push_back(meta::Meta::GetDate());
-    status = impl_->delete_group_partitions(table_file.table_id, dates);
+    status = impl_->DropPartitionsByDates(table_file.table_id, dates);
     ASSERT_FALSE(status.ok());
 
     dates.clear();
     for (auto i=2; i < 10; ++i) {
         dates.push_back(meta::Meta::GetDateWithDelta(-1*i));
     }
-    status = impl_->delete_group_partitions(table_file.table_id, dates);
+    status = impl_->DropPartitionsByDates(table_file.table_id, dates);
     ASSERT_TRUE(status.ok());
 
     table_file.date = meta::Meta::GetDateWithDelta(-2);
@@ -83,7 +83,7 @@ TEST_F(MetaTest, table_file_TEST) {
 
     dates.clear();
     dates.push_back(table_file.date);
-    status = impl_->delete_group_partitions(table_file.table_id, dates);
+    status = impl_->DropPartitionsByDates(table_file.table_id, dates);
     ASSERT_TRUE(status.ok());
     status = impl_->get_group_file(table_file.table_id, table_file.file_id, table_file);
     ASSERT_TRUE(status.ok());