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

Jump to bottom

fix(analytical): fixes wrong result when flatten from projected arrow fragment #3066

Merged
merged 2 commits into from
Aug 1, 2023
Merged

fix(analytical): fixes wrong result when flatten from projected arrow fragment #3066

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb0bd1e
Update arrow_flattened_fragment.h
hanjf12 Aug 1, 2023
89e0572
Fixes format & lint errors
sighingnow Aug 1, 2023
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
57 changes: 39 additions & 18 deletions analytical_engine/core/fragment/arrow_flattened_fragment.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,12 +678,17 @@ class ArrowFlattenedFragment {
}

inline bool GetVertex(const oid_t& oid, vertex_t& v) const {
for (label_id_t v_label = 0; v_label < fragment_->vertex_label_num();
auto& schema = fragment_->schema();
label_id_t vertex_label_num =
static_cast<label_id_t>(schema.AllVertexEntries().size());
for (label_id_t v_label = 0; v_label < vertex_label_num;
v_label++) {
if (fragment_->GetVertex(v_label, oid, v)) {
// generate continuous lid
v.SetValue(union_id_parser_.GenerateContinuousLid(v.GetValue()));
return true;
if (schema_.IsVertexValid(v_label)){
if (fragment_->GetVertex(v_label, oid, v)) {
// generate continuous lid
v.SetValue(union_id_parser_.GenerateContinuousLid(v.GetValue()));
return true;
}
}
}
return false;
Expand Down Expand Up @@ -745,24 +750,34 @@ class ArrowFlattenedFragment {
}

inline bool GetInnerVertex(const oid_t& oid, vertex_t& v) const {
for (label_id_t v_label = 0; v_label < fragment_->vertex_label_num();
auto& schema = fragment_->schema();
label_id_t vertex_label_num =
static_cast<label_id_t>(schema.AllVertexEntries().size());
for (label_id_t v_label = 0; v_label < vertex_label_num;
v_label++) {
if (fragment_->GetInnerVertex(v_label, oid, v)) {
// generate continuous lid
v.SetValue(union_id_parser_.GenerateContinuousLid(v.GetValue()));
return true;
if (schema_.IsVertexValid(v_label)){
if (fragment_->GetInnerVertex(v_label, oid, v)) {
// generate continuous lid
v.SetValue(union_id_parser_.GenerateContinuousLid(v.GetValue()));
return true;
}
}
}
return false;
}

inline bool GetOuterVertex(const oid_t& oid, vertex_t& v) const {
for (label_id_t v_label = 0; v_label < fragment_->vertex_label_num();
auto& schema = fragment_->schema();
label_id_t vertex_label_num =
static_cast<label_id_t>(schema.AllVertexEntries().size());
for (label_id_t v_label = 0; v_label < vertex_label_num;
v_label++) {
if (fragment_->GetOuterVertex(v_label, oid, v)) {
// generate continuous lid
v.SetValue(union_id_parser_.GenerateContinuousLid(v.GetValue()));
return true;
if (schema_.IsVertexValid(v_label)){
if (fragment_->GetOuterVertex(v_label, oid, v)) {
// generate continuous lid
v.SetValue(union_id_parser_.GenerateContinuousLid(v.GetValue()));
return true;
}
}
}
return false;
Expand All @@ -783,9 +798,15 @@ class ArrowFlattenedFragment {
}

inline bool Oid2Gid(const oid_t& oid, vid_t& gid) const {
for (label_id_t label = 0; label < fragment_->vertex_label_num(); label++) {
if (fragment_->Oid2Gid(label, oid, gid)) {
return true;
auto& schema = fragment_->schema();
label_id_t vertex_label_num =
static_cast<label_id_t>(schema.AllVertexEntries().size());
for (label_id_t v_label = 0; v_label < vertex_label_num;
v_label++) {
if (schema_.IsVertexValid(v_label)){
if (fragment_->Oid2Gid(v_label, oid, gid)) {
return true;
}
}
}
return false;
Expand Down
Loading