This is an automated email from the ASF dual-hosted git repository.
jihoonson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 43ea184 Add explicit EOF and use assert instead of exception (#11041)
43ea184 is described below
commit 43ea184b748e0e7ba90411a0b323212e60a29cf7
Author: Jihoon Son <[email protected]>
AuthorDate: Wed Mar 31 09:41:57 2021 -0700
Add explicit EOF and use assert instead of exception (#11041)
---
core/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4 | 2 ++
.../org/apache/druid/sql/calcite/filtration/BottomUpTransform.java | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/core/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4
b/core/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4
index 9b9eda9..1665302 100644
--- a/core/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4
+++ b/core/src/main/antlr4/org/apache/druid/math/expr/antlr/Expr.g4
@@ -15,6 +15,8 @@
grammar Expr;
+start : expr EOF;
+
expr : NULL # null
| ('-'|'!') expr #
unaryOpExpr
|<assoc=right> expr '^' expr # powOpExpr
diff --git
a/sql/src/main/java/org/apache/druid/sql/calcite/filtration/BottomUpTransform.java
b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/BottomUpTransform.java
index 9aacde4..f594878 100644
---
a/sql/src/main/java/org/apache/druid/sql/calcite/filtration/BottomUpTransform.java
+++
b/sql/src/main/java/org/apache/druid/sql/calcite/filtration/BottomUpTransform.java
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
