Skip to content

Replace macros with runtime_error_wrapper() for error handling #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 7, 2025
Merged

Replace macros with runtime_error_wrapper() for error handling #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f8ed22
dispatch lambdas into error handler
ahuber21 Nov 6, 2025
aaa22c9
consistently use runtime_error_wrapper()
ahuber21 Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 50 additions & 68 deletions bindings/cpp/src/dynamic_vamana_index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,28 +55,25 @@ struct DynamicVamanaIndexManagerBase : public DynamicVamanaIndex {
~DynamicVamanaIndexManagerBase() override = default;

Status add(size_t n, const size_t* labels, const float* x) noexcept override {
SVS_RUNTIME_TRY_BEGIN
svs::data::ConstSimpleDataView<float> data{x, n, impl_->dimensions()};
std::span<const size_t> lbls(labels, n);
impl_->add(data, lbls);
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] {
svs::data::ConstSimpleDataView<float> data{x, n, impl_->dimensions()};
std::span<const size_t> lbls(labels, n);
impl_->add(data, lbls);
});
}

Status
remove_selected(size_t* num_removed, const IDFilter& selector) noexcept override {
SVS_RUNTIME_TRY_BEGIN
*num_removed = impl_->remove_selected(selector);
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] {
*num_removed = impl_->remove_selected(selector);
});
}

Status remove(size_t n, const size_t* labels) noexcept override {
SVS_RUNTIME_TRY_BEGIN
std::span<const size_t> lbls(labels, n);
impl_->remove(lbls);
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] {
std::span<const size_t> lbls(labels, n);
impl_->remove(lbls);
});
}

Status search(
Expand All @@ -88,12 +85,11 @@ struct DynamicVamanaIndexManagerBase : public DynamicVamanaIndex {
const SearchParams* params = nullptr,
IDFilter* filter = nullptr
) const noexcept override {
SVS_RUNTIME_TRY_BEGIN
// TODO wrap arguments into proper data structures in DynamicVamanaIndexImpl and
// here
impl_->search(n, x, k, distances, labels, params, filter);
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] {
// TODO wrap arguments into proper data structures in DynamicVamanaIndexImpl and
// here
impl_->search(n, x, k, distances, labels, params, filter);
});
}

Status range_search(
Expand All @@ -104,26 +100,19 @@ struct DynamicVamanaIndexManagerBase : public DynamicVamanaIndex {
const SearchParams* params = nullptr,
IDFilter* filter = nullptr
) const noexcept override {
SVS_RUNTIME_TRY_BEGIN
// TODO wrap arguments into proper data structures in DynamicVamanaIndexImpl and
// here
impl_->range_search(n, x, radius, results, params, filter);
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] {
// TODO wrap arguments into proper data structures in DynamicVamanaIndexImpl and
// here
impl_->range_search(n, x, radius, results, params, filter);
});
}

Status reset() noexcept override {
SVS_RUNTIME_TRY_BEGIN
impl_->reset();
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] { impl_->reset(); });
}

Status save(std::ostream& out) const noexcept override {
SVS_RUNTIME_TRY_BEGIN
impl_->save(out);
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] { impl_->save(out); });
}
};

Expand All @@ -142,20 +131,16 @@ Status DynamicVamanaIndex::build(
const DynamicVamanaIndex::SearchParams& default_search_params
) noexcept {
*index = nullptr;
SVS_RUNTIME_TRY_BEGIN
auto impl = std::make_unique<DynamicVamanaIndexImpl>(
dim, metric, storage_kind, params, default_search_params
);
*index = new DynamicVamanaIndexManager{std::move(impl)};
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] {
auto impl = std::make_unique<DynamicVamanaIndexImpl>(
dim, metric, storage_kind, params, default_search_params
);
*index = new DynamicVamanaIndexManager{std::move(impl)};
});
}

Status DynamicVamanaIndex::destroy(DynamicVamanaIndex* index) noexcept {
SVS_RUNTIME_TRY_BEGIN
delete index;
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] { delete index; });
}

Status DynamicVamanaIndex::load(
Expand All @@ -165,12 +150,11 @@ Status DynamicVamanaIndex::load(
StorageKind storage_kind
) noexcept {
*index = nullptr;
SVS_RUNTIME_TRY_BEGIN
std::unique_ptr<DynamicVamanaIndexImpl> impl{
DynamicVamanaIndexImpl::load(in, metric, storage_kind)};
*index = new DynamicVamanaIndexManager{std::move(impl)};
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] {
std::unique_ptr<DynamicVamanaIndexImpl> impl{
DynamicVamanaIndexImpl::load(in, metric, storage_kind)};
*index = new DynamicVamanaIndexManager{std::move(impl)};
});
}

// Specialization to build LeanVec-based Vamana index with specified leanvec dims
Expand All @@ -184,13 +168,12 @@ Status DynamicVamanaIndexLeanVec::build(
const DynamicVamanaIndex::SearchParams& default_search_params
) noexcept {
*index = nullptr;
SVS_RUNTIME_TRY_BEGIN
auto impl = std::make_unique<DynamicVamanaIndexLeanVecImpl>(
dim, metric, storage_kind, leanvec_dims, params, default_search_params
);
*index = new DynamicVamanaIndexLeanVecImplManager{std::move(impl)};
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] {
auto impl = std::make_unique<DynamicVamanaIndexLeanVecImpl>(
dim, metric, storage_kind, leanvec_dims, params, default_search_params
);
*index = new DynamicVamanaIndexLeanVecImplManager{std::move(impl)};
});
}

// Specialization to build LeanVec-based Vamana index with provided training data
Expand All @@ -204,15 +187,14 @@ Status DynamicVamanaIndexLeanVec::build(
const DynamicVamanaIndex::SearchParams& default_search_params
) noexcept {
*index = nullptr;
SVS_RUNTIME_TRY_BEGIN
auto training_data_impl =
static_cast<const LeanVecTrainingDataManager*>(training_data)->impl_;
auto impl = std::make_unique<DynamicVamanaIndexLeanVecImpl>(
dim, metric, storage_kind, training_data_impl, params, default_search_params
);
*index = new DynamicVamanaIndexLeanVecImplManager{std::move(impl)};
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] {
auto training_data_impl =
static_cast<const LeanVecTrainingDataManager*>(training_data)->impl_;
auto impl = std::make_unique<DynamicVamanaIndexLeanVecImpl>(
dim, metric, storage_kind, training_data_impl, params, default_search_params
);
*index = new DynamicVamanaIndexLeanVecImplManager{std::move(impl)};
});
}

} // namespace runtime
Expand Down
38 changes: 19 additions & 19 deletions bindings/cpp/src/svs_runtime_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@

// TODO remove unused includes
#include <algorithm>
#include <concepts>
#include <functional>
#include <memory>
#include <type_traits>
#include <variant>
#include <vector>

Expand Down Expand Up @@ -62,26 +65,23 @@ class StatusException : public svs::lib::ANNException {
svs::runtime::ErrorCode errcode_;
};

#define SVS_RUNTIME_TRY_BEGIN try {
#define SVS_RUNTIME_TRY_END \
} \
catch (const svs::runtime::StatusException& ex) { \
return svs::runtime::Status(ex.code(), ex.what()); \
} \
catch (const std::invalid_argument& ex) { \
return svs::runtime::Status(svs::runtime::ErrorCode::INVALID_ARGUMENT, ex.what()); \
} \
catch (const std::runtime_error& ex) { \
return svs::runtime::Status(svs::runtime::ErrorCode::RUNTIME_ERROR, ex.what()); \
} \
catch (const std::exception& ex) { \
return svs::runtime::Status(svs::runtime::ErrorCode::UNKNOWN_ERROR, ex.what()); \
} \
catch (...) { \
return svs::runtime::Status( \
svs::runtime::ErrorCode::UNKNOWN_ERROR, "An unknown error has occurred." \
); \
template <typename Callable>
inline auto runtime_error_wrapper(Callable&& func) noexcept -> Status {
try {
func();
return Status_Ok;
} catch (const svs::runtime::StatusException& ex) {
return Status(ex.code(), ex.what());
} catch (const std::invalid_argument& ex) {
return Status(ErrorCode::INVALID_ARGUMENT, ex.what());
} catch (const std::runtime_error& ex) {
return Status(ErrorCode::RUNTIME_ERROR, ex.what());
} catch (const std::exception& ex) {
return Status(ErrorCode::UNKNOWN_ERROR, ex.what());
} catch (...) {
return Status(ErrorCode::UNKNOWN_ERROR, "An unknown error has occurred.");
}
}

using LeanVecMatricesType = svs::leanvec::LeanVecMatrices<svs::Dynamic>;

Expand Down
23 changes: 9 additions & 14 deletions bindings/cpp/src/training.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,27 +28,22 @@ Status LeanVecTrainingData::build(
const float* x,
size_t leanvec_dims
) noexcept {
SVS_RUNTIME_TRY_BEGIN
const auto data = svs::data::ConstSimpleDataView<float>(x, n, dim);
*training_data =
new LeanVecTrainingDataManager{LeanVecTrainingDataImpl{data, leanvec_dims}};
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] {
const auto data = svs::data::ConstSimpleDataView<float>(x, n, dim);
*training_data =
new LeanVecTrainingDataManager{LeanVecTrainingDataImpl{data, leanvec_dims}};
});
}

Status LeanVecTrainingData::destroy(LeanVecTrainingData* training_data) noexcept {
SVS_RUNTIME_TRY_BEGIN
delete training_data;
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] { delete training_data; });
}

Status
LeanVecTrainingData::load(LeanVecTrainingData** training_data, std::istream& in) noexcept {
SVS_RUNTIME_TRY_BEGIN
*training_data = new LeanVecTrainingDataManager{LeanVecTrainingDataImpl::load(in)};
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] {
*training_data = new LeanVecTrainingDataManager{LeanVecTrainingDataImpl::load(in)};
});
}
} // namespace runtime
} // namespace svs
5 changes: 1 addition & 4 deletions bindings/cpp/src/training_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,7 @@ struct LeanVecTrainingDataManager : public svs::runtime::LeanVecTrainingData {
: impl_{std::move(impl)} {}

Status save(std::ostream& out) const noexcept override {
SVS_RUNTIME_TRY_BEGIN
impl_.save(out);
return Status_Ok;
SVS_RUNTIME_TRY_END
return runtime_error_wrapper([&] { impl_.save(out); });
}

LeanVecTrainingDataImpl impl_;
Expand Down
Loading