Merge pull request NLPchina#215 from ottboy4/elastic2.3.2

ansjsun · ansjsun · commit d223b9d391e0 · 2016-05-13T11:13:50.000+08:00
Highlight with aggregations update
diff --git a/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java b/src/main/java/org/nlpcn/es4sql/query/AggregationQueryAction.java
@@ -166,6 +166,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {
 
 		request.setSearchType(SearchType.DEFAULT);
         updateRequestWithIndexAndRoutingOptions(select, request);
+        updateRequestWithHighlight(select, request);
         SqlElasticSearchRequestBuilder sqlElasticRequestBuilder = new SqlElasticSearchRequestBuilder(request);
         return sqlElasticRequestBuilder;
 	}
diff --git a/src/main/java/org/nlpcn/es4sql/query/QueryAction.java b/src/main/java/org/nlpcn/es4sql/query/QueryAction.java
@@ -69,6 +69,9 @@ protected HighlightBuilder.Field parseHighlightField(Object[] params)
 
         for (Map.Entry<String,Object> param : highlightParams.entrySet()){
             switch (param.getKey()){
+                case "type":
+                    field.highlighterType((String) param.getValue());
+                    break;
                 case "boundary_chars":
                     field.boundaryChars(fromArrayListToCharArray((ArrayList) param.getValue()));
                     break;

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,7 @@ public SqlElasticSearchRequestBuilder explain() throws SqlParseException {`
`166`	`166`
`167`	`167`	`request.setSearchType(SearchType.DEFAULT);`
`168`	`168`	`updateRequestWithIndexAndRoutingOptions(select, request);`
	`169`	`+ updateRequestWithHighlight(select, request);`
`169`	`170`	`SqlElasticSearchRequestBuilder sqlElasticRequestBuilder = new SqlElasticSearchRequestBuilder(request);`
`170`	`171`	`return sqlElasticRequestBuilder;`
`171`	`172`	`}`