admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-08 18:18:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(db): UpdateTableFile

Browse Source 
Former-commit-id: e5b29fa1396d5a06c26a4917e15fed0082bbc7ae
This commit is contained in:
Xu Peng 2019-05-27 18:38:55 +08:00
parent 3852b830b0
commit ec4e83db3f
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpp/src/db/DBMetaImpl.cpp
View File

@ -538,13 +538,13 @@ Status DBMetaImpl::discard_files_of_size(long to_discard_size) {
return discard_files_of_size(to_discard_size); return discard_files_of_size(to_discard_size);
} }
Status DBMetaImpl::update_group_file(TableFileSchema& group_file) { Status DBMetaImpl::UpdateTableFile(TableFileSchema& file_schema) {
group_file.updated_time = utils::GetMicroSecTimeStamp(); file_schema.updated_time = utils::GetMicroSecTimeStamp();
try { try {
ConnectorPtr->update(group_file); ConnectorPtr->update(file_schema);
} catch (std::exception & e) { } catch (std::exception & e) {
LOG(DEBUG) << e.what(); 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; throw e;
} }
return Status::OK(); return Status::OK();

2
cpp/src/db/DBMetaImpl.h
View File

@ -29,7 +29,7 @@ public:
virtual Status GetTableFile(TableFileSchema& file_schema) override; 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; virtual Status update_files(TableFilesSchema& files) override;

2
cpp/src/db/MemManager.cpp
View File

@ -55,7 +55,7 @@ Status MemVectors<EngineT>::serialize(std::string& table_id) {
schema_.file_type = (size >= options_.index_trigger_size) ? schema_.file_type = (size >= options_.index_trigger_size) ?
meta::TableFileSchema::TO_INDEX : meta::TableFileSchema::RAW; 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") LOG(DEBUG) << "New " << ((schema_.file_type == meta::TableFileSchema::RAW) ? "raw" : "to_index")
<< " file " << schema_.file_id << " of size " << pEE_->Size() / meta::M << " M"; << " file " << schema_.file_id << " of size " << pEE_->Size() / meta::M << " M";

2
cpp/src/db/Meta.h
View File

@ -31,7 +31,7 @@ public:
const DatesT& dates) = 0; const DatesT& dates) = 0;
virtual Status GetTableFile(TableFileSchema& file_schema) = 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; virtual Status update_files(TableFilesSchema& files) = 0;

16
cpp/unittest/db/meta_tests.cpp
View File

@ -59,7 +59,7 @@ TEST_F(MetaTest, table_file_TEST) {
auto new_file_type = meta::TableFileSchema::INDEX; auto new_file_type = meta::TableFileSchema::INDEX;
table_file.file_type = new_file_type; table_file.file_type = new_file_type;
status = impl_->update_group_file(table_file); status = impl_->UpdateTableFile(table_file);
ASSERT_TRUE(status.ok()); ASSERT_TRUE(status.ok());
ASSERT_EQ(table_file.file_type, new_file_type); ASSERT_EQ(table_file.file_type, new_file_type);
@ -76,7 +76,7 @@ TEST_F(MetaTest, table_file_TEST) {
ASSERT_TRUE(status.ok()); ASSERT_TRUE(status.ok());
table_file.date = meta::Meta::GetDateWithDelta(-2); table_file.date = meta::Meta::GetDateWithDelta(-2);
status = impl_->update_group_file(table_file); status = impl_->UpdateTableFile(table_file);
ASSERT_TRUE(status.ok()); ASSERT_TRUE(status.ok());
ASSERT_EQ(table_file.date, meta::Meta::GetDateWithDelta(-2)); ASSERT_EQ(table_file.date, meta::Meta::GetDateWithDelta(-2));
ASSERT_FALSE(table_file.file_type == meta::TableFileSchema::TO_DELETE); 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; table_file.file_type = meta::TableFileSchema::NEW;
int day = rand() % (days_num*2); int day = rand() % (days_num*2);
table_file.created_on = ts - day*meta::D_SEC*meta::US_PS - 10000; 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); files.push_back(table_file);
days.push_back(day); days.push_back(day);
} }
@ -162,7 +162,7 @@ TEST_F(MetaTest, ARCHIVE_TEST_DISK) {
status = impl.CreateTableFile(table_file); status = impl.CreateTableFile(table_file);
table_file.file_type = meta::TableFileSchema::NEW; table_file.file_type = meta::TableFileSchema::NEW;
table_file.size = each_size * meta::G; table_file.size = each_size * meta::G;
status = impl.update_group_file(table_file); status = impl.UpdateTableFile(table_file);
files.push_back(table_file); files.push_back(table_file);
} }
@ -201,25 +201,25 @@ TEST_F(MetaTest, TABLE_FILES_TEST) {
for (auto i=0; i<new_files_cnt; ++i) { for (auto i=0; i<new_files_cnt; ++i) {
status = impl_->CreateTableFile(table_file); status = impl_->CreateTableFile(table_file);
table_file.file_type = meta::TableFileSchema::NEW; table_file.file_type = meta::TableFileSchema::NEW;
status = impl_->update_group_file(table_file); status = impl_->UpdateTableFile(table_file);
} }
for (auto i=0; i<raw_files_cnt; ++i) { for (auto i=0; i<raw_files_cnt; ++i) {
status = impl_->CreateTableFile(table_file); status = impl_->CreateTableFile(table_file);
table_file.file_type = meta::TableFileSchema::RAW; table_file.file_type = meta::TableFileSchema::RAW;
status = impl_->update_group_file(table_file); status = impl_->UpdateTableFile(table_file);
} }
for (auto i=0; i<to_index_files_cnt; ++i) { for (auto i=0; i<to_index_files_cnt; ++i) {
status = impl_->CreateTableFile(table_file); status = impl_->CreateTableFile(table_file);
table_file.file_type = meta::TableFileSchema::TO_INDEX; table_file.file_type = meta::TableFileSchema::TO_INDEX;
status = impl_->update_group_file(table_file); status = impl_->UpdateTableFile(table_file);
} }
for (auto i=0; i<index_files_cnt; ++i) { for (auto i=0; i<index_files_cnt; ++i) {
status = impl_->CreateTableFile(table_file); status = impl_->CreateTableFile(table_file);
table_file.file_type = meta::TableFileSchema::INDEX; table_file.file_type = meta::TableFileSchema::INDEX;
status = impl_->update_group_file(table_file); status = impl_->UpdateTableFile(table_file);
} }
meta::TableFilesSchema files; meta::TableFilesSchema files;