Skip to content

Add explicit EOF for expression parser and use assert instead of exception in sql planner #11041

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
jihoonson merged 1 commit into from
Mar 31, 2021
Merged

Add explicit EOF for expression parser and use assert instead of exception in sql planner #11041

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
2 changes: 2 additions & 0 deletions core/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

grammar Expr;

start : expr EOF;

expr : NULL # null
| ('-'|'!') expr # unaryOpExpr
|<assoc=right> expr '^' expr # powOpExpr
Expand Down
3 changes: 2 additions & 1 deletion sql/src/main/java/org/apache/druid/sql/calcite/filtration/BottomUpTransform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ public abstract class BottomUpTransform implements Function<Filtration, Filtrati
private DimFilter checkedProcess(final DimFilter filter)
{
final DimFilter retVal = process(Preconditions.checkNotNull(filter, "filter"));
return Preconditions.checkNotNull(retVal, "process(filter) result in %s", getClass().getSimpleName());
assert retVal != null;
return retVal;
}

@Override
Expand Down