admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

enhance: catch std::stoi exception and improve error msg (#36296)

Browse Source 
issue: #36255
pr: #36267

Signed-off-by: jaime <yun.zhang@zilliz.com>
This commit is contained in:
jaime 2024-09-18 17:29:11 +08:00 committed by GitHub
parent 72f182384b
commit 817fe486d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/core/src/index/Utils.cpp
View File

@ -128,7 +128,14 @@ int64_t
GetDimFromConfig(const Config& config) {
auto dimension = GetValueFromConfig<std::string>(config, "dim");
AssertInfo(dimension.has_value(), "dimension not exist in config");
return (std::stoi(dimension.value()));
try {
return (std::stoi(dimension.value()));
} catch (const std::logic_error& e) {
auto err_message = fmt::format(
"invalided dimension:{}, error:{}", dimension.value(), e.what());
LOG_ERROR(err_message);
throw std::logic_error(err_message);
}
}
std::string
@ -151,7 +158,16 @@ GetIndexEngineVersionFromConfig(const Config& config) {
GetValueFromConfig<std::string>(config, INDEX_ENGINE_VERSION);
AssertInfo(index_engine_version.has_value(),
"index_engine not exist in config");
return (std::stoi(index_engine_version.value()));
try {
return (std::stoi(index_engine_version.value()));
} catch (const std::logic_error& e) {
auto err_message =
fmt::format("invalided index engine version:{}, error:{}",
index_engine_version.value(),
e.what());
LOG_ERROR(err_message);
throw std::logic_error(err_message);
}
}
// TODO :: too ugly

28
internal/core/src/storage/DiskFileManagerImpl.cpp
View File

@ -236,9 +236,17 @@ DiskFileManagerImpl::CacheIndexToDisk() {
std::map<std::string, std::vector<int>> index_slices;
for (auto& file_path : remote_files) {
auto pos = file_path.find_last_of("_");
index_slices[file_path.substr(0, pos)].emplace_back(
std::stoi(file_path.substr(pos + 1)));
auto pos = file_path.find_last_of('_');
AssertInfo(pos > 0, "invalided index file path:{}", file_path);
try {
auto idx = std::stoi(file_path.substr(pos + 1));
index_slices[file_path.substr(0, pos)].emplace_back(idx);
} catch (const std::logic_error& e) {
auto err_message = fmt::format(
"invalided index file path:{}, error:{}", file_path, e.what());
LOG_ERROR(err_message);
throw std::logic_error(err_message);
}
}
for (auto& slices : index_slices) {
@ -291,9 +299,17 @@ DiskFileManagerImpl::CacheIndexToDisk(
std::map<std::string, std::vector<int>> index_slices;
for (auto& file_path : remote_files) {
auto pos = file_path.find_last_of('_');
index_slices[file_path.substr(0, pos)].emplace_back(
std::stoi(file_path.substr(pos + 1)));
auto pos = file_path.find_last_of("_");
AssertInfo(pos > 0, "invalided index file path:{}", file_path);
try {
auto idx = std::stoi(file_path.substr(pos + 1));
index_slices[file_path.substr(0, pos)].emplace_back(idx);
} catch (const std::logic_error& e) {
auto err_message = fmt::format(
"invalided index file path:{}, error:{}", file_path, e.what());
LOG_ERROR(err_message);
throw std::logic_error(err_message);
}
}
for (auto& slices : index_slices) {