es 5.5.0 support

Author: shi-yuan

.travis.yml

@@ -17,7 +17,7 @@ before_install:
   # update to java 8
   - sudo update-java-alternatives -s java-8-oracle
   - export JAVA_HOME=/usr/lib/jvm/java-8-oracle
-  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.4.3.deb && sudo dpkg -i --force-confnew elasticsearch-5.4.3.deb
+  - wget https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.5.0.deb && sudo dpkg -i --force-confnew elasticsearch-5.5.0.deb
   - sudo cp ./src/test/resources/elasticsearch.yml /etc/elasticsearch/elasticsearch.yml
   - sudo cat /etc/elasticsearch/elasticsearch.yml
   - sudo java -version

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>5.4.3.0</version>
+	<version>5.5.0.0</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>
@@ -47,7 +47,7 @@
 		<elasticsearch.plugin.name>sql</elasticsearch.plugin.name>
 		<elasticsearch.plugin.site>true</elasticsearch.plugin.site>
 		<elasticsearch.plugin.jvm>true</elasticsearch.plugin.jvm>
-		<elasticsearch.version>5.4.3</elasticsearch.version>
+		<elasticsearch.version>5.5.0</elasticsearch.version>
 		<elasticsearch.plugin.classname>org.elasticsearch.plugin.nlpcn.SqlPlug</elasticsearch.plugin.classname>
 	</properties>
 

src/main/java/org/elasticsearch/plugin/nlpcn/executors/ElasticDefaultRestExecutor.java

@@ -6,7 +6,7 @@
 import org.elasticsearch.action.search.SearchRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.action.bulk.byscroll.DeleteByQueryRequest;
+import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.plugin.nlpcn.*;
 import org.elasticsearch.rest.BytesRestResponse;
 import org.elasticsearch.rest.RestChannel;

src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java

@@ -9,6 +9,7 @@
 import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.join.aggregations.JoinAggregationBuilders;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
@@ -238,7 +239,7 @@ private AggregationBuilder createChildrenAggregation(Field field) {
 
         String childType = field.getChildType();
 
-        childrenBuilder = AggregationBuilders.children(getChildrenAggName(field),childType);
+        childrenBuilder = JoinAggregationBuilders.children(getChildrenAggName(field),childType);
 
         return childrenBuilder;
     }

src/main/java/org/nlpcn/es4sql/query/DeleteQueryAction.java

@@ -6,7 +6,7 @@
 
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.reindex.DeleteByQueryAction;
-import org.elasticsearch.action.bulk.byscroll.DeleteByQueryRequest;
+import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder;
 import org.nlpcn.es4sql.domain.Delete;
 import org.nlpcn.es4sql.domain.Where;

src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java

@@ -3,6 +3,7 @@
 import java.math.BigDecimal;
 import java.util.*;
 
+import org.elasticsearch.join.aggregations.JoinAggregationBuilders;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.script.ScriptType;
@@ -194,7 +195,7 @@ private AggregationBuilder addFieldToAgg(MethodField field, ValuesSourceAggregat
 
             String childrenAggName = childrenType.field + "@CHILDREN";
 
-            childrenBuilder = AggregationBuilders.children(childrenAggName,childrenType.childType);
+            childrenBuilder = JoinAggregationBuilders.children(childrenAggName,childrenType.childType);
 
             return childrenBuilder;
         }

src/main/java/org/nlpcn/es4sql/query/maker/Maker.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.index.query.*;
+import org.elasticsearch.join.query.JoinQueryBuilders;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptService;
 import org.nlpcn.es4sql.Util;
@@ -265,7 +266,7 @@ private ToXContent make(Condition cond, String name, Object value) throws SqlPar
             Where whereChildren = (Where) value;
             BoolQueryBuilder childrenFilter = QueryMaker.explan(whereChildren);
             //todo: pass score mode
-            x = QueryBuilders.hasChildQuery(name, childrenFilter,ScoreMode.None);
+            x = JoinQueryBuilders.hasChildQuery(name, childrenFilter,ScoreMode.None);
 
         break;
         case SCRIPT:

src/main/java/org/nlpcn/es4sql/query/maker/QueryMaker.java

@@ -5,6 +5,7 @@
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.join.query.JoinQueryBuilders;
 import org.nlpcn.es4sql.domain.Condition;
 import org.nlpcn.es4sql.domain.Where;
 import org.nlpcn.es4sql.domain.Where.CONN;
@@ -65,7 +66,7 @@ private void addSubQuery(BoolQueryBuilder boolQuery, Where where, QueryBuilder s
             if(condition.isNested()){
                 subQuery = QueryBuilders.nestedQuery(condition.getNestedPath(), subQuery, ScoreMode.None);
             } else if(condition.isChildren()) {
-            	subQuery = QueryBuilders.hasChildQuery(condition.getChildType(), subQuery, ScoreMode.None);
+            	subQuery = JoinQueryBuilders.hasChildQuery(condition.getChildType(), subQuery, ScoreMode.None);
             }
         }
 

src/test/java/org/nlpcn/es4sql/AggregationTest.java

@@ -394,7 +394,7 @@ public void topHitTest() throws IOException, SqlParseException, SQLFeatureNotSup
     @Test
     public void topHitTest_WithInclude() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
         Aggregations result = query(String.format("select topHits('size'=3,age='desc',include=age) from %s/account group by gender ", TEST_INDEX));
-        List<Terms.Bucket> buckets = ((Terms) (result.asList().get(0))).getBuckets();
+        List<? extends Terms.Bucket> buckets = ((Terms) (result.asList().get(0))).getBuckets();
         for (Terms.Bucket bucket : buckets){
             SearchHits hits = ((InternalTopHits) bucket.getAggregations().asList().get(0)).getHits();
             for(SearchHit hit: hits ){
@@ -408,7 +408,7 @@ public void topHitTest_WithInclude() throws IOException, SqlParseException, SQLF
     @Test
     public void topHitTest_WithIncludeTwoFields() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
         Aggregations result = query(String.format("select topHits('size'=3,'include'='age,firstname',age='desc') from %s/account group by gender ", TEST_INDEX));
-        List<Terms.Bucket> buckets = ((Terms) (result.asList().get(0))).getBuckets();
+        List<? extends Terms.Bucket> buckets = ((Terms) (result.asList().get(0))).getBuckets();
         for (Terms.Bucket bucket : buckets){
             SearchHits hits = ((InternalTopHits) bucket.getAggregations().asList().get(0)).getHits();
             for(SearchHit hit: hits ){
@@ -423,7 +423,7 @@ public void topHitTest_WithIncludeTwoFields() throws IOException, SqlParseExcept
     @Test
     public void topHitTest_WithExclude() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
         Aggregations result = query(String.format("select topHits('size'=3,'exclude'='lastname',age='desc') from %s/account group by gender ", TEST_INDEX));
-        List<Terms.Bucket> buckets = ((Terms) (result.asList().get(0))).getBuckets();
+        List<? extends Terms.Bucket> buckets = ((Terms) (result.asList().get(0))).getBuckets();
         for (Terms.Bucket bucket : buckets){
             SearchHits hits = ((InternalTopHits) bucket.getAggregations().asList().get(0)).getHits();
             for(SearchHit hit: hits ){
@@ -436,7 +436,7 @@ public void topHitTest_WithExclude() throws IOException, SqlParseException, SQLF
     @Test
     public void topHitTest_WithIncludeAndExclude() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
         Aggregations result = query(String.format("select topHits('size'=3,'exclude'='lastname','include'='firstname,lastname',age='desc') from %s/account group by gender ", TEST_INDEX));
-        List<Terms.Bucket> buckets = ((Terms) (result.asList().get(0))).getBuckets();
+        List<? extends Terms.Bucket> buckets = ((Terms) (result.asList().get(0))).getBuckets();
         for (Terms.Bucket bucket : buckets) {
             SearchHits hits = ((InternalTopHits) bucket.getAggregations().asList().get(0)).getHits();
             for (SearchHit hit : hits) {

src/test/java/org/nlpcn/es4sql/MainTestSuite.java

@@ -14,6 +14,7 @@
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.elasticsearch.common.xcontent.XContentFactory;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.reindex.DeleteByQueryAction;
 import org.elasticsearch.index.reindex.DeleteByQueryRequestBuilder;
@@ -130,7 +131,7 @@ private static void prepareGameOfThronesIndex() {
                 "}\n" +
                 "}"+
                 "} } }";
-        client.admin().indices().preparePutMapping(TEST_INDEX).setType("gotCharacters").setSource(dataMapping).execute().actionGet();
+        client.admin().indices().preparePutMapping(TEST_INDEX).setType("gotCharacters").setSource(dataMapping, XContentFactory.xContentType(dataMapping)).execute().actionGet();
     }
 
     private static void prepareDogsIndex() {
@@ -143,7 +144,7 @@ private static void prepareDogsIndex() {
                 "       }"+
                 "   }" +
                 "}";
-        client.admin().indices().preparePutMapping(TEST_INDEX).setType("dog").setSource(dataMapping).execute().actionGet();
+        client.admin().indices().preparePutMapping(TEST_INDEX).setType("dog").setSource(dataMapping, XContentFactory.xContentType(dataMapping)).execute().actionGet();
     }
 
     private static void prepareAccountsIndex() {
@@ -164,7 +165,7 @@ private static void prepareAccountsIndex() {
                 "       }"+
                 "   }" +
                 "}";
-        client.admin().indices().preparePutMapping(TEST_INDEX).setType("account").setSource(dataMapping).execute().actionGet();
+        client.admin().indices().preparePutMapping(TEST_INDEX).setType("account").setSource(dataMapping, XContentFactory.xContentType(dataMapping)).execute().actionGet();
     }
 
 
@@ -181,7 +182,7 @@ private static void preparePhrasesIndex() {
                 "       }"+
                 "   }" +
                 "}";
-        client.admin().indices().preparePutMapping(TEST_INDEX).setType("phrase").setSource(dataMapping).execute().actionGet();
+        client.admin().indices().preparePutMapping(TEST_INDEX).setType("phrase").setSource(dataMapping, XContentFactory.xContentType(dataMapping)).execute().actionGet();
     }
 
     private static void prepareNestedTypeIndex() {
@@ -227,7 +228,7 @@ private static void prepareNestedTypeIndex() {
                     "      }\n" +
                     "    }}";
 
-            client.admin().indices().preparePutMapping(TEST_INDEX).setType("nestedType").setSource(dataMapping).execute().actionGet();
+            client.admin().indices().preparePutMapping(TEST_INDEX).setType("nestedType").setSource(dataMapping, XContentFactory.xContentType(dataMapping)).execute().actionGet();
     }
 
     private static void prepareChildrenTypeIndex() {
@@ -256,7 +257,7 @@ private static void prepareChildrenTypeIndex() {
 				"	}"+
 				"}\n";
 
-        client.admin().indices().preparePutMapping(TEST_INDEX).setType("childrenType").setSource(dataMapping).execute().actionGet();
+        client.admin().indices().preparePutMapping(TEST_INDEX).setType("childrenType").setSource(dataMapping, XContentFactory.xContentType(dataMapping)).execute().actionGet();
     }
 
     private static void prepareParentTypeIndex() {
@@ -272,7 +273,7 @@ private static void prepareParentTypeIndex() {
 				"	}\n" +
 				"}\n";
 
-        client.admin().indices().preparePutMapping(TEST_INDEX).setType("parentType").setSource(dataMapping).execute().actionGet();
+        client.admin().indices().preparePutMapping(TEST_INDEX).setType("parentType").setSource(dataMapping, XContentFactory.xContentType(dataMapping)).execute().actionGet();
     }
 
     @AfterClass
@@ -346,7 +347,7 @@ public static void prepareSpatialIndex(String type){
                 "\t}\n" +
                 "}";
 
-        client.admin().indices().preparePutMapping(TEST_INDEX).setType(type).setSource(dataMapping).execute().actionGet();
+        client.admin().indices().preparePutMapping(TEST_INDEX).setType(type).setSource(dataMapping, XContentFactory.xContentType(dataMapping)).execute().actionGet();
     }
     public static void prepareOdbcIndex(){
         String dataMapping = "{\n" +
@@ -363,7 +364,7 @@ public static void prepareOdbcIndex(){
                 "\t}\n" +
                 "}";
 
-        client.admin().indices().preparePutMapping(TEST_INDEX).setType("odbc").setSource(dataMapping).execute().actionGet();
+        client.admin().indices().preparePutMapping(TEST_INDEX).setType("odbc").setSource(dataMapping, XContentFactory.xContentType(dataMapping)).execute().actionGet();
     }
 
 	public static SearchDao getSearchDao() {