提交 57dfdae3 编写于 作者: X Xu Peng

feat(db): fix bug and add exception catch in meta operation


Former-commit-id: 6d33945997e7a528bc729efdad6076d6532f79b3
上级 486c175b
...@@ -184,7 +184,8 @@ void DBImpl::background_call() { ...@@ -184,7 +184,8 @@ void DBImpl::background_call() {
std::lock_guard<std::mutex> lock(_mutex); std::lock_guard<std::mutex> lock(_mutex);
assert(_bg_compaction_scheduled); assert(_bg_compaction_scheduled);
if (!_bg_error.ok()) return; if (!_bg_error.ok() || _shutting_down.load(std::memory_order_acquire))
return ;
background_compaction(); background_compaction();
......
...@@ -129,6 +129,7 @@ Status DBMetaImpl::get_group(GroupSchema& group_info) { ...@@ -129,6 +129,7 @@ Status DBMetaImpl::get_group(GroupSchema& group_info) {
} }
Status DBMetaImpl::get_group_no_lock(GroupSchema& group_info) { Status DBMetaImpl::get_group_no_lock(GroupSchema& group_info) {
try {
auto groups = ConnectorPtr->select(columns(&GroupSchema::id, auto groups = ConnectorPtr->select(columns(&GroupSchema::id,
&GroupSchema::group_id, &GroupSchema::group_id,
&GroupSchema::files_cnt, &GroupSchema::files_cnt,
...@@ -142,11 +143,16 @@ Status DBMetaImpl::get_group_no_lock(GroupSchema& group_info) { ...@@ -142,11 +143,16 @@ Status DBMetaImpl::get_group_no_lock(GroupSchema& group_info) {
} else { } else {
return Status::NotFound("Group " + group_info.group_id + " not found"); return Status::NotFound("Group " + group_info.group_id + " not found");
} }
} catch (std::exception &e) {
LOG(DEBUG) << e.what();
throw e;
}
return Status::OK(); return Status::OK();
} }
Status DBMetaImpl::has_group(const std::string& group_id, bool& has_or_not) { Status DBMetaImpl::has_group(const std::string& group_id, bool& has_or_not) {
try {
auto groups = ConnectorPtr->select(columns(&GroupSchema::id), auto groups = ConnectorPtr->select(columns(&GroupSchema::id),
where(c(&GroupSchema::group_id) == group_id)); where(c(&GroupSchema::group_id) == group_id));
assert(groups.size() <= 1); assert(groups.size() <= 1);
...@@ -155,6 +161,10 @@ Status DBMetaImpl::has_group(const std::string& group_id, bool& has_or_not) { ...@@ -155,6 +161,10 @@ Status DBMetaImpl::has_group(const std::string& group_id, bool& has_or_not) {
} else { } else {
has_or_not = false; has_or_not = false;
} }
} catch (std::exception &e) {
LOG(DEBUG) << e.what();
throw e;
}
return Status::OK(); return Status::OK();
} }
...@@ -183,6 +193,7 @@ Status DBMetaImpl::add_group_file(GroupFileSchema& group_file) { ...@@ -183,6 +193,7 @@ Status DBMetaImpl::add_group_file(GroupFileSchema& group_file) {
try { try {
auto id = ConnectorPtr->insert(group_file); auto id = ConnectorPtr->insert(group_file);
group_file.id = id; group_file.id = id;
LOG(DEBUG) << "Add group_file of file_id=" << group_file.file_id;
} catch (...) { } catch (...) {
return Status::DBTransactionError("Add file Error"); return Status::DBTransactionError("Add file Error");
} }
...@@ -200,6 +211,7 @@ Status DBMetaImpl::add_group_file(GroupFileSchema& group_file) { ...@@ -200,6 +211,7 @@ Status DBMetaImpl::add_group_file(GroupFileSchema& group_file) {
Status DBMetaImpl::files_to_index(GroupFilesSchema& files) { Status DBMetaImpl::files_to_index(GroupFilesSchema& files) {
files.clear(); files.clear();
try {
auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id, auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id,
&GroupFileSchema::group_id, &GroupFileSchema::group_id,
&GroupFileSchema::file_id, &GroupFileSchema::file_id,
...@@ -232,6 +244,10 @@ Status DBMetaImpl::files_to_index(GroupFilesSchema& files) { ...@@ -232,6 +244,10 @@ Status DBMetaImpl::files_to_index(GroupFilesSchema& files) {
group_file.dimension = groups[group_file.group_id].dimension; group_file.dimension = groups[group_file.group_id].dimension;
files.push_back(group_file); files.push_back(group_file);
} }
} catch (std::exception & e) {
LOG(DEBUG) << e.what();
throw e;
}
return Status::OK(); return Status::OK();
} }
...@@ -241,6 +257,7 @@ Status DBMetaImpl::files_to_search(const std::string &group_id, ...@@ -241,6 +257,7 @@ Status DBMetaImpl::files_to_search(const std::string &group_id,
DatePartionedGroupFilesSchema &files) { DatePartionedGroupFilesSchema &files) {
// TODO: support data partition // TODO: support data partition
files.clear(); files.clear();
try {
auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id, auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id,
&GroupFileSchema::group_id, &GroupFileSchema::group_id,
&GroupFileSchema::file_id, &GroupFileSchema::file_id,
...@@ -274,6 +291,10 @@ Status DBMetaImpl::files_to_search(const std::string &group_id, ...@@ -274,6 +291,10 @@ Status DBMetaImpl::files_to_search(const std::string &group_id,
} }
files[group_file.date].push_back(group_file); files[group_file.date].push_back(group_file);
} }
} catch (std::exception & e) {
LOG(DEBUG) << e.what();
throw e;
}
return Status::OK(); return Status::OK();
} }
...@@ -282,6 +303,7 @@ Status DBMetaImpl::files_to_merge(const std::string& group_id, ...@@ -282,6 +303,7 @@ Status DBMetaImpl::files_to_merge(const std::string& group_id,
DatePartionedGroupFilesSchema& files) { DatePartionedGroupFilesSchema& files) {
files.clear(); files.clear();
try {
auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id, auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id,
&GroupFileSchema::group_id, &GroupFileSchema::group_id,
&GroupFileSchema::file_id, &GroupFileSchema::file_id,
...@@ -314,6 +336,10 @@ Status DBMetaImpl::files_to_merge(const std::string& group_id, ...@@ -314,6 +336,10 @@ Status DBMetaImpl::files_to_merge(const std::string& group_id,
} }
files[group_file.date].push_back(group_file); files[group_file.date].push_back(group_file);
} }
} catch (std::exception & e) {
LOG(DEBUG) << e.what();
throw e;
}
return Status::OK(); return Status::OK();
} }
...@@ -341,6 +367,7 @@ Status DBMetaImpl::get_group_files(const std::string& group_id_, ...@@ -341,6 +367,7 @@ Status DBMetaImpl::get_group_files(const std::string& group_id_,
Status DBMetaImpl::update_group_file(GroupFileSchema& group_file) { Status DBMetaImpl::update_group_file(GroupFileSchema& group_file) {
group_file.updated_time = GetMicroSecTimeStamp(); group_file.updated_time = GetMicroSecTimeStamp();
try {
auto commited = ConnectorPtr->transaction([&] () mutable { auto commited = ConnectorPtr->transaction([&] () mutable {
ConnectorPtr->update(group_file); ConnectorPtr->update(group_file);
return true; return true;
...@@ -348,10 +375,16 @@ Status DBMetaImpl::update_group_file(GroupFileSchema& group_file) { ...@@ -348,10 +375,16 @@ Status DBMetaImpl::update_group_file(GroupFileSchema& group_file) {
if (!commited) { if (!commited) {
return Status::DBTransactionError("Update file Error"); return Status::DBTransactionError("Update file Error");
} }
} catch (std::exception & e) {
LOG(DEBUG) << e.what();
LOG(DEBUG) << "id= " << group_file.id << " file_id=" << group_file.file_id;
throw e;
}
return Status::OK(); return Status::OK();
} }
Status DBMetaImpl::update_files(GroupFilesSchema& files) { Status DBMetaImpl::update_files(GroupFilesSchema& files) {
try {
auto commited = ConnectorPtr->transaction([&] () mutable { auto commited = ConnectorPtr->transaction([&] () mutable {
for (auto& file : files) { for (auto& file : files) {
file.updated_time = GetMicroSecTimeStamp(); file.updated_time = GetMicroSecTimeStamp();
...@@ -362,11 +395,16 @@ Status DBMetaImpl::update_files(GroupFilesSchema& files) { ...@@ -362,11 +395,16 @@ Status DBMetaImpl::update_files(GroupFilesSchema& files) {
if (!commited) { if (!commited) {
return Status::DBTransactionError("Update files Error"); return Status::DBTransactionError("Update files Error");
} }
} catch (std::exception & e) {
LOG(DEBUG) << e.what();
throw e;
}
return Status::OK(); return Status::OK();
} }
Status DBMetaImpl::cleanup_ttl_files(uint16_t seconds) { Status DBMetaImpl::cleanup_ttl_files(uint16_t seconds) {
auto now = GetMicroSecTimeStamp(); auto now = GetMicroSecTimeStamp();
try {
auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id, auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id,
&GroupFileSchema::group_id, &GroupFileSchema::group_id,
&GroupFileSchema::file_id, &GroupFileSchema::file_id,
...@@ -393,11 +431,16 @@ Status DBMetaImpl::cleanup_ttl_files(uint16_t seconds) { ...@@ -393,11 +431,16 @@ Status DBMetaImpl::cleanup_ttl_files(uint16_t seconds) {
ConnectorPtr->remove<GroupFileSchema>(group_file.id); ConnectorPtr->remove<GroupFileSchema>(group_file.id);
LOG(DEBUG) << "Removing deleted id=" << group_file.id << " location=" << group_file.location << std::endl; LOG(DEBUG) << "Removing deleted id=" << group_file.id << " location=" << group_file.location << std::endl;
} }
} catch (std::exception & e) {
LOG(DEBUG) << e.what();
throw e;
}
return Status::OK(); return Status::OK();
} }
Status DBMetaImpl::cleanup() { Status DBMetaImpl::cleanup() {
try {
auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id, auto selected = ConnectorPtr->select(columns(&GroupFileSchema::id,
&GroupFileSchema::group_id, &GroupFileSchema::group_id,
&GroupFileSchema::file_id, &GroupFileSchema::file_id,
...@@ -424,12 +467,17 @@ Status DBMetaImpl::cleanup() { ...@@ -424,12 +467,17 @@ Status DBMetaImpl::cleanup() {
ConnectorPtr->remove<GroupFileSchema>(group_file.id); ConnectorPtr->remove<GroupFileSchema>(group_file.id);
LOG(DEBUG) << "Removing id=" << group_file.id << " location=" << group_file.location << std::endl; LOG(DEBUG) << "Removing id=" << group_file.id << " location=" << group_file.location << std::endl;
} }
} catch (std::exception & e) {
LOG(DEBUG) << e.what();
throw e;
}
return Status::OK(); return Status::OK();
} }
Status DBMetaImpl::count(const std::string& group_id, long& result) { Status DBMetaImpl::count(const std::string& group_id, long& result) {
try {
auto selected = ConnectorPtr->select(columns(&GroupFileSchema::rows, auto selected = ConnectorPtr->select(columns(&GroupFileSchema::rows,
&GroupFileSchema::date), &GroupFileSchema::date),
where((c(&GroupFileSchema::file_type) == (int)GroupFileSchema::RAW or where((c(&GroupFileSchema::file_type) == (int)GroupFileSchema::RAW or
...@@ -450,6 +498,11 @@ Status DBMetaImpl::count(const std::string& group_id, long& result) { ...@@ -450,6 +498,11 @@ Status DBMetaImpl::count(const std::string& group_id, long& result) {
} }
result /= group_info.dimension; result /= group_info.dimension;
} catch (std::exception & e) {
LOG(DEBUG) << e.what();
throw e;
}
return Status::OK(); return Status::OK();
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册