Merge commit 'feb2b1eec9e98ebe2ced29a61100ee97f3505b87' into elastic2.0

eliranmoyal · eliranmoyal · commit e56a98377a5a · 2016-03-19T10:59:55.000+02:00
Conflicts:
	src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java b/src/main/java/org/nlpcn/es4sql/query/maker/AggMaker.java
@@ -1,5 +1,6 @@
 package org.nlpcn.es4sql.query.maker;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -23,6 +24,7 @@
 import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
 import org.elasticsearch.search.aggregations.metrics.ValuesSourceMetricsAggregationBuilder;
 import org.elasticsearch.search.aggregations.metrics.geobounds.GeoBoundsBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
 import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
 import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
 import org.elasticsearch.search.sort.SortOrder;
@@ -96,6 +98,7 @@ public AbstractAggregationBuilder makeFieldAgg(MethodField field, AbstractAggreg
             return addFieldToAgg(field, builder);
         case "PERCENTILES":
             builder = AggregationBuilders.percentiles(field.getAlias());
+            addSpecificPercentiles((PercentilesBuilder) builder,field.getParams());
             return addFieldToAgg(field, builder);
 		case "TOPHITS":
 			return makeTopHitsAgg(field);
@@ -109,6 +112,26 @@ public AbstractAggregationBuilder makeFieldAgg(MethodField field, AbstractAggreg
 		}
 	}
 
+    private void addSpecificPercentiles(PercentilesBuilder percentilesBuilder, List<KVValue> params) {
+        List<Double> percentiles = new ArrayList<>();
+        for(KVValue kValue : params ){
+            if(kValue.value.getClass().equals(BigDecimal.class)){
+                BigDecimal percentile = (BigDecimal) kValue.value;
+                percentiles.add(percentile.doubleValue());
+
+            }
+        }
+        if(percentiles.size() > 0) {
+            double[] percentilesArr = new double[percentiles.size()];
+            int i=0;
+            for (Double percentile : percentiles){
+                percentilesArr[i] = percentile;
+                i++;
+            }
+            percentilesBuilder.percentiles(percentilesArr);
+        }
+    }
+
     private String fixAlias(String alias) {
         //because [ is not legal as alias
         return alias.replaceAll("\\[","(").replaceAll("\\]",")");
diff --git a/src/test/java/org/nlpcn/es4sql/AggregationTest.java b/src/test/java/org/nlpcn/es4sql/AggregationTest.java
@@ -178,6 +178,14 @@ public void percentileTest() throws IOException, SqlParseException, SQLFeatureNo
         Assert.assertTrue(Math.abs(percentiles.percentile(99.0) - 40.0) < 0.001 );
     }
 
+    @Test
+    public void percentileTestSpecific() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
+        Aggregations result = query(String.format("SELECT PERCENTILES(age,25.0,75.0) x FROM %s/account", TEST_INDEX));
+        Percentiles percentiles = result.get("x");
+        Assert.assertTrue(Math.abs(percentiles.percentile(25.0) - 25.0) < 0.001 );
+        Assert.assertTrue(Math.abs(percentiles.percentile(75.0) - 35.0) < 0.001 );
+    }
+
     @Test
 	public void aliasTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
 		Aggregations result = query(String.format("SELECT COUNT(*) AS mycount FROM %s/account", TEST_INDEX));
