#531 add include and exclude

Author: shi-yuan

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.nlpcn</groupId>
 	<artifactId>elasticsearch-sql</artifactId>
-	<version>6.2.3.2</version>
+	<version>6.2.3.3</version>
 	<packaging>jar</packaging>
 	<description>Query elasticsearch using SQL</description>
 	<name>elasticsearch-sql</name>

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

@@ -1,9 +1,13 @@
 package org.nlpcn.es4sql.query.maker;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.ZoneOffset;
 import java.util.*;
 
+import org.elasticsearch.common.xcontent.NamedXContentRegistry;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.common.xcontent.json.JsonXContent;
 import org.elasticsearch.join.aggregations.JoinAggregationBuilders;
 import org.elasticsearch.script.Script;
 import org.elasticsearch.script.ScriptType;
@@ -17,6 +21,7 @@
 import org.elasticsearch.search.aggregations.bucket.nested.ReverseNestedAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.range.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.IncludeExclude;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.aggregations.metrics.geobounds.GeoBoundsAggregationBuilder;
 import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
@@ -253,6 +258,7 @@ private AggregationBuilder termsAgg(MethodField field) throws SqlParseException
         String aggName = gettAggNameFromParamsOrAlias(field);
         TermsAggregationBuilder terms = AggregationBuilders.terms(aggName);
         String value = null;
+        IncludeExclude include = null, exclude = null;
         for (KVValue kv : field.getParams()) {
             value = kv.value.toString();
             switch (kv.key.toLowerCase()) {
@@ -288,10 +294,27 @@ private AggregationBuilder termsAgg(MethodField field) throws SqlParseException
                 case "execution_hint":
                     terms.executionHint(value);
                     break;
+                case "include":
+                    try (XContentParser parser = JsonXContent.jsonXContent.createParser(NamedXContentRegistry.EMPTY, value)) {
+                        parser.nextToken();
+                        include = IncludeExclude.parseInclude(parser);
+                    } catch (IOException e) {
+                        throw new SqlParseException("parse include[" + value + "] error: " + e.getMessage());
+                    }
+                    break;
+                case "exclude":
+                    try (XContentParser parser = JsonXContent.jsonXContent.createParser(NamedXContentRegistry.EMPTY, value)) {
+                        parser.nextToken();
+                        exclude = IncludeExclude.parseExclude(parser);
+                    } catch (IOException e) {
+                        throw new SqlParseException("parse exclude[" + value + "] error: " + e.getMessage());
+                    }
+                    break;
                 default:
                     throw new SqlParseException("terms aggregation err or not define field " + kv.toString());
             }
         }
+        terms.includeExclude(IncludeExclude.merge(include, exclude));
         return terms;
     }
 

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

@@ -84,6 +84,13 @@ public void multiMatchQuery() throws IOException, SqlParseException, SQLFeatureN
         assertThat(result.replaceAll("\\s+", ""), equalTo(expectedOutput.replaceAll("\\s+", "")));
     }
 
+    @Test
+    public void termsIncludeExcludeExplainTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
+        System.out.println(explain("SELECT * FROM index GROUP BY terms(field='correspond_brand_name',size='10',alias='correspond_brand_name',include='\".*sport.*\"',exclude='\"water_.*\"')"));
+        System.out.println(explain("SELECT * FROM index GROUP BY terms(field='correspond_brand_name',size='10',alias='correspond_brand_name',include='[\"mazda\", \"honda\"]',exclude='[\"rover\", \"jensen\"]')"));
+        System.out.println(explain("SELECT * FROM index GROUP BY terms(field='correspond_brand_name',size='10',alias='correspond_brand_name',include='{\"partition\":0,\"num_partitions\":20}')"));
+    }
+
     private String explain(String sql) throws SQLFeatureNotSupportedException, SqlParseException {
         SearchDao searchDao = MainTestSuite.getSearchDao();
         SqlElasticRequestBuilder requestBuilder = searchDao.explain(sql).explain();