Skip to content

Updated grammar for FILLNULL to match grammar in SQL project #968

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
YANG-DB merged 1 commit into from
Dec 6, 2024
Merged

Updated grammar for FILLNULL to match grammar in SQL project #968

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
19 changes: 7 additions & 12 deletions ppl-spark-integration/src/main/antlr4/OpenSearchPPLParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,21 +237,16 @@ fillnullCommand
| fillNullWithFieldVariousValues)
;

fillNullWithTheSameValue
: WITH nullReplacement IN nullableField (COMMA nullableField)*
;

fillNullWithFieldVariousValues
: USING nullableField EQUAL nullReplacement (COMMA nullableField EQUAL nullReplacement)*
;

fillNullWithTheSameValue
: WITH nullReplacement = valueExpression IN nullableFieldList = fieldList
;

nullableField
: fieldExpression
fillNullWithFieldVariousValues
: USING nullableReplacementExpression (COMMA nullableReplacementExpression)*
;

nullReplacement
: expression
nullableReplacementExpression
: nullableField = fieldExpression EQUAL nullableReplacement = valueExpression
;

expandCommand
Expand Down
11 changes: 5 additions & 6 deletions ppl-spark-integration/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,19 +581,18 @@ public UnresolvedPlan visitFillnullCommand(OpenSearchPPLParser.FillnullCommandCo
FillNullWithFieldVariousValuesContext variousValuesContext = ctx.fillNullWithFieldVariousValues();
if (sameValueContext != null) {
// todo consider using expression instead of Literal
UnresolvedExpression replaceNullWithMe = internalVisitExpression(sameValueContext.nullReplacement().expression());
List<Field> fieldsToReplace = sameValueContext.nullableField()
UnresolvedExpression replaceNullWithMe = internalVisitExpression(sameValueContext.nullReplacement);
List<Field> fieldsToReplace = sameValueContext.nullableFieldList.fieldExpression()
.stream()
.map(this::internalVisitExpression)
.map(Field.class::cast)
.collect(Collectors.toList());
return new FillNull(ofSameValue(replaceNullWithMe, fieldsToReplace));
} else if (variousValuesContext != null) {
List<NullableFieldFill> nullableFieldFills = IntStream.range(0, variousValuesContext.nullableField().size())
List<NullableFieldFill> nullableFieldFills = IntStream.range(0, variousValuesContext.nullableReplacementExpression().size())
.mapToObj(index -> {
variousValuesContext.nullableField(index);
UnresolvedExpression replaceNullWithMe = internalVisitExpression(variousValuesContext.nullReplacement(index).expression());
Field nullableFieldReference = (Field) internalVisitExpression(variousValuesContext.nullableField(index));
UnresolvedExpression replaceNullWithMe = internalVisitExpression(variousValuesContext.nullableReplacementExpression(index).nullableReplacement);
Field nullableFieldReference = (Field) internalVisitExpression(variousValuesContext.nullableReplacementExpression(index).nullableField);
return new NullableFieldFill(nullableFieldReference, replaceNullWithMe);
})
.collect(Collectors.toList());
Expand Down