spuerx 9 лет назад
Родитель
Сommit
57797f3400

+ 1 - 1
src/main/java/org/elasticsearch/dsl/ElasticSqlParseResult.java

@@ -167,6 +167,6 @@ public class ElasticSqlParseResult {
     @Override
     public String toString() {
         String ptn = "index:%s,type:%s,query_as:%s,from:%s,size:%s,routing:%s,dsl:%s";
-        return String.format(ptn, index, type, queryAs, from, size, routingBy.toString(), toDsl());
+        return String.format(ptn, index, type, queryAs, from, size, routingBy != null ? routingBy.toString() : "[]", toDsl());
     }
 }

+ 4 - 1
src/main/java/org/elasticsearch/sql/ElasticSqlExprParser.java

@@ -1,7 +1,10 @@
 package org.elasticsearch.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.parser.*;
+import com.alibaba.druid.sql.parser.Lexer;
+import com.alibaba.druid.sql.parser.SQLExprParser;
+import com.alibaba.druid.sql.parser.SQLSelectParser;
+import com.alibaba.druid.sql.parser.Token;
 import com.google.common.collect.Lists;
 
 import java.util.List;

+ 0 - 1
src/main/java/org/elasticsearch/sql/ElasticSqlSelectParser.java

@@ -2,7 +2,6 @@ package org.elasticsearch.sql;
 
 import com.alibaba.druid.sql.ast.SQLSetQuantifier;
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
-import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
 import com.alibaba.druid.sql.ast.statement.SQLTableSource;
 import com.alibaba.druid.sql.parser.ParserException;