Merge branch '2.x'

src/main/java/org/elasticsearch/sql/ElasticSqlExprParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.sql;
+package org.elasticsearch.druid;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.parser.Lexer;

src/main/java/org/elasticsearch/sql/ElasticSqlLexer.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.sql;
+package org.elasticsearch.druid;
 
 import com.alibaba.druid.sql.parser.Keywords;
 import com.alibaba.druid.sql.parser.Lexer;

src/main/java/org/elasticsearch/sql/ElasticSqlSelectParser.java

@@ -1,18 +1,15 @@
-package org.elasticsearch.sql;
+package org.elasticsearch.druid;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLSetQuantifier;
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
-import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
 import com.alibaba.druid.sql.ast.statement.SQLTableSource;
 import com.alibaba.druid.sql.parser.ParserException;
 import com.alibaba.druid.sql.parser.SQLExprParser;
 import com.alibaba.druid.sql.parser.SQLSelectParser;
 import com.alibaba.druid.sql.parser.Token;
 
-import java.util.List;
-
 public class ElasticSqlSelectParser extends SQLSelectParser {
 
     public ElasticSqlSelectParser(SQLExprParser exprParser) {

src/main/java/org/elasticsearch/sql/ElasticSqlSelectQueryBlock.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.sql;
+package org.elasticsearch.druid;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLObject;

src/main/java/org/elasticsearch/dsl/parser/helper/ElasticSqlArgTransferHelper.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.helper;
+package org.elasticsearch.dsl.helper;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.*;

src/main/java/org/elasticsearch/dsl/parser/helper/ElasticSqlDateParseHelper.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.helper;
+package org.elasticsearch.dsl.helper;
 
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;

src/main/java/org/elasticsearch/dsl/parser/helper/ElasticSqlMethodInvokeHelper.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.helper;
+package org.elasticsearch.dsl.helper;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.*;

src/main/java/org/elasticsearch/dsl/parser/listener/ParseActionListener.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.listener;
+package org.elasticsearch.dsl.listener;
 
 import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
 import org.elasticsearch.dsl.enums.SQLConditionOperator;

src/main/java/org/elasticsearch/dsl/parser/listener/ParseActionListenerAdapter.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.listener;
+package org.elasticsearch.dsl.listener;
 
 import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
 import org.elasticsearch.dsl.enums.SQLConditionOperator;

src/main/java/org/elasticsearch/dsl/parser/syntax/ElasticSql2DslParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax;
+package org.elasticsearch.dsl.parser;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
@@ -8,11 +8,11 @@ import com.google.common.collect.ImmutableList;
 import org.elasticsearch.dsl.bean.ElasticDslContext;
 import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.listener.ParseActionListenerAdapter;
-import org.elasticsearch.dsl.parser.syntax.sql.*;
-import org.elasticsearch.sql.ElasticSqlExprParser;
-import org.elasticsearch.sql.ElasticSqlSelectQueryBlock;
+import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.elasticsearch.dsl.listener.ParseActionListenerAdapter;
+import org.elasticsearch.dsl.parser.sql.*;
+import org.elasticsearch.druid.ElasticSqlExprParser;
+import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
 
 import java.lang.reflect.Array;
 import java.util.Collection;
@@ -60,7 +60,7 @@ public class ElasticSql2DslParser {
         }
 
         if (!(sqlQueryExpr instanceof SQLQueryExpr)) {
-            throw new ElasticSql2DslException("[syntax error] Sql is not select sql");
+            throw new ElasticSql2DslException("[syntax error] Sql is not select druid");
         }
 
         if (sqlArgs != null && sqlArgs.length > 0) {

src/main/java/org/elasticsearch/dsl/parser/syntax/query/exact/AbstractAtomExactQueryParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.query.exact;
+package org.elasticsearch.dsl.parser.query.exact;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import org.elasticsearch.dsl.bean.AtomQuery;
@@ -6,8 +6,8 @@ import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
 import org.elasticsearch.dsl.enums.QueryFieldType;
 import org.elasticsearch.dsl.enums.SQLConditionOperator;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.syntax.sql.QueryFieldParser;
+import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.elasticsearch.dsl.parser.sql.QueryFieldParser;
 import org.elasticsearch.index.query.QueryBuilder;
 
 public abstract class AbstractAtomExactQueryParser {

src/main/java/org/elasticsearch/dsl/parser/syntax/query/exact/BetweenAndAtomQueryParser.java

@@ -1,11 +1,11 @@
-package org.elasticsearch.dsl.parser.syntax.query.exact;
+package org.elasticsearch.dsl.parser.query.exact;
 
 import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr;
 import org.elasticsearch.dsl.bean.AtomQuery;
 import org.elasticsearch.dsl.enums.SQLConditionOperator;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
+import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 

src/main/java/org/elasticsearch/dsl/parser/syntax/query/exact/BinaryAtomQueryParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.query.exact;
+package org.elasticsearch.dsl.parser.query.exact;
 
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
 import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
@@ -6,8 +6,8 @@ import com.alibaba.druid.sql.ast.expr.SQLNullExpr;
 import org.elasticsearch.dsl.bean.AtomQuery;
 import org.elasticsearch.dsl.enums.SQLConditionOperator;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
+import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

src/main/java/org/elasticsearch/dsl/parser/syntax/query/exact/IConditionExactQueryBuilder.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.query.exact;
+package org.elasticsearch.dsl.parser.query.exact;
 
 import org.elasticsearch.dsl.enums.SQLConditionOperator;
 import org.elasticsearch.index.query.QueryBuilder;

src/main/java/org/elasticsearch/dsl/parser/syntax/query/exact/InListAtomQueryParser.java

@@ -1,12 +1,12 @@
-package org.elasticsearch.dsl.parser.syntax.query.exact;
+package org.elasticsearch.dsl.parser.query.exact;
 
 import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
 import org.apache.commons.collections.CollectionUtils;
 import org.elasticsearch.dsl.bean.AtomQuery;
 import org.elasticsearch.dsl.enums.SQLConditionOperator;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
+import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 

src/main/java/org/elasticsearch/dsl/parser/syntax/query/method/AbstractAtomMethodQueryParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.query.method;
+package org.elasticsearch.dsl.parser.query.method;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
@@ -7,8 +7,8 @@ import org.elasticsearch.dsl.bean.AtomQuery;
 import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
 import org.elasticsearch.dsl.enums.QueryFieldType;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.syntax.sql.QueryFieldParser;
+import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.elasticsearch.dsl.parser.sql.QueryFieldParser;
 import org.elasticsearch.index.query.QueryBuilder;
 
 import java.util.Map;

src/main/java/org/elasticsearch/dsl/parser/syntax/query/method/IConditionMethodQueryBuilder.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.query.method;
+package org.elasticsearch.dsl.parser.query.method;
 
 import org.elasticsearch.index.query.QueryBuilder;
 

src/main/java/org/elasticsearch/dsl/parser/syntax/query/method/fulltext/FullTextAtomQueryParser.java

@@ -1,10 +1,10 @@
-package org.elasticsearch.dsl.parser.syntax.query.method.fulltext;
+package org.elasticsearch.dsl.parser.query.method.fulltext;
 
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
 import org.elasticsearch.dsl.bean.AtomQuery;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.syntax.query.method.AbstractAtomMethodQueryParser;
+import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.elasticsearch.dsl.parser.query.method.AbstractAtomMethodQueryParser;
 
 public class FullTextAtomQueryParser {
 

src/main/java/org/elasticsearch/dsl/parser/syntax/query/method/fulltext/MatchAtomQueryParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.query.method.fulltext;
+package org.elasticsearch.dsl.parser.query.method.fulltext;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
@@ -7,10 +7,10 @@ import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.dsl.bean.AtomQuery;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.syntax.query.method.AbstractAtomMethodQueryParser;
-import org.elasticsearch.dsl.parser.syntax.query.method.IConditionMethodQueryBuilder;
+import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.elasticsearch.dsl.parser.query.method.AbstractAtomMethodQueryParser;
+import org.elasticsearch.dsl.parser.query.method.IConditionMethodQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

src/main/java/org/elasticsearch/dsl/parser/syntax/query/method/fulltext/MultiMatchAtomQueryParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.query.method.fulltext;
+package org.elasticsearch.dsl.parser.query.method.fulltext;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
@@ -7,9 +7,9 @@ import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.dsl.bean.AtomQuery;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.syntax.query.method.AbstractAtomMethodQueryParser;
+import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.elasticsearch.dsl.parser.query.method.AbstractAtomMethodQueryParser;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.MultiMatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

src/main/java/org/elasticsearch/dsl/parser/syntax/query/method/fulltext/QueryStringAtomQueryParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.query.method.fulltext;
+package org.elasticsearch.dsl.parser.query.method.fulltext;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
@@ -7,9 +7,9 @@ import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.dsl.bean.AtomQuery;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.syntax.query.method.AbstractAtomMethodQueryParser;
+import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.elasticsearch.dsl.parser.query.method.AbstractAtomMethodQueryParser;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.QueryStringQueryBuilder;
 

src/main/java/org/elasticsearch/dsl/parser/syntax/query/method/fulltext/SimpleQueryStringAtomQueryParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.query.method.fulltext;
+package org.elasticsearch.dsl.parser.query.method.fulltext;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
@@ -7,9 +7,9 @@ import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.dsl.bean.AtomQuery;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.syntax.query.method.AbstractAtomMethodQueryParser;
+import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.elasticsearch.dsl.parser.query.method.AbstractAtomMethodQueryParser;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.SimpleQueryStringBuilder;
 import org.elasticsearch.index.query.SimpleQueryStringFlag;

src/main/java/org/elasticsearch/dsl/parser/syntax/query/method/term/PrefixAtomQueryParser.java

@@ -1,9 +1,9 @@
-package org.elasticsearch.dsl.parser.syntax.query.method.term;
+package org.elasticsearch.dsl.parser.query.method.term;
 
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
 import org.elasticsearch.dsl.bean.AtomQuery;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.syntax.query.method.AbstractAtomMethodQueryParser;
+import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.elasticsearch.dsl.parser.query.method.AbstractAtomMethodQueryParser;
 
 public class PrefixAtomQueryParser extends AbstractAtomMethodQueryParser {
 

src/main/java/org/elasticsearch/dsl/parser/syntax/query/method/term/TermLevelAtomMethodQueryParser.java

@@ -1,10 +1,10 @@
-package org.elasticsearch.dsl.parser.syntax.query.method.term;
+package org.elasticsearch.dsl.parser.query.method.term;
 
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
 import org.elasticsearch.dsl.bean.AtomQuery;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.syntax.query.method.AbstractAtomMethodQueryParser;
+import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.elasticsearch.dsl.parser.query.method.AbstractAtomMethodQueryParser;
 
 public class TermLevelAtomMethodQueryParser {
 

src/main/java/org/elasticsearch/dsl/parser/syntax/sql/AbstractQueryConditionParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.sql;
+package org.elasticsearch.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.*;
@@ -10,11 +10,11 @@ import org.elasticsearch.dsl.bean.SQLCondition;
 import org.elasticsearch.dsl.enums.SQLBoolOperator;
 import org.elasticsearch.dsl.enums.SQLConditionType;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
-import org.elasticsearch.dsl.parser.syntax.query.exact.BetweenAndAtomQueryParser;
-import org.elasticsearch.dsl.parser.syntax.query.exact.BinaryAtomQueryParser;
-import org.elasticsearch.dsl.parser.syntax.query.exact.InListAtomQueryParser;
-import org.elasticsearch.dsl.parser.syntax.query.method.fulltext.FullTextAtomQueryParser;
+import org.elasticsearch.dsl.listener.ParseActionListener;
+import org.elasticsearch.dsl.parser.query.exact.InListAtomQueryParser;
+import org.elasticsearch.dsl.parser.query.method.fulltext.FullTextAtomQueryParser;
+import org.elasticsearch.dsl.parser.query.exact.BetweenAndAtomQueryParser;
+import org.elasticsearch.dsl.parser.query.exact.BinaryAtomQueryParser;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

src/main/java/org/elasticsearch/dsl/parser/syntax/sql/QueryFieldParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.sql;
+package org.elasticsearch.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;

src/main/java/org/elasticsearch/dsl/parser/syntax/sql/QueryFromParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.syntax.sql;
+package org.elasticsearch.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
 import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
 import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
 import com.google.common.collect.Lists;
 import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
+import org.elasticsearch.dsl.listener.ParseActionListener;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.sql.ElasticSqlSelectQueryBlock;
+import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
 
 public class QueryFromParser implements QueryParser {
 

src/main/java/org/elasticsearch/dsl/parser/syntax/sql/QueryGroupByParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.sql;
+package org.elasticsearch.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
@@ -10,9 +10,9 @@ import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
 import org.elasticsearch.dsl.bean.RangeSegment;
 import org.elasticsearch.dsl.enums.QueryFieldType;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlMethodInvokeHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
+import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
@@ -21,7 +21,7 @@ import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
 import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.sql.ElasticSqlSelectQueryBlock;
+import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;

src/main/java/org/elasticsearch/dsl/parser/syntax/sql/QueryLimitSizeParser.java

@@ -1,13 +1,13 @@
-package org.elasticsearch.dsl.parser.syntax.sql;
+package org.elasticsearch.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
 import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
 import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
+import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.sql.ElasticSqlSelectQueryBlock;
+import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
 
 public class QueryLimitSizeParser implements QueryParser {
 

src/main/java/org/elasticsearch/dsl/parser/syntax/sql/QueryMatchConditionParser.java

@@ -1,9 +1,9 @@
-package org.elasticsearch.dsl.parser.syntax.sql;
+package org.elasticsearch.dsl.parser.sql;
 
 import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
+import org.elasticsearch.dsl.listener.ParseActionListener;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.sql.ElasticSqlSelectQueryBlock;
+import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
 
 public class QueryMatchConditionParser extends AbstractQueryConditionParser {
 

src/main/java/org/elasticsearch/dsl/parser/syntax/sql/QueryOrderConditionParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.sql;
+package org.elasticsearch.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.SQLOrderBy;
@@ -15,14 +15,14 @@ import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
 import org.elasticsearch.dsl.enums.QueryFieldType;
 import org.elasticsearch.dsl.enums.SortOption;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlMethodInvokeHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
+import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
-import org.elasticsearch.sql.ElasticSqlSelectQueryBlock;
+import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
 
 import java.util.List;
 

src/main/java/org/elasticsearch/dsl/parser/syntax/sql/QueryParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.sql;
+package org.elasticsearch.dsl.parser.sql;
 
 import org.elasticsearch.dsl.bean.ElasticDslContext;
 

src/main/java/org/elasticsearch/dsl/parser/syntax/sql/QueryRoutingValParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.sql;
+package org.elasticsearch.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
@@ -6,10 +6,10 @@ import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlArgTransferHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
+import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.sql.ElasticSqlSelectQueryBlock;
+import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
 
 import java.util.List;
 

src/main/java/org/elasticsearch/dsl/parser/syntax/sql/QuerySelectFieldListParser.java

@@ -1,4 +1,4 @@
-package org.elasticsearch.dsl.parser.syntax.sql;
+package org.elasticsearch.dsl.parser.sql;
 
 import com.alibaba.druid.sql.ast.SQLExpr;
 import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr;
@@ -9,12 +9,12 @@ import org.elasticsearch.dsl.bean.ElasticDslContext;
 import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
 import org.elasticsearch.dsl.enums.QueryFieldType;
 import org.elasticsearch.dsl.exception.ElasticSql2DslException;
-import org.elasticsearch.dsl.parser.helper.ElasticSqlMethodInvokeHelper;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
+import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
+import org.elasticsearch.dsl.listener.ParseActionListener;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.sql.ElasticSqlSelectQueryBlock;
+import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
 
 import java.util.List;
 

src/main/java/org/elasticsearch/dsl/parser/syntax/sql/QueryWhereConditionParser.java

@@ -1,9 +1,9 @@
-package org.elasticsearch.dsl.parser.syntax.sql;
+package org.elasticsearch.dsl.parser.sql;
 
 import org.elasticsearch.dsl.bean.ElasticDslContext;
-import org.elasticsearch.dsl.parser.listener.ParseActionListener;
+import org.elasticsearch.dsl.listener.ParseActionListener;
 import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.sql.ElasticSqlSelectQueryBlock;
+import org.elasticsearch.druid.ElasticSqlSelectQueryBlock;
 
 public class QueryWhereConditionParser extends AbstractQueryConditionParser {
 

src/test/java/org/elasticsearch/SqlParserLimitTest.java

@@ -1,7 +1,7 @@
 package org.elasticsearch;
 
 import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.parser.syntax.ElasticSql2DslParser;
+import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
 import org.junit.Assert;
 import org.junit.Test;
 

src/test/java/org/elasticsearch/SqlParserListenerTest.java

@@ -3,8 +3,8 @@ package org.elasticsearch;
 import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
 import org.elasticsearch.dsl.bean.ElasticSqlQueryField;
 import org.elasticsearch.dsl.enums.SQLConditionOperator;
-import org.elasticsearch.dsl.parser.syntax.ElasticSql2DslParser;
-import org.elasticsearch.dsl.parser.listener.ParseActionListenerAdapter;
+import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
+import org.elasticsearch.dsl.listener.ParseActionListenerAdapter;
 import org.junit.Assert;
 import org.junit.Test;
 

src/test/java/org/elasticsearch/SqlParserOrderByTest.java

@@ -1,7 +1,7 @@
 package org.elasticsearch;
 
 import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.parser.syntax.ElasticSql2DslParser;
+import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
 import org.junit.Test;
 
 
@@ -23,28 +23,28 @@ public class SqlParserOrderByTest {
 //        targetSort = SortBuilders.fieldSort("lastUpdateTime").order(SortOrder.ASC);
 //        Assert.assertEquals(parseResult.getOrderBy().get(2).toString(), targetSort.toString());
 //
-//        sql = "select id,status from index.order order by nvl(price, 0) asc";
+//        druid = "select id,status from index.order order by nvl(price, 0) asc";
 //        sql2DslParser = new ElasticSql2DslParser();
-//        parseResult = sql2DslParser.parse(sql);
+//        parseResult = sql2DslParser.parse(druid);
 //        targetSort = SortBuilders.fieldSort("price").order(SortOrder.ASC).missing(0);
 //        Assert.assertEquals(parseResult.getOrderBy().get(0).toString(), targetSort.toString());
 //
-//        sql = "select id,status from index.order order by nvl(product.price, 0) asc";
+//        druid = "select id,status from index.order order by nvl(product.price, 0) asc";
 //        sql2DslParser = new ElasticSql2DslParser();
-//        parseResult = sql2DslParser.parse(sql);
+//        parseResult = sql2DslParser.parse(druid);
 //        targetSort = SortBuilders.fieldSort("product.price").order(SortOrder.ASC).missing(0);
 //        Assert.assertEquals(parseResult.getOrderBy().get(0).toString(), targetSort.toString());
 //
-//        sql = "select id,status from index.order order by nvl($product.price, 0) asc";
+//        druid = "select id,status from index.order order by nvl($product.price, 0) asc";
 //        sql2DslParser = new ElasticSql2DslParser();
-//        parseResult = sql2DslParser.parse(sql);
+//        parseResult = sql2DslParser.parse(druid);
 //        targetSort = SortBuilders.fieldSort("product.price").order(SortOrder.ASC).missing(0).setNestedPath("product");
 //        Assert.assertEquals(parseResult.getOrderBy().get(0).toString(), targetSort.toString());
 //
 //
-//        sql = "select id,status from index.order order by nvl(product.price, 0) asc";
+//        druid = "select id,status from index.order order by nvl(product.price, 0) asc";
 //        sql2DslParser = new ElasticSql2DslParser();
-//        parseResult = sql2DslParser.parse(sql);
+//        parseResult = sql2DslParser.parse(druid);
 //        targetSort = SortBuilders.fieldSort("product.price").order(SortOrder.ASC).missing(0);
 //        Assert.assertEquals(parseResult.getOrderBy().get(0).toString(), targetSort.toString());
 //
@@ -63,7 +63,7 @@ public class SqlParserOrderByTest {
     @Test
     public void testX() {
 
-        //String sql = "select * from index.order where status='SUCCESS' match_query id=123 limit 0,100";
+        //String druid = "select * from index.order where status='SUCCESS' match_query id=123 limit 0,100";
 
         String sql = "select * from index.order query id=123 where status='SUCCESS' limit 0,100";
 

src/test/java/org/elasticsearch/SqlParserQueryTest.java

@@ -1,7 +1,7 @@
 package org.elasticsearch;
 
 import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.parser.syntax.ElasticSql2DslParser;
+import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
 import org.junit.Test;
 
 

src/test/java/org/elasticsearch/SqlParserRoutingTest.java

@@ -1,6 +1,6 @@
 package org.elasticsearch;
 
-import org.elasticsearch.dsl.parser.syntax.ElasticSql2DslParser;
+import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
 import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
 import org.junit.Assert;
 import org.junit.Test;

src/test/java/org/elasticsearch/SqlParserSelectFieldTest.java

@@ -1,7 +1,7 @@
 package org.elasticsearch;
 
 import org.apache.commons.collections.CollectionUtils;
-import org.elasticsearch.dsl.parser.syntax.ElasticSql2DslParser;
+import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
 import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
 import org.junit.Assert;
 import org.junit.Test;

src/test/java/org/elasticsearch/SqlParserWhereConditionTest.java

@@ -3,7 +3,7 @@ package org.elasticsearch;
 import org.elasticsearch.action.search.SearchAction;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.dsl.bean.ElasticSqlParseResult;
-import org.elasticsearch.dsl.parser.syntax.ElasticSql2DslParser;
+import org.elasticsearch.dsl.parser.ElasticSql2DslParser;
 import org.elasticsearch.index.query.NestedQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;