From ec4e83db3fa011e55616f744a834e82c7dacdbcf Mon Sep 17 00:00:00 2001 From: Xu Peng Date: Mon, 27 May 2019 18:38:55 +0800 Subject: [PATCH] refactor(db): UpdateTableFile Former-commit-id: e5b29fa1396d5a06c26a4917e15fed0082bbc7ae --- cpp/src/db/DBMetaImpl.cpp | 8 ++++---- cpp/src/db/DBMetaImpl.h | 2 +- cpp/src/db/MemManager.cpp | 2 +- cpp/src/db/Meta.h | 2 +- cpp/unittest/db/meta_tests.cpp | 16 ++++++++-------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cpp/src/db/DBMetaImpl.cpp b/cpp/src/db/DBMetaImpl.cpp index 24b12abb..5ccc2d9f 100644 --- a/cpp/src/db/DBMetaImpl.cpp +++ b/cpp/src/db/DBMetaImpl.cpp @@ -538,13 +538,13 @@ Status DBMetaImpl::discard_files_of_size(long to_discard_size) { return discard_files_of_size(to_discard_size); } -Status DBMetaImpl::update_group_file(TableFileSchema& group_file) { - group_file.updated_time = utils::GetMicroSecTimeStamp(); +Status DBMetaImpl::UpdateTableFile(TableFileSchema& file_schema) { + file_schema.updated_time = utils::GetMicroSecTimeStamp(); try { - ConnectorPtr->update(group_file); + ConnectorPtr->update(file_schema); } catch (std::exception & e) { LOG(DEBUG) << e.what(); - LOG(DEBUG) << "id= " << group_file.id << " file_id=" << group_file.file_id; + LOG(DEBUG) << "table_id= " << file_schema.table_id << " file_id=" << file_schema.file_id; throw e; } return Status::OK(); diff --git a/cpp/src/db/DBMetaImpl.h b/cpp/src/db/DBMetaImpl.h index db775342..813b07c2 100644 --- a/cpp/src/db/DBMetaImpl.h +++ b/cpp/src/db/DBMetaImpl.h @@ -29,7 +29,7 @@ public: virtual Status GetTableFile(TableFileSchema& file_schema) override; - virtual Status update_group_file(TableFileSchema& group_file_) override; + virtual Status UpdateTableFile(TableFileSchema& file_schema) override; virtual Status update_files(TableFilesSchema& files) override; diff --git a/cpp/src/db/MemManager.cpp b/cpp/src/db/MemManager.cpp index 60553c78..03ed3de1 100644 --- a/cpp/src/db/MemManager.cpp +++ b/cpp/src/db/MemManager.cpp @@ -55,7 +55,7 @@ Status MemVectors::serialize(std::string& table_id) { schema_.file_type = (size >= options_.index_trigger_size) ? meta::TableFileSchema::TO_INDEX : meta::TableFileSchema::RAW; - auto status = pMeta_->update_group_file(schema_); + auto status = pMeta_->UpdateTableFile(schema_); LOG(DEBUG) << "New " << ((schema_.file_type == meta::TableFileSchema::RAW) ? "raw" : "to_index") << " file " << schema_.file_id << " of size " << pEE_->Size() / meta::M << " M"; diff --git a/cpp/src/db/Meta.h b/cpp/src/db/Meta.h index 00b4b664..15d9b0e5 100644 --- a/cpp/src/db/Meta.h +++ b/cpp/src/db/Meta.h @@ -31,7 +31,7 @@ public: const DatesT& dates) = 0; virtual Status GetTableFile(TableFileSchema& file_schema) = 0; - virtual Status update_group_file(TableFileSchema& group_file_) = 0; + virtual Status UpdateTableFile(TableFileSchema& file_schema) = 0; virtual Status update_files(TableFilesSchema& files) = 0; diff --git a/cpp/unittest/db/meta_tests.cpp b/cpp/unittest/db/meta_tests.cpp index f56f1da2..620b9113 100644 --- a/cpp/unittest/db/meta_tests.cpp +++ b/cpp/unittest/db/meta_tests.cpp @@ -59,7 +59,7 @@ TEST_F(MetaTest, table_file_TEST) { auto new_file_type = meta::TableFileSchema::INDEX; table_file.file_type = new_file_type; - status = impl_->update_group_file(table_file); + status = impl_->UpdateTableFile(table_file); ASSERT_TRUE(status.ok()); ASSERT_EQ(table_file.file_type, new_file_type); @@ -76,7 +76,7 @@ TEST_F(MetaTest, table_file_TEST) { ASSERT_TRUE(status.ok()); table_file.date = meta::Meta::GetDateWithDelta(-2); - status = impl_->update_group_file(table_file); + status = impl_->UpdateTableFile(table_file); ASSERT_TRUE(status.ok()); ASSERT_EQ(table_file.date, meta::Meta::GetDateWithDelta(-2)); ASSERT_FALSE(table_file.file_type == meta::TableFileSchema::TO_DELETE); @@ -118,7 +118,7 @@ TEST_F(MetaTest, ARCHIVE_TEST_DAYS) { table_file.file_type = meta::TableFileSchema::NEW; int day = rand() % (days_num*2); table_file.created_on = ts - day*meta::D_SEC*meta::US_PS - 10000; - status = impl.update_group_file(table_file); + status = impl.UpdateTableFile(table_file); files.push_back(table_file); days.push_back(day); } @@ -162,7 +162,7 @@ TEST_F(MetaTest, ARCHIVE_TEST_DISK) { status = impl.CreateTableFile(table_file); table_file.file_type = meta::TableFileSchema::NEW; table_file.size = each_size * meta::G; - status = impl.update_group_file(table_file); + status = impl.UpdateTableFile(table_file); files.push_back(table_file); } @@ -201,25 +201,25 @@ TEST_F(MetaTest, TABLE_FILES_TEST) { for (auto i=0; iCreateTableFile(table_file); table_file.file_type = meta::TableFileSchema::NEW; - status = impl_->update_group_file(table_file); + status = impl_->UpdateTableFile(table_file); } for (auto i=0; iCreateTableFile(table_file); table_file.file_type = meta::TableFileSchema::RAW; - status = impl_->update_group_file(table_file); + status = impl_->UpdateTableFile(table_file); } for (auto i=0; iCreateTableFile(table_file); table_file.file_type = meta::TableFileSchema::TO_INDEX; - status = impl_->update_group_file(table_file); + status = impl_->UpdateTableFile(table_file); } for (auto i=0; iCreateTableFile(table_file); table_file.file_type = meta::TableFileSchema::INDEX; - status = impl_->update_group_file(table_file); + status = impl_->UpdateTableFile(table_file); } meta::TableFilesSchema files; -- GitLab