honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SQL: Improve generics usage inside Parser (elastic/x-pack-elasticsearch#3417) 

Original commit: elastic/x-pack-elasticsearch@814e476b6f
This commit is contained in:
Costin Leau 2017-12-23 22:47:51 +02:00 committed by GitHub
parent 5a25213db9
commit 3e7eca6f2e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/server/src/main/java/org/elasticsearch/xpack/sql/parser/SqlParser.java
View File

@ -23,6 +23,7 @@ import org.joda.time.DateTimeZone;
import java.util.Arrays;
import java.util.List;
import java.util.function.BiFunction;
import java.util.function.Function;
public class SqlParser {
@ -42,7 +43,7 @@ public class SqlParser {
if (log.isDebugEnabled()) {
log.debug("Parsing as statement: {}", sql);
}
return invokeParser("statement", sql, SqlBaseParser::singleStatement);
return invokeParser("statement", sql, SqlBaseParser::singleStatement, AstBuilder::plan);
}
public Expression createExpression(String expression) {
@ -50,11 +51,10 @@ public class SqlParser {
log.debug("Parsing as expression: {}", expression);
}
return invokeParser("expression", expression, SqlBaseParser::singleExpression);
return invokeParser("expression", expression, SqlBaseParser::singleExpression, AstBuilder::expression);
}
@SuppressWarnings("unchecked")
private <T> T invokeParser(String name, String sql, Function<SqlBaseParser, ParserRuleContext> parseFunction) {
private <T> T invokeParser(String name, String sql, Function<SqlBaseParser, ParserRuleContext> parseFunction, BiFunction<AstBuilder, ParserRuleContext, T> visitor) {
try {
SqlBaseLexer lexer = new SqlBaseLexer(new CaseInsensitiveStream(sql));
@ -85,7 +85,7 @@ public class SqlParser {
postProcess(lexer, parser, tree);
return (T) new AstBuilder(timeZone).visit(tree);
return visitor.apply(new AstBuilder(timeZone), tree);
}
catch (StackOverflowError e) {