Skip to content

Commit

Permalink
Remove boost::leaf headers from config.h
Browse files Browse the repository at this point in the history
  • Loading branch information
@acezen
acezen committed May 15, 2022
1 parent 1b6c6b9 commit 98260eb
Show file tree
Hide file tree
Showing 29 changed files with 313 additions and 286 deletions.
4 changes: 2 additions & 2 deletions analytical_engine/core/app/app_invoker.h
View file
Expand Up @@ -191,8 +191,8 @@ class AppInvoker {
}

public:
static bl::result<nullptr_t> Query(std::shared_ptr<worker_t> worker,
const rpc::QueryArgs& query_args) {
static boost::leaf::result<nullptr_t> Query(
std::shared_ptr<worker_t> worker, const rpc::QueryArgs& query_args) {
constexpr std::size_t args_num = ArgsNum<context_init_func_t>::value - 1;
CHECK_OR_RAISE(args_num == query_args.args_size());
query_impl(worker, query_args, std::make_index_sequence<args_num>());
Expand Down
4 changes: 0 additions & 4 deletions analytical_engine/core/config.h
View file
Expand Up @@ -18,14 +18,10 @@

#include <cstdint> // IWYU pragma: export

#include "boost/leaf.hpp" // IWYU pragma: export

#include "grape/config.h" // IWYU pragma: export

namespace gs {
using fid_t = grape::fid_t;

namespace bl = boost::leaf;
} // namespace gs

#endif // ANALYTICAL_ENGINE_CORE_CONFIG_H_
71 changes: 36 additions & 35 deletions analytical_engine/core/context/i_context.h
View file
Expand Up @@ -70,32 +70,33 @@ class IVertexDataContextWrapper : public IContextWrapper {
explicit IVertexDataContextWrapper(const std::string& id)
: IContextWrapper(id) {}

virtual bl::result<std::unique_ptr<grape::InArchive>> ToNdArray(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToNdArray(
const grape::CommSpec& comm_spec, const Selector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<std::unique_ptr<grape::InArchive>> ToDataframe(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToDataframe(
const grape::CommSpec& comm_spec,
const std::vector<std::pair<std::string, Selector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardTensor(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardTensor(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const Selector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardDataframe(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardDataframe(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const std::vector<std::pair<std::string, Selector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<
virtual boost::leaf::result<
std::vector<std::pair<std::string, std::shared_ptr<arrow::Array>>>>
ToArrowArrays(
const grape::CommSpec& comm_spec,
const std::vector<std::pair<std::string, Selector>>& selectors) = 0;

virtual bl::result<std::string> GetContextData(const rpc::GSParams& params) {
virtual boost::leaf::result<std::string> GetContextData(
const rpc::GSParams& params) {
RETURN_GS_ERROR(vineyard::ErrorCode::kInvalidOperationError,
"Not implemented operation: GetContextData");
}
Expand All @@ -112,21 +113,21 @@ class ILabeledVertexDataContextWrapper : public IContextWrapper {
explicit ILabeledVertexDataContextWrapper(const std::string& id)
: IContextWrapper(id) {}

virtual bl::result<std::unique_ptr<grape::InArchive>> ToNdArray(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToNdArray(
const grape::CommSpec& comm_spec, const LabeledSelector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<std::unique_ptr<grape::InArchive>> ToDataframe(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToDataframe(
const grape::CommSpec& comm_spec,
const std::vector<std::pair<std::string, LabeledSelector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardTensor(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardTensor(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const LabeledSelector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardDataframe(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardDataframe(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const std::vector<std::pair<std::string, LabeledSelector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;
Expand All @@ -139,7 +140,7 @@ class ILabeledVertexDataContextWrapper : public IContextWrapper {
* "v:label1.id", "col2_result": "r:label0"}
* @return
*/
virtual bl::result<std::map<
virtual boost::leaf::result<std::map<
label_id_t,
std::vector<std::pair<std::string, std::shared_ptr<arrow::Array>>>>>
ToArrowArrays(const grape::CommSpec& comm_spec,
Expand All @@ -156,26 +157,26 @@ class IVertexPropertyContextWrapper : public IContextWrapper {
explicit IVertexPropertyContextWrapper(const std::string& id)
: IContextWrapper(id) {}

virtual bl::result<std::unique_ptr<grape::InArchive>> ToNdArray(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToNdArray(
const grape::CommSpec& comm_spec, const Selector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<std::unique_ptr<grape::InArchive>> ToDataframe(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToDataframe(
const grape::CommSpec& comm_spec,
const std::vector<std::pair<std::string, Selector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardTensor(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardTensor(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const Selector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardDataframe(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardDataframe(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const std::vector<std::pair<std::string, Selector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<
virtual boost::leaf::result<
std::vector<std::pair<std::string, std::shared_ptr<arrow::Array>>>>
ToArrowArrays(
const grape::CommSpec& comm_spec,
Expand All @@ -193,26 +194,26 @@ class ILabeledVertexPropertyContextWrapper : public IContextWrapper {
explicit ILabeledVertexPropertyContextWrapper(const std::string& id)
: IContextWrapper(id) {}

virtual bl::result<std::unique_ptr<grape::InArchive>> ToNdArray(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToNdArray(
const grape::CommSpec& comm_spec, const LabeledSelector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<std::unique_ptr<grape::InArchive>> ToDataframe(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToDataframe(
const grape::CommSpec& comm_spec,
const std::vector<std::pair<std::string, LabeledSelector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardTensor(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardTensor(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const LabeledSelector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardDataframe(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardDataframe(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const std::vector<std::pair<std::string, LabeledSelector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<std::map<
virtual boost::leaf::result<std::map<
label_id_t,
std::vector<std::pair<std::string, std::shared_ptr<arrow::Array>>>>>
ToArrowArrays(const grape::CommSpec& comm_spec,
Expand All @@ -232,26 +233,26 @@ class IJavaPIEPropertyContextWrapper : public IContextWrapper {
explicit IJavaPIEPropertyContextWrapper(const std::string& id)
: IContextWrapper(id) {}

virtual bl::result<std::unique_ptr<grape::InArchive>> ToNdArray(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToNdArray(
const grape::CommSpec& comm_spec, const LabeledSelector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<std::unique_ptr<grape::InArchive>> ToDataframe(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToDataframe(
const grape::CommSpec& comm_spec,
const std::vector<std::pair<std::string, LabeledSelector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardTensor(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardTensor(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const LabeledSelector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardDataframe(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardDataframe(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const std::vector<std::pair<std::string, LabeledSelector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<std::map<
virtual boost::leaf::result<std::map<
label_id_t,
std::vector<std::pair<std::string, std::shared_ptr<arrow::Array>>>>>
ToArrowArrays(const grape::CommSpec& comm_spec,
Expand All @@ -268,26 +269,26 @@ class IJavaPIEProjectedContextWrapper : public IContextWrapper {
explicit IJavaPIEProjectedContextWrapper(const std::string& id)
: IContextWrapper(id) {}

virtual bl::result<std::unique_ptr<grape::InArchive>> ToNdArray(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToNdArray(
const grape::CommSpec& comm_spec, const Selector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<std::unique_ptr<grape::InArchive>> ToDataframe(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToDataframe(
const grape::CommSpec& comm_spec,
const std::vector<std::pair<std::string, Selector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardTensor(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardTensor(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const Selector& selector,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardDataframe(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardDataframe(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const std::vector<std::pair<std::string, Selector>>& selectors,
const std::pair<std::string, std::string>& range) = 0;

virtual bl::result<
virtual boost::leaf::result<
std::vector<std::pair<std::string, std::shared_ptr<arrow::Array>>>>
ToArrowArrays(
const grape::CommSpec& comm_spec,
Expand All @@ -302,17 +303,17 @@ class ITensorContextWrapper : public IContextWrapper {
public:
explicit ITensorContextWrapper(const std::string& id) : IContextWrapper(id) {}

virtual bl::result<std::unique_ptr<grape::InArchive>> ToNdArray(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToNdArray(
const grape::CommSpec& comm_spec, uint32_t axis) = 0;

virtual bl::result<std::unique_ptr<grape::InArchive>> ToDataframe(
virtual boost::leaf::result<std::unique_ptr<grape::InArchive>> ToDataframe(
const grape::CommSpec& comm_spec) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardTensor(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardTensor(
const grape::CommSpec& comm_spec, vineyard::Client& client,
uint32_t axis) = 0;

virtual bl::result<vineyard::ObjectID> ToVineyardDataframe(
virtual boost::leaf::result<vineyard::ObjectID> ToVineyardDataframe(
const grape::CommSpec& comm_spec, vineyard::Client& client) = 0;
};

Expand Down
11 changes: 6 additions & 5 deletions analytical_engine/core/context/java_pie_projected_context.h
View file
Expand Up @@ -287,38 +287,39 @@ class JavaPIEProjectedContextWrapper : public IJavaPIEProjectedContextWrapper {
return std::shared_ptr<IFragmentWrapper>(nullptr);
}
// Considering labeledSelector vs selector
bl::result<std::unique_ptr<grape::InArchive>> ToNdArray(
boost::leaf::result<std::unique_ptr<grape::InArchive>> ToNdArray(
const grape::CommSpec& comm_spec, const Selector& selector,
const std::pair<std::string, std::string>& range) override {
RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod,
"No implementation needed for Java context wrapper");
}

bl::result<std::unique_ptr<grape::InArchive>> ToDataframe(
boost::leaf::result<std::unique_ptr<grape::InArchive>> ToDataframe(
const grape::CommSpec& comm_spec,
const std::vector<std::pair<std::string, Selector>>& selectors,
const std::pair<std::string, std::string>& range) override {
RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod,
"No implementation needed for Java context wrapper");
}

bl::result<vineyard::ObjectID> ToVineyardTensor(
boost::leaf::result<vineyard::ObjectID> ToVineyardTensor(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const Selector& selector,
const std::pair<std::string, std::string>& range) override {
RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod,
"No implementation needed for Java context wrapper");
}

bl::result<vineyard::ObjectID> ToVineyardDataframe(
boost::leaf::result<vineyard::ObjectID> ToVineyardDataframe(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const std::vector<std::pair<std::string, Selector>>& selectors,
const std::pair<std::string, std::string>& range) override {
RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod,
"No implementation needed for Java context wrapper");
}

bl::result<std::vector<std::pair<std::string, std::shared_ptr<arrow::Array>>>>
boost::leaf::result<
std::vector<std::pair<std::string, std::shared_ptr<arrow::Array>>>>
ToArrowArrays(
const grape::CommSpec& comm_spec,
const std::vector<std::pair<std::string, Selector>>& selectors) override {
Expand Down
10 changes: 5 additions & 5 deletions analytical_engine/core/context/java_pie_property_context.h
View file
Expand Up @@ -281,38 +281,38 @@ class JavaPIEPropertyContextWrapper : public IJavaPIEPropertyContextWrapper {
return std::shared_ptr<IFragmentWrapper>(nullptr);
}

bl::result<std::unique_ptr<grape::InArchive>> ToNdArray(
boost::leaf::result<std::unique_ptr<grape::InArchive>> ToNdArray(
const grape::CommSpec& comm_spec, const LabeledSelector& selector,
const std::pair<std::string, std::string>& range) override {
RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod,
"No implementation needed for Java context wrapper");
}

bl::result<std::unique_ptr<grape::InArchive>> ToDataframe(
boost::leaf::result<std::unique_ptr<grape::InArchive>> ToDataframe(
const grape::CommSpec& comm_spec,
const std::vector<std::pair<std::string, LabeledSelector>>& selectors,
const std::pair<std::string, std::string>& range) override {
RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod,
"No implementation needed for Java context wrapper");
}

bl::result<vineyard::ObjectID> ToVineyardTensor(
boost::leaf::result<vineyard::ObjectID> ToVineyardTensor(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const LabeledSelector& selector,
const std::pair<std::string, std::string>& range) override {
RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod,
"No implementation needed for Java context wrapper");
}

bl::result<vineyard::ObjectID> ToVineyardDataframe(
boost::leaf::result<vineyard::ObjectID> ToVineyardDataframe(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const std::vector<std::pair<std::string, LabeledSelector>>& selectors,
const std::pair<std::string, std::string>& range) override {
RETURN_GS_ERROR(vineyard::ErrorCode::kUnimplementedMethod,
"No implementation needed for Java context wrapper");
}

bl::result<std::map<
boost::leaf::result<std::map<
label_id_t,
std::vector<std::pair<std::string, std::shared_ptr<arrow::Array>>>>>
ToArrowArrays(const grape::CommSpec& comm_spec,
Expand Down
10 changes: 5 additions & 5 deletions analytical_engine/core/context/labeled_vertex_property_context.h
View file
Expand Up @@ -200,7 +200,7 @@ class LabeledVertexPropertyContextWrapper
return frag_wrapper_;
}

bl::result<std::unique_ptr<grape::InArchive>> ToNdArray(
boost::leaf::result<std::unique_ptr<grape::InArchive>> ToNdArray(
const grape::CommSpec& comm_spec, const LabeledSelector& selector,
const std::pair<std::string, std::string>& range) override {
auto& frag = ctx_->fragment();
Expand Down Expand Up @@ -280,7 +280,7 @@ class LabeledVertexPropertyContextWrapper
return arc;
}

bl::result<std::unique_ptr<grape::InArchive>> ToDataframe(
boost::leaf::result<std::unique_ptr<grape::InArchive>> ToDataframe(
const grape::CommSpec& comm_spec,
const std::vector<std::pair<std::string, LabeledSelector>>& selectors,
const std::pair<std::string, std::string>& range) override {
Expand Down Expand Up @@ -365,7 +365,7 @@ class LabeledVertexPropertyContextWrapper
return arc;
}

bl::result<vineyard::ObjectID> ToVineyardTensor(
boost::leaf::result<vineyard::ObjectID> ToVineyardTensor(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const LabeledSelector& selector,
const std::pair<std::string, std::string>& range) override {
Expand Down Expand Up @@ -425,7 +425,7 @@ class LabeledVertexPropertyContextWrapper
return vy_obj->id();
}

bl::result<vineyard::ObjectID> ToVineyardDataframe(
boost::leaf::result<vineyard::ObjectID> ToVineyardDataframe(
const grape::CommSpec& comm_spec, vineyard::Client& client,
const std::vector<std::pair<std::string, LabeledSelector>>& selectors,
const std::pair<std::string, std::string>& range) override {
Expand Down Expand Up @@ -503,7 +503,7 @@ class LabeledVertexPropertyContextWrapper
return vy_obj->id();
}

bl::result<std::map<
boost::leaf::result<std::map<
label_id_t,
std::vector<std::pair<std::string, std::shared_ptr<arrow::Array>>>>>
ToArrowArrays(const grape::CommSpec& comm_spec,
Expand Down

0 comments on commit 98260eb

Please sign in to comment.