manual merge for elastic2.0

eliranmoyal · eliranmoyal · commit e5aba9cf7141 · 2015-11-28T00:30:16.000+02:00
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java b/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java
@@ -52,7 +52,7 @@ public AggregationBuilder<?> makeGroupAgg(Field field) throws SqlParseException
                 Map<String, Object> paramsAsMap = methodField.getParamsAsMap();
                 Where where = (Where) paramsAsMap.get("where");
                 return AggregationBuilders.filter(paramsAsMap.get("alias").toString()).
-                        filter(FilterMaker.explan(where));
+                        filter(QueryMaker.explan(where));
             }
             return makeRangeGroup(methodField);
 		} else {
diff --git a/src/test/java/org/nlpcn/es4sql/AggregationTest.java b/src/test/java/org/nlpcn/es4sql/AggregationTest.java
@@ -441,7 +441,7 @@ public void groupByTestWithFilter() throws Exception {
         Terms gender = filter.getAggregations().get("gender");
 
         for(Terms.Bucket bucket : gender.getBuckets()) {
-            String key = bucket.getKey();
+            String key = bucket.getKey().toString();
             long count = ((ValueCount) bucket.getAggregations().get("COUNT(*)")).getValue();
             if(key.equalsIgnoreCase("m")) {
                 Assert.assertEquals(507, count);
@@ -461,7 +461,7 @@ public void groupByOnNestedFieldWithFilterTest() throws Exception {
         Terms infos = filter.getAggregations().get("message.info");
         Assert.assertEquals(1,infos.getBuckets().size());
         for(Terms.Bucket bucket : infos.getBuckets()) {
-            String key = bucket.getKey();
+            String key = bucket.getKey().toString();
             long count = ((ValueCount) bucket.getAggregations().get("COUNT(*)")).getValue();
             if(key.equalsIgnoreCase("a")) {
                 Assert.assertEquals(2, count);
diff --git a/src/test/java/org/nlpcn/es4sql/MainTestSuite.java b/src/test/java/org/nlpcn/es4sql/MainTestSuite.java
@@ -42,6 +42,7 @@
 })
 public class MainTestSuite {
 
+    
 	private static TransportClient client;
 	private static SearchDao searchDao;
 

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public AggregationBuilder<?> makeGroupAgg(Field field) throws SqlParseException`
`52`	`52`	`Map<String, Object> paramsAsMap = methodField.getParamsAsMap();`
`53`	`53`	`Where where = (Where) paramsAsMap.get("where");`
`54`	`54`	`return AggregationBuilders.filter(paramsAsMap.get("alias").toString()).`
`55`		`- filter(FilterMaker.explan(where));`
	`55`	`+ filter(QueryMaker.explan(where));`
`56`	`56`	`}`
`57`	`57`	`return makeRangeGroup(methodField);`
`58`	`58`	`} else {`