fix #2740 reintroduce show_term_document_count_error which went blatantly missing in 5.x

Author: Mpdreamz

src/Nest/Aggregations/AggregateJsonConverter.cs

@@ -15,7 +15,8 @@ internal class AggregateJsonConverter : JsonConverter
 
 		public override bool CanWrite => false;
 
-		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) => this.ReadAggregate(reader, serializer);
+		public override object ReadJson(JsonReader reader, Type objectType, object existingValue,
+			JsonSerializer serializer) => this.ReadAggregate(reader, serializer);
 
 		public override bool CanConvert(Type objectType) => objectType == typeof(IAggregate);
 
@@ -73,20 +74,20 @@ static AggregateJsonConverter()
 		{
 			AllReservedAggregationNames = typeof(Parser)
 				.GetFields(BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public)
-				.Where(f=>f.IsLiteral && !f.IsInitOnly)
+				.Where(f => f.IsLiteral && !f.IsInitOnly)
 #if DOTNETCORE
 				.Select(f => (string)f.GetValue(null))
 #else
-				.Select(f => (string)f.GetRawConstantValue())
+				.Select(f => (string) f.GetRawConstantValue())
 #endif
 				.ToArray();
 
 			var allKeys = string.Join(", ", AllReservedAggregationNames);
 			UsingReservedAggNameFormat =
 				"'{0}' is one of the reserved aggregation keywords"
-			    + " we use a heuristics based response parser and using these reserved keywords"
-			    + " could throw its heuritics off course. We are working on a solution in elasticsearch itself to make"
-			    + " the response parsable. For now these are all the reserved keywords: "
+				+ " we use a heuristics based response parser and using these reserved keywords"
+				+ " could throw its heuritics off course. We are working on a solution in elasticsearch itself to make"
+				+ " the response parsable. For now these are all the reserved keywords: "
 				+ allKeys;
 		}
 
@@ -101,7 +102,7 @@ private IAggregate ReadAggregate(JsonReader reader, JsonSerializer serializer)
 
 			IAggregate aggregate = null;
 
-			var propertyName = (string)reader.Value;
+			var propertyName = (string) reader.Value;
 			if (_numeric.IsMatch(propertyName))
 				aggregate = GetPercentilesAggregate(reader, serializer, oldFormat: true);
 
@@ -115,7 +116,7 @@ private IAggregate ReadAggregate(JsonReader reader, JsonSerializer serializer)
 				return aggregate;
 			}
 
-			propertyName = (string)reader.Value;
+			propertyName = (string) reader.Value;
 			switch (propertyName)
 			{
 				case Parser.Values:
@@ -165,7 +166,7 @@ private IBucket ReadBucket(JsonReader reader, JsonSerializer serializer)
 				return null;
 
 			IBucket item;
-			var property = (string)reader.Value;
+			var property = (string) reader.Value;
 			switch (property)
 			{
 				case Parser.Key:
@@ -194,7 +195,7 @@ private Dictionary<string, object> GetMetadata(JsonReader reader)
 			reader.Read();
 			while (reader.TokenType != JsonToken.EndObject)
 			{
-				var key = (string)reader.Value;
+				var key = (string) reader.Value;
 				reader.Read();
 				var value = reader.Value;
 				meta.Add(key, value);
@@ -224,13 +225,13 @@ private IAggregate GetTopHitsAggregate(JsonReader reader, JsonSerializer seriali
 			var maxScore = o[Parser.MaxScore].ToObject<double?>();
 			var hits = o[Parser.Hits].Children().OfType<JObject>();
 			reader.Read();
-			return new TopHitsAggregate(hits, serializer) { Total = total, MaxScore = maxScore };
+			return new TopHitsAggregate(hits, serializer) {Total = total, MaxScore = maxScore};
 		}
 
 		private IAggregate GetGeoCentroidAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
-			var geoCentroid = new GeoCentroidAggregate { Location = serializer.Deserialize<GeoLocation>(reader) };
+			var geoCentroid = new GeoCentroidAggregate {Location = serializer.Deserialize<GeoLocation>(reader)};
 			reader.Read();
 			return geoCentroid;
 		}
@@ -269,15 +270,15 @@ private IAggregate GetPercentilesAggregate(JsonReader reader, JsonSerializer ser
 				reader.Read();
 			while (reader.TokenType != JsonToken.EndObject)
 			{
-				var propertyName = (string)reader.Value;
+				var propertyName = (string) reader.Value;
 				if (propertyName.Contains(Parser.AsStringSuffix))
 				{
 					reader.Read();
 					reader.Read();
 				}
 				if (reader.TokenType != JsonToken.EndObject)
 				{
-					var percentileValue = (string)reader.Value;
+					var percentileValue = (string) reader.Value;
 					var percentile = double.Parse(percentileValue, CultureInfo.InvariantCulture);
 					reader.Read();
 					var value = reader.Value as double?;
@@ -298,9 +299,9 @@ private IAggregate GetSingleBucketAggregate(JsonReader reader, JsonSerializer se
 		{
 			reader.Read();
 			var docCount = (reader.Value as long?).GetValueOrDefault(0);
-			var bucket = new SingleBucketAggregate { DocCount = docCount };
+			var bucket = new SingleBucketAggregate {DocCount = docCount};
 			reader.Read();
-			if (reader.TokenType == JsonToken.PropertyName && (string)reader.Value == Parser.Buckets)
+			if (reader.TokenType == JsonToken.PropertyName && (string) reader.Value == Parser.Buckets)
 			{
 				var b = this.GetMultiBucketAggregate(reader, serializer) as BucketAggregate;
 				return new BucketAggregate
@@ -319,13 +320,17 @@ private IAggregate GetStatsAggregate(JsonReader reader, JsonSerializer serialize
 		{
 			reader.Read();
 			var count = (reader.Value as long?).GetValueOrDefault(0);
-			reader.Read(); reader.Read();
+			reader.Read();
+			reader.Read();
 			var min = reader.Value as double?;
-			reader.Read(); reader.Read();
+			reader.Read();
+			reader.Read();
 			var max = reader.Value as double?;
-			reader.Read(); reader.Read();
+			reader.Read();
+			reader.Read();
 			var average = reader.Value as double?;
-			reader.Read(); reader.Read();
+			reader.Read();
+			reader.Read();
 			var sum = reader.Value as double?;
 
 			var statsMetric = new StatsAggregate()
@@ -342,7 +347,7 @@ private IAggregate GetStatsAggregate(JsonReader reader, JsonSerializer serialize
 			if (reader.TokenType == JsonToken.EndObject)
 				return statsMetric;
 
-			var propertyName = (string)reader.Value;
+			var propertyName = (string) reader.Value;
 			while (reader.TokenType != JsonToken.EndObject && propertyName.Contains(Parser.AsStringSuffix))
 			{
 				reader.Read();
@@ -371,7 +376,8 @@ private IAggregate GetExtendedStatsAggregate(StatsAggregate statsMetric, JsonRea
 			reader.Read();
 			reader.Read();
 			extendedStatsMetric.Variance = (reader.Value as double?);
-			reader.Read(); reader.Read();
+			reader.Read();
+			reader.Read();
 			extendedStatsMetric.StdDeviation = (reader.Value as double?);
 			reader.Read();
 
@@ -383,15 +389,15 @@ private IAggregate GetExtendedStatsAggregate(StatsAggregate statsMetric, JsonRea
 				reader.Read();
 				reader.Read();
 
-				propertyName = (string)reader.Value;
+				propertyName = (string) reader.Value;
 				if (propertyName == Parser.Upper)
 				{
 					reader.Read();
 					bounds.Upper = reader.Value as double?;
 				}
 				reader.Read();
 
-				propertyName = (string)reader.Value;
+				propertyName = (string) reader.Value;
 				if (propertyName == Parser.Lower)
 				{
 					reader.Read();
@@ -402,7 +408,7 @@ private IAggregate GetExtendedStatsAggregate(StatsAggregate statsMetric, JsonRea
 				reader.Read();
 			}
 
-			propertyName = (string)reader.Value;
+			propertyName = (string) reader.Value;
 			while (reader.TokenType != JsonToken.EndObject && propertyName.Contains(Parser.AsStringSuffix))
 			{
 				// std_deviation_bounds is an object, so we need to skip its properties
@@ -428,7 +434,7 @@ private IReadOnlyDictionary<string, IAggregate> GetSubAggregates(JsonReader read
 			var currentDepth = reader.Depth;
 			do
 			{
-				var fieldName = (string)reader.Value;
+				var fieldName = (string) reader.Value;
 				reader.Read();
 				var agg = this.ReadAggregate(reader, serializer);
 				nestedAggs.Add(fieldName, agg);
@@ -442,14 +448,14 @@ private IReadOnlyDictionary<string, IAggregate> GetSubAggregates(JsonReader read
 		private IAggregate GetMultiBucketAggregate(JsonReader reader, JsonSerializer serializer)
 		{
 			var bucket = new BucketAggregate();
-			var propertyName = (string)reader.Value;
+			var propertyName = (string) reader.Value;
 			if (propertyName == Parser.DocCountErrorUpperBound)
 			{
 				reader.Read();
 				bucket.DocCountErrorUpperBound = reader.Value as long?;
 				reader.Read();
 			}
-			propertyName = (string)reader.Value;
+			propertyName = (string) reader.Value;
 			if (propertyName == Parser.SumOtherDocCount)
 			{
 				reader.Read();
@@ -513,7 +519,7 @@ private IAggregate GetValueAggregate(JsonReader reader, JsonSerializer serialize
 				{
 					if (reader.TokenType == JsonToken.PropertyName)
 					{
-						var propertyName = (string)reader.Value;
+						var propertyName = (string) reader.Value;
 
 						if (propertyName == Parser.ValueAsString)
 						{
@@ -523,7 +529,7 @@ private IAggregate GetValueAggregate(JsonReader reader, JsonSerializer serialize
 
 						if (reader.TokenType == JsonToken.PropertyName)
 						{
-							propertyName = (string)reader.Value;
+							propertyName = (string) reader.Value;
 							if (propertyName == Parser.Keys)
 							{
 								var keyedValueMetric = new KeyedValueAggregate
@@ -556,7 +562,7 @@ private IAggregate GetValueAggregate(JsonReader reader, JsonSerializer serialize
 			var scriptedMetric = serializer.Deserialize(reader);
 
 			if (scriptedMetric != null)
-				return new ScriptedMetricAggregate { _Value = scriptedMetric };
+				return new ScriptedMetricAggregate {_Value = scriptedMetric};
 
 			reader.Read();
 			return valueMetric;
@@ -576,13 +582,13 @@ public IBucket GetRangeBucket(JsonReader reader, JsonSerializer serializer, stri
 					case Parser.From:
 						reader.Read();
 						if (reader.ValueType == typeof(double))
-							fromDouble = (double)reader.Value;
+							fromDouble = (double) reader.Value;
 						reader.Read();
 						break;
 					case Parser.To:
 						reader.Read();
 						if (reader.ValueType == typeof(double))
-							toDouble = (double)reader.Value;
+							toDouble = (double) reader.Value;
 						reader.Read();
 						break;
 					case Parser.Key:
@@ -642,19 +648,18 @@ private IBucket GetDateHistogramBucket(JsonReader reader, JsonSerializer seriali
 			};
 
 			return dateHistogram;
-
 		}
 
 		private IBucket GetKeyedBucket(JsonReader reader, JsonSerializer serializer)
 		{
 			reader.Read();
 			var key = reader.Value;
 			reader.Read();
-			var propertyName = (string)reader.Value;
+			var propertyName = (string) reader.Value;
 			if (propertyName == Parser.From || propertyName == Parser.To)
 				return GetRangeBucket(reader, serializer, key as string);
 
-			var bucket = new KeyedBucket<object> { Key = key };
+			var bucket = new KeyedBucket<object> {Key = key};
 
 			if (propertyName == Parser.KeyAsString)
 			{
@@ -667,10 +672,16 @@ private IBucket GetKeyedBucket(JsonReader reader, JsonSerializer serializer)
 			bucket.DocCount = docCount.GetValueOrDefault(0);
 			reader.Read();
 
-			var nextProperty = (string)reader.Value;
+			var nextProperty = (string) reader.Value;
 			if (nextProperty == Parser.Score)
 				return GetSignificantTermsBucket(reader, serializer, bucket);
 
+			if (nextProperty == Parser.DocCountErrorUpperBound)
+			{
+				reader.Read();
+				bucket.DocCountErrorUpperBound = reader.Value as long?;
+				reader.Read();
+			}
 			bucket.Aggregations = this.GetSubAggregates(reader, serializer);
 			return bucket;
 		}

src/Nest/Aggregations/AggregationsHelper.cs

@@ -194,7 +194,8 @@ private IEnumerable<KeyedBucket<TKey>> GetKeyedBuckets<TKey>(IEnumerable<IBucket
 					Key = (TKey)Convert.ChangeType(bucket.Key, typeof(TKey)),
 					KeyAsString = bucket.KeyAsString,
 					Aggregations = bucket.Aggregations,
-					DocCount = bucket.DocCount
+					DocCount = bucket.DocCount,
+					DocCountErrorUpperBound = bucket.DocCountErrorUpperBound
 				};
 			}
 		}

src/Nest/Aggregations/Bucket/KeyedBucket.cs

@@ -13,5 +13,7 @@ public KeyedBucket(IDictionary<string, IAggregate> aggregations) : base(aggregat
 		public TKey Key { get; set; }
 		public string KeyAsString { get; set; }
 		public long? DocCount { get; set; }
+
+		public long? DocCountErrorUpperBound { get; set; }
 	}
 }

src/Nest/Aggregations/Bucket/Terms/TermsAggregation.cs

@@ -41,6 +41,11 @@ public interface ITermsAggregation : IBucketAggregation
 
 		[JsonProperty("missing")]
 		string Missing { get; set; }
+
+		[JsonProperty("show_term_doc_count_error")]
+		bool? ShowTermDocCountError { get; set; }
+
+
 	}
 
 	public class TermsAggregation : BucketAggregationBase, ITermsAggregation
@@ -56,6 +61,7 @@ public class TermsAggregation : BucketAggregationBase, ITermsAggregation
 		public TermsIncludeExclude Exclude { get; set; }
 		public TermsAggregationCollectMode? CollectMode { get; set; }
 		public string Missing { get; set; }
+		public bool? ShowTermDocCountError { get; set; }
 
 		internal TermsAggregation() { }
 
@@ -91,6 +97,8 @@ public class TermsAggregationDescriptor<T>
 
 		string ITermsAggregation.Missing { get; set; }
 
+		bool? ITermsAggregation.ShowTermDocCountError { get; set; }
+
 		public TermsAggregationDescriptor<T> Field(Field field) => Assign(a => a.Field = field);
 
 		public TermsAggregationDescriptor<T> Field(Expression<Func<T, object>> field) => Assign(a => a.Field = field);
@@ -159,5 +167,7 @@ public TermsAggregationDescriptor<T> CollectMode(TermsAggregationCollectMode col
 			Assign(a => a.CollectMode = collectMode);
 
 		public TermsAggregationDescriptor<T> Missing(string missing) => Assign(a => a.Missing = missing);
+
+		public TermsAggregationDescriptor<T> ShowTermDocCountError(bool? showTermDocCountError = true) => Assign(a => a.ShowTermDocCountError = showTermDocCountError);
 	}
 }