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

disable lookup yield agg function #3245

Merged
merged 2 commits into from
Nov 2, 2021
Merged

disable lookup yield agg function #3245

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
08377f8
disable lookup yield agg function
nevermore3 Nov 1, 2021
776e47c
add ci case
nevermore3 Nov 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
4 changes: 2 additions & 2 deletions src/graph/validator/LookupValidator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Status LookupValidator::validateYieldEdge() {
auto yieldExpr = lookupCtx_->yieldExpr;
for (auto col : yield->columns()) {
if (ExpressionUtils::hasAny(col->expr(),
{Expression::Kind::kPathBuild, Expression::Kind::kVertex})) {
{Expression::Kind::kAggregate, Expression::Kind::kVertex})) {
return Status::SemanticError("illegal yield clauses `%s'", col->toString().c_str());
}
if (ExpressionUtils::hasAny(col->expr(), {Expression::Kind::kEdge})) {
Expand Down Expand Up @@ -135,7 +135,7 @@ Status LookupValidator::validateYieldTag() {
auto yieldExpr = lookupCtx_->yieldExpr;
for (auto col : yield->columns()) {
if (ExpressionUtils::hasAny(col->expr(),
{Expression::Kind::kPathBuild, Expression::Kind::kEdge})) {
{Expression::Kind::kAggregate, Expression::Kind::kEdge})) {
return Status::SemanticError("illegal yield clauses `%s'", col->toString().c_str());
}
if (ExpressionUtils::hasAny(col->expr(), {Expression::Kind::kVertex})) {
Expand Down
5 changes: 5 additions & 0 deletions src/graph/validator/test/LookupValidatorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ TEST_F(LookupValidatorTest, wrongYield) {
EXPECT_EQ(std::string(result.message()),
"SyntaxError: please add alias when using `vertex'. near `vertex'");
}
{
std::string query = "LOOKUP ON person YIELD count(*)";
auto result = checkResult(query);
EXPECT_EQ(std::string(result.message()), "SemanticError: illegal yield clauses `count(*)'");
}
{
std::string query = "LOOKUP ON person YIELD vertex as node, edge";
auto result = checkResult(query);
Expand Down
7 changes: 7 additions & 0 deletions tests/tck/features/lookup/WithYield.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,10 @@ Feature: Lookup with yield
| "Marco Belinelli" | "Tony Parker" | 0 | 50 | [:like "Marco Belinelli"->"Tony Parker" @0 {likeness: 50}] |
| "Rajon Rondo" | "Ray Allen" | 0 | -1 | [:like "Rajon Rondo"->"Ray Allen" @0 {likeness: -1}] |
| "Ray Allen" | "Rajon Rondo" | 0 | 9 | [:like "Ray Allen"->"Rajon Rondo" @0 {likeness: 9}] |
When executing query:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why add this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is no such testcase before

"""
LOOKUP ON like WHERE like.likeness < 50 + 1 YIELD like.likeness, edge as relationship | YIELD count(*) as nums
"""
Then the result should be, in any order:
| nums |
| 6 |
8 changes: 8 additions & 0 deletions tests/tck/features/lookup/WithYield.intVid.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,11 @@ Feature: Lookup with yield in integer vid
| "Marco Belinelli" | "Tony Parker" | 0 | 50 | [:like "Marco Belinelli"->"Tony Parker" @0 {likeness: 50}] |
| "Rajon Rondo" | "Ray Allen" | 0 | -1 | [:like "Rajon Rondo"->"Ray Allen" @0 {likeness: -1}] |
| "Ray Allen" | "Rajon Rondo" | 0 | 9 | [:like "Ray Allen"->"Rajon Rondo" @0 {likeness: 9}] |
When executing query:
"""
LOOKUP ON serve WHERE serve.start_year == 2008 and serve.end_year == 2019
YIELD serve.start_year AS startYear | YIELD count(*) as nums
"""
Then the result should be, in any order:
| nums |
| 2 |