From 3d9fafc9fe4d238da978dd340a4b2c0cc593fd11 Mon Sep 17 00:00:00 2001 From: Patrick McEvoy Date: Tue, 3 Jun 2014 20:32:05 +0100 Subject: [PATCH 1/2] Support extended_bounds on DateHistogram --- .../Aggregations/DateHistogramAggregationDescriptor.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs index d6f28c88f8d..5151f1422c1 100644 --- a/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs +++ b/src/Nest/DSL/Aggregations/DateHistogramAggregationDescriptor.cs @@ -154,5 +154,14 @@ public DateHistogramAggregationDescriptor OrderDescending(string key) return this; } + [JsonProperty("extended_bounds")] + internal IDictionary _ExtendedBounds { get; set; } + + public DateHistogramAggregationDescriptor ExtendedBounds(string min, string max) + { + this._ExtendedBounds = new Dictionary { { "min", min }, { "max", max } }; + return this; + } + } } \ No newline at end of file From 2eb8caf493ee7e0f7722d590f92d3bd772910fd8 Mon Sep 17 00:00:00 2001 From: Patrick McEvoy Date: Wed, 4 Jun 2014 09:19:09 +0100 Subject: [PATCH 2/2] Fix Percentile metrics aggregation (ES 1.2) --- src/Nest/Resolvers/Converters/AggregationConverter.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Nest/Resolvers/Converters/AggregationConverter.cs b/src/Nest/Resolvers/Converters/AggregationConverter.cs index c240ae09fa3..8be6dc5bff5 100644 --- a/src/Nest/Resolvers/Converters/AggregationConverter.cs +++ b/src/Nest/Resolvers/Converters/AggregationConverter.cs @@ -34,12 +34,16 @@ private IAggregation ReadAggregation(JsonReader reader, JsonSerializer serialize if (reader.TokenType != JsonToken.PropertyName) return null; - var property = reader.Value as string; + var property = reader.Value as string; + + // Is this still needed? if (_numeric.IsMatch(property)) return GetPercentilesMetricAggregation(reader, serializer); switch (property) { + case "values": + return GetPercentilesMetricAggregation(reader, serializer); case "value": return GetValueMetricOrAggregation(reader, serializer); case "buckets": @@ -63,6 +67,9 @@ private IAggregation ReadAggregation(JsonReader reader, JsonSerializer serialize private IAggregation GetPercentilesMetricAggregation(JsonReader reader, JsonSerializer serializer) { + reader.Read(); // JsonToken.PropertyName "values" + reader.Read(); // JsonToken.StartObject + var metric = new PercentilesMetric(); var percentileItems = new List(); while (reader.TokenType != JsonToken.EndObject)