Skip to content

Fix cartesian product result #493

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix cartesian product result #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6651fb6
comment
lipanpan03 Apr 25, 2024
ba1d327
fix duplicate edge check in pattern_graph
lipanpan03 Apr 25, 2024
246cbb0
Merge branch 'master' into fix_cartesian_product_result
qishipengqsp Apr 26, 2024
dfb03f5
Merge branch 'master' into fix_cartesian_product_result
lipanpan03 May 7, 2024
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
2 changes: 1 addition & 1 deletion src/cypher/execution_plan/ops/op_expand_all.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class ExpandAll : public OpBase {

bool _CheckToSkipEdge(RTContext *ctx) const {
return eit_->IsValid() &&
(pattern_graph_->VisitedEdges().Contains(*eit_) || _CheckToSkipEdgeFilter(ctx) ||
(_CheckToSkipEdgeFilter(ctx) ||
(expand_into_ && eit_->GetNbr(expand_direction_) != neighbor_->PullVid()));
}

Expand Down
8 changes: 6 additions & 2 deletions test/test_query.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,15 @@ class TestQuery : public TuGraphTest {
parser::LcypherParser parser(&tokens);
parser.addErrorListener(&parser::CypherErrorListener::INSTANCE);
parser::CypherBaseVisitor visitor(ctx_.get(), parser.oC_Cypher());
UT_LOG() << "-----CLAUSE TO STRING-----";
for (const auto &sql_query : visitor.GetQuery()) {
UT_LOG() << sql_query.ToString();
}
cypher::ExecutionPlan execution_plan;
execution_plan.Build(visitor.GetQuery(), visitor.CommandType(), ctx_.get());
execution_plan.Validate(ctx_.get());
execution_plan.DumpGraph();
execution_plan.DumpPlan(0, false);
UT_LOG() << execution_plan.DumpGraph();
UT_LOG() << execution_plan.DumpPlan(0, false);
execution_plan.Execute(ctx_.get());
result = ctx_->result_->Dump(false);
UT_LOG() << "-----result-----";
Expand Down