Skip to content

Check the token type of score property when deserializing aggregation #2135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 28, 2016
Merged

Check the token type of score property when deserializing aggregation #2135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 25 additions & 16 deletions src/Nest/Aggregations/AggregateJsonConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,8 @@ private IBucket ReadBucket(JsonReader reader, JsonSerializer serializer)
if (reader.TokenType != JsonToken.PropertyName)
return null;

IBucket item = null;

var property = reader.Value as string;
IBucket item;
var property = (string)reader.Value;

switch (property)
{
Expand Down Expand Up @@ -125,7 +124,7 @@ private Dictionary<string, object> GetMetadata(JsonReader reader)
reader.Read();
while (reader.TokenType != JsonToken.EndObject)
{
var key = reader.Value as string;
var key = (string)reader.Value;
reader.Read();
var value = reader.Value;
meta.Add(key, value);
Expand Down Expand Up @@ -330,16 +329,17 @@ private IAggregate GetExtendedStatsAggregate(StatsAggregate statsMetric, JsonRea
return extendedStatsMetric;
}

private IDictionary<string, IAggregate> GetSubAggregates(JsonReader reader, JsonSerializer serializer)
private IDictionary<string, IAggregate> GetSubAggregates(JsonReader reader, JsonSerializer serializer, Dictionary<string, IAggregate> aggregates = null)
{
if (reader.TokenType != JsonToken.PropertyName)
return null;
return aggregates;

var nestedAggs = aggregates ?? new Dictionary<string, IAggregate>();

var nestedAggs = new Dictionary<string, IAggregate>();
var currentDepth = reader.Depth;
do
{
var fieldName = reader.Value as string;
var fieldName = (string)reader.Value;
reader.Read();
var agg = this.ReadAggregate(reader, serializer);
nestedAggs.Add(fieldName, agg);
Expand All @@ -353,14 +353,14 @@ private IDictionary<string, IAggregate> GetSubAggregates(JsonReader reader, Json
private IAggregate GetMultiBucketAggregate(JsonReader reader, JsonSerializer serializer)
{
var bucket = new BucketAggregate();
var property = reader.Value as string;
var property = (string)reader.Value;
if (property == "doc_count_error_upper_bound")
{
reader.Read();
bucket.DocCountErrorUpperBound = reader.Value as long?;
reader.Read();
}
property = reader.Value as string;
property = (string)reader.Value;
if (property == "sum_other_doc_count")
{
reader.Read();
Expand Down Expand Up @@ -537,7 +537,7 @@ private IBucket GetKeyedBucket(JsonReader reader, JsonSerializer serializer)
{
var key = reader.ReadAsString();
reader.Read();
var property = reader.Value as string;
var property = (string)reader.Value;
if (property == "from" || property == "to")
return GetRangeBucket(reader, serializer, key);

Expand All @@ -554,21 +554,30 @@ private IBucket GetKeyedBucket(JsonReader reader, JsonSerializer serializer)
keyItem.DocCount = docCount.GetValueOrDefault(0);
reader.Read();

var nextProperty = reader.Value as string;
Dictionary<string, IAggregate> aggregates = null;
var nextProperty = (string)reader.Value;
if (nextProperty == "score")
{
return GetSignificantTermsBucket(reader, serializer, keyItem);
}
reader.Read();
if (reader.TokenType == JsonToken.Float || reader.TokenType == JsonToken.Null)
{
return GetSignificantTermsBucket(reader, serializer, keyItem);
}

// score is the name of an aggregation
aggregates = new Dictionary<string, IAggregate>();
var aggregate = this.ReadAggregate(reader, serializer);
reader.Read();
aggregates.Add(nextProperty, aggregate);
}

keyItem.Aggregations = this.GetSubAggregates(reader, serializer);
keyItem.Aggregations = this.GetSubAggregates(reader, serializer, aggregates);
return keyItem;

}

private IBucket GetSignificantTermsBucket(JsonReader reader, JsonSerializer serializer, KeyedBucket keyItem)
{
reader.Read();
var score = reader.Value as double?;
reader.Read();
reader.Read();
Expand Down