Skip to content
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

Fixes the global property graph stream for subgraph. #118

Merged
merged 2 commits into from
Feb 1, 2021
Merged

Fixes the global property graph stream for subgraph. #118

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
bb19e5f
Fixes the global property graph stream for subgraph.
sighingnow Feb 1, 2021
551096e
Persist before ConstructFragmentGroup.
sighingnow Feb 1, 2021
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
1 change: 1 addition & 0 deletions analytical_engine/core/loader/arrow_fragment_loader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ class ArrowFragmentLoader {

boost::leaf::result<vineyard::ObjectID> LoadFragmentAsFragmentGroup() {
BOOST_LEAF_AUTO(frag_id, LoadFragment());
VY_OK_OR_RAISE(client_.Persist(frag_id));
return vineyard::ConstructFragmentGroup(client_, frag_id, comm_spec_);
}

Expand Down
2 changes: 2 additions & 0 deletions analytical_engine/core/object/fragment_wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ class FragmentWrapper<vineyard::ArrowFragment<OID_T, VID_T>>
VINEYARD_CHECK_OK(client->GetMetaData(fragment_->id(), obj_meta));
vineyard::ObjectID new_frag_id;
VINEYARD_CHECK_OK(client->CreateMetaData(obj_meta, new_frag_id));
VINEYARD_CHECK_OK(client->Persist(new_frag_id));
BOOST_LEAF_AUTO(frag_group_id, vineyard::ConstructFragmentGroup(
*client, new_frag_id, comm_spec));
auto new_frag =
Expand Down Expand Up @@ -206,6 +207,7 @@ class FragmentWrapper<vineyard::ArrowFragment<OID_T, VID_T>>

auto new_frag_id = fragment_->AddVertexColumns(*client, columns);

VINEYARD_CHECK_OK(client->Persist(new_frag_id));
BOOST_LEAF_AUTO(frag_group_id, vineyard::ConstructFragmentGroup(
*client, new_frag_id, comm_spec));
auto new_frag = client->GetObject<fragment_t>(new_frag_id);
Expand Down
2 changes: 2 additions & 0 deletions analytical_engine/frame/property_graph_frame.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ void LoadGraph(
auto new_frag = std::static_pointer_cast<_GRAPH_TYPE>(
client.GetObject(new_frag_id));

VINEYARD_CHECK_OK(client.Persist(new_frag_id));
BOOST_LEAF_AUTO(
new_frag_group_id,
vineyard::ConstructFragmentGroup(client, new_frag_id, comm_spec));
Expand Down Expand Up @@ -172,6 +173,7 @@ void ToArrowFragment(

gs::DynamicToArrowConverter<oid_t> converter(comm_spec, client);
BOOST_LEAF_AUTO(arrow_frag, converter.Convert(dynamic_frag));
VINEYARD_CHECK_OK(client.Persist(arrow_frag->id()));
BOOST_LEAF_AUTO(frag_group_id,
vineyard::ConstructFragmentGroup(
client, arrow_frag->id(), comm_spec));
Expand Down
1 change: 1 addition & 0 deletions interactive_engine/src/executor/runtime/native/property_graph_stream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ std::shared_ptr<Object> GlobalPGStreamBuilder::_Seal(Client& client) {
auto gstream = std::make_shared<GlobalPGStream>();
gstream->total_stream_chunks_ = total_stream_chunks_;
gstream->meta_.SetTypeName(type_name<GlobalPGStream>());
gstream->meta_.SetGlobal(true);
gstream->meta_.AddKeyValue("total_stream_chunks", total_stream_chunks_);

for (size_t idx = 0; idx < stream_chunks_.size(); ++idx) {
Expand Down
2 changes: 1 addition & 1 deletion interactive_engine/src/executor/runtime/native/property_graph_stream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ class PropertyGraphInStream {

class GlobalPGStreamBuilder;

class GlobalPGStream : public Registered<GlobalPGStream> {
class GlobalPGStream : public Registered<GlobalPGStream>, GlobalObject {
public:
static std::shared_ptr<Object> Create() __attribute__((used)) {
return std::static_pointer_cast<Object>(
Expand Down
2 changes: 1 addition & 1 deletion k8s/gsvineyard.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN cd /tmp && \
make -j`nproc` && \
make install && \
cd /tmp && \
git clone -b v0.1.7 https://github.com/alibaba/libvineyard.git && \
git clone -b v0.1.8 https://github.com/alibaba/libvineyard.git && \
cd libvineyard && \
git submodule update --init && \
mkdir -p /tmp/libvineyard/build && \
Expand Down