Skip to content

[Backport 2.x] Allow backtick around fields in sort cmd #1689

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

Merged
dai-chen merged 1 commit into from
May 31, 2023
Merged

[Backport 2.x] Allow backtick around fields in sort cmd #1689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@ gen

.java-version
.worktrees
http-client.env.json
http-client.env.json
/doctest/sql-cli/
.factorypath
2 changes: 1 addition & 1 deletion ppl/src/main/java/org/opensearch/sql/ppl/parser/AstExpressionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public UnresolvedExpression visitWcFieldExpression(WcFieldExpressionContext ctx)
@Override
public UnresolvedExpression visitSortField(SortFieldContext ctx) {
return new Field(
qualifiedName(ctx.sortFieldExpression().fieldExpression().getText()),
visit(ctx.sortFieldExpression().fieldExpression().qualifiedName()),
ArgumentFactory.getArgumentList(ctx)
);
}
Expand Down
9 changes: 9 additions & 0 deletions ppl/src/test/java/org/opensearch/sql/ppl/parser/AstExpressionBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,15 @@ public void testSortFieldWithMinusKeyword() {
));
}

@Test
public void testSortFieldWithBackticks() {
assertEqual("source=t | sort `f`",
sort(
relation("t"),
field("f", defaultSortFieldArgs())
));
}

@Test
public void testSortFieldWithAutoKeyword() {
assertEqual("source=t | sort auto(f)",
Expand Down