Merge branch '2.x'

README.md

@@ -71,12 +71,12 @@ SearchResponse response = searchReq.execute().actionGet();
 ## 二、集成MyBatis、Spring
 首先在Spring配置文件中增加如下代码
 1. 指定driverClassName：org.elasticsearch.jdbc.api.ElasticDriver
-2. 指定连接ES的连接串：jdbc:elastic:172.19.22.34:9300/product_cluster
+2. 指定连接ES的连接串：jdbc:elastic:192.168.0.109:9300/product_cluster
 3. 创建一个SqlMapClient对象，并指定sqlMapConfig.xml路径
 ```bash
 <bean id="elasticDataSource" class="org.elasticsearch.jdbc.api.ElasticSingleConnectionDataSource" destroy-method="destroy">
     <property name="driverClassName" value="org.elasticsearch.jdbc.api.ElasticDriver" />
-    <property name="url" value="jdbc:elastic:172.19.22.34:9300/product_cluster" />
+    <property name="url" value="jdbc:elastic:192.168.0.109:9300/product_cluster" />
 </bean>
 
 <bean id="sqlMapClient" class="org.springframework.orm.ibatis.SqlMapClientFactoryBean">

create_index.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-curl -XDELETE 'http://172.19.22.34:9200/index/'
+curl -XDELETE 'http://192.168.0.109:9200/index/'
 
-curl -XPUT 'http://172.19.22.34:9200/index/' -d '{
+curl -XPUT 'http://192.168.0.109:9200/index/' -d '{
 	"settings": {
 		"index": {
 			"number_of_shards": 1,
@@ -55,7 +55,7 @@ curl -XPUT 'http://172.19.22.34:9200/index/' -d '{
 }'
 
 
-curl -XPUT 'http://172.19.22.34:9200/index/product/1' -d '{
+curl -XPUT 'http://192.168.0.109:9200/index/product/1' -d '{
 	"productName" : "iphone 6s",
 	"productCode" : "IP_6S",
 	"minPrice" : 2288.00,
@@ -78,7 +78,7 @@ curl -XPUT 'http://172.19.22.34:9200/index/product/1' -d '{
 	}]
 }'
 
-curl -XPUT 'http://172.19.22.34:9200/index/product/2' -d '{
+curl -XPUT 'http://192.168.0.109:9200/index/product/2' -d '{
 	"productName" : "apple watch os2",
 	"productCode" : "AW_OS2",
 	"minPrice" : 1000.00,
@@ -101,4 +101,4 @@ curl -XPUT 'http://172.19.22.34:9200/index/product/2' -d '{
 	}]
 }'
 
-curl -XPOST 'http://172.19.22.34:9200/index/_refresh'
+curl -XPOST 'http://192.168.0.109:9200/index/_refresh'

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

@@ -29,6 +29,10 @@ public abstract class AbstractAtomMethodQueryParser {
 
     protected abstract AtomQuery parseMethodQueryExpr(SQLMethodInvokeExpr matchQueryExpr, String queryAs, Object[] sqlArgs);
 
+    protected interface IConditionMethodQueryBuilder {
+        QueryBuilder buildQuery(String queryFieldName, Object[] parameters);
+    }
+
 
     public final AtomQuery parseAtomMethodQuery(SQLMethodInvokeExpr methodQueryExpr, String queryAs, Object[] sqlArgs) {
         checkQueryMethod(methodQueryExpr, queryAs, sqlArgs);

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/AbstractFieldSpecifiedMethodQueryParser.java

@@ -0,0 +1,104 @@
+//package org.elasticsearch.dsl.parser.query.method;
+//
+//import com.alibaba.druid.sql.ast.SQLExpr;
+//import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
+//import com.google.common.collect.Maps;
+//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.listener.ParseActionListener;
+//import org.elasticsearch.dsl.parser.sql.QueryFieldParser;
+//import org.elasticsearch.index.query.QueryBuilder;
+//
+//import java.util.Map;
+//
+//public abstract class AbstractFieldSpecifiedMethodQueryParser extends CheckableMethodQueryParser {
+//
+//    protected static final String COMMA = ",";
+//
+//    protected static final String COLON = ":";
+//
+//    protected ParseActionListener parseActionListener;
+//
+//    public AbstractFieldSpecifiedMethodQueryParser(ParseActionListener parseActionListener) {
+//        this.parseActionListener = parseActionListener;
+//    }
+//
+//    protected abstract void checkQueryMethod(SQLMethodInvokeExpr matchQueryExpr, String queryAs, Object[] sqlArgs);
+//
+//    protected abstract AtomQuery parseMethodQueryExpr(SQLMethodInvokeExpr matchQueryExpr, String queryAs, Object[] sqlArgs);
+//
+//    protected interface IConditionMethodQueryBuilder {
+//        QueryBuilder buildQuery(String queryFieldName, Object[] parameters);
+//    }
+//
+//
+//    public final AtomQuery parseAtomMethodQuery(SQLMethodInvokeExpr methodQueryExpr, String queryAs, Object[] sqlArgs) {
+//        checkQueryMethod(methodQueryExpr, queryAs, sqlArgs);
+//
+//        return parseMethodQueryExpr(methodQueryExpr, queryAs, sqlArgs);
+//    }
+//
+//    protected AtomQuery parseCondition(SQLExpr queryFieldExpr, Object[] parameters, String queryAs, IConditionMethodQueryBuilder queryBuilder) {
+//        QueryFieldParser queryFieldParser = new QueryFieldParser();
+//        ElasticSqlQueryField queryField = queryFieldParser.parseConditionQueryField(queryFieldExpr, queryAs);
+//
+//        AtomQuery atomQuery = null;
+//        if (queryField.getQueryFieldType() == QueryFieldType.RootDocField || queryField.getQueryFieldType() == QueryFieldType.InnerDocField) {
+//            QueryBuilder originalQuery = queryBuilder.buildQuery(queryField.getQueryFieldFullName(), parameters);
+//            atomQuery = new AtomQuery(originalQuery);
+//        }
+//
+//        if (queryField.getQueryFieldType() == QueryFieldType.NestedDocField) {
+//            QueryBuilder originalQuery = queryBuilder.buildQuery(queryField.getQueryFieldFullName(), parameters);
+//            atomQuery = new AtomQuery(originalQuery, queryField.getNestedDocContextPath());
+//        }
+//
+//        if (atomQuery == null) {
+//            throw new ElasticSql2DslException(String.format("[syntax error] query condition field can not support type[%s]", queryField.getQueryFieldType()));
+//        }
+//
+//        onAtomMethodQueryConditionParse(queryField, parameters);
+//
+//        return atomQuery;
+//    }
+//
+//    private void onAtomMethodQueryConditionParse(ElasticSqlQueryField paramName, Object[] parameters) {
+//        try {
+//            parseActionListener.onAtomMethodQueryConditionParse(paramName, parameters);
+//        }
+//        catch (Exception ex) {
+//            try {
+//                parseActionListener.onFailure(ex);
+//            }
+//            catch (Exception exp) {
+//                //ignore;
+//            }
+//        }
+//    }
+//
+//    protected Map<String, String> buildExtraMethodQueryParamsMap(String strMatchQueryParams) {
+//        Map<String, String> extraParamMap = Maps.newHashMap();
+//        for (String paramPair : strMatchQueryParams.split(COMMA)) {
+//            String[] paramPairArr = paramPair.split(COLON);
+//            if (paramPairArr.length == 2) {
+//                extraParamMap.put(paramPairArr[0].trim(), paramPairArr[1].trim());
+//            }
+//            else {
+//                throw new ElasticSql2DslException("Failed to parse query method params!");
+//            }
+//        }
+//        return extraParamMap;
+//    }
+//
+//    protected Boolean isExtraParamsString(String extraParams) {
+//        for (String paramPair : extraParams.split(COMMA)) {
+//            String[] paramPairArr = paramPair.split(COLON);
+//            if (paramPairArr.length != 2) {
+//                return Boolean.FALSE;
+//            }
+//        }
+//        return Boolean.TRUE;
+//    }
+//}

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/CheckableMethodQueryParser.java

@@ -0,0 +1,18 @@
+package org.elasticsearch.dsl.parser.query.method;
+
+import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
+import org.elasticsearch.dsl.bean.AtomQuery;
+import org.elasticsearch.dsl.exception.ElasticSql2DslException;
+
+public abstract class CheckableMethodQueryParser implements MethodQueryParser {
+
+    abstract void checkQueryMethod(SQLMethodInvokeExpr matchQueryExpr, String queryAs, Object[] sqlArgs);
+
+    abstract AtomQuery parseMethodQueryExpr(SQLMethodInvokeExpr matchQueryExpr, String queryAs, Object[] sqlArgs);
+
+    @Override
+    public AtomQuery parseAtomMethodQuery(SQLMethodInvokeExpr methodExpr, String queryAs, Object[] sqlArgs) throws ElasticSql2DslException {
+        checkQueryMethod(methodExpr, queryAs, sqlArgs);
+        return parseMethodQueryExpr(methodExpr, queryAs, sqlArgs);
+    }
+}

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

@@ -1,8 +0,0 @@
-package org.elasticsearch.dsl.parser.query.method;
-
-import org.elasticsearch.index.query.QueryBuilder;
-
-@FunctionalInterface
-public interface IConditionMethodQueryBuilder {
-    QueryBuilder buildQuery(String queryFieldName, Object[] parameters);
-}

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/MethodQueryParser.java

@@ -0,0 +1,12 @@
+package org.elasticsearch.dsl.parser.query.method;
+
+import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
+import org.elasticsearch.dsl.bean.AtomQuery;
+import org.elasticsearch.dsl.exception.ElasticSql2DslException;
+
+public interface MethodQueryParser {
+
+    boolean isMethodOf(SQLMethodInvokeExpr methodExpr);
+
+    AtomQuery parseAtomMethodQuery(SQLMethodInvokeExpr methodExpr, String queryAs, Object[] sqlArgs) throws ElasticSql2DslException;
+}

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

@@ -12,7 +12,6 @@ import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
 import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
 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;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/FuzzyAtomQueryParser.java

@@ -12,7 +12,6 @@ import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
 import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
 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.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

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

@@ -11,7 +11,6 @@ import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
 import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
 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.PrefixQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/RegexpAtomQueryParser.java

@@ -12,7 +12,6 @@ import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
 import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
 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.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.RegexpFlag;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/TermAtomQueryParser.java

@@ -11,7 +11,6 @@ import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
 import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
 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.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.TermQueryBuilder;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/TermsAtomQueryParser.java

@@ -12,7 +12,6 @@ import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
 import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
 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.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.TermsQueryBuilder;

elasticsearch-query-core/src/main/java/org/elasticsearch/dsl/parser/query/method/term/WildcardAtomQueryParser.java

@@ -11,7 +11,6 @@ import org.elasticsearch.dsl.helper.ElasticSqlArgTransferHelper;
 import org.elasticsearch.dsl.helper.ElasticSqlMethodInvokeHelper;
 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.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.WildcardQueryBuilder;

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserLimitTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.elasticsearch.query.SqlParserLimitTest
+-------------------------------------------------------------------------------
+Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.459 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserListenerTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.elasticsearch.query.SqlParserListenerTest
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserOrderByTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.elasticsearch.query.SqlParserOrderByTest
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.034 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserQueryTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.elasticsearch.query.SqlParserQueryTest
+-------------------------------------------------------------------------------
+Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.127 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserRoutingTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.elasticsearch.query.SqlParserRoutingTest
+-------------------------------------------------------------------------------
+Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserSelectFieldTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.elasticsearch.query.SqlParserSelectFieldTest
+-------------------------------------------------------------------------------
+Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.028 sec

elasticsearch-query-core/target/surefire-reports/org.elasticsearch.query.SqlParserWhereConditionTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.elasticsearch.query.SqlParserWhereConditionTest
+-------------------------------------------------------------------------------
+Tests run: 7, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.059 sec

elasticsearch-query-jdbc/src/test/java/org/elasticsearch/jdbc/BaseJdbcTest.java

@@ -2,5 +2,5 @@ package org.elasticsearch.jdbc;
 
 public class BaseJdbcTest {
     protected static final String driver = "org.elasticsearch.jdbc.api.ElasticDriver";
-    protected static final String url = "jdbc:elastic:172.19.22.34:9300/lu-search-cluster";
+    protected static final String url = "jdbc:elastic:192.168.0.109:9300/lu-search-cluster";
 }

elasticsearch-query-jdbc/target/surefire-reports/org.elasticsearch.jdbc.ElasticDriverTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.elasticsearch.jdbc.ElasticDriverTest
+-------------------------------------------------------------------------------
+Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.132 sec

elasticsearch-query-jdbc/target/surefire-reports/org.elasticsearch.jdbc.GroupByTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.elasticsearch.jdbc.GroupByTest
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.071 sec

elasticsearch-query-jdbc/target/surefire-reports/org.elasticsearch.jdbc.MethodQueryTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.elasticsearch.jdbc.MethodQueryTest
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.087 sec

elasticsearch-query-jdbc/target/surefire-reports/org.elasticsearch.jdbc.ScriptQueryTest.txt

@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: org.elasticsearch.jdbc.ScriptQueryTest
+-------------------------------------------------------------------------------
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.039 sec