Fix aggs integration tests where buckets can be empty (#4169)

russcam · russcam · commit 62fbfe996a53 · 2019-10-22T13:45:32.000+10:00
This commit fixes integration tests for aggregations that use a date_histogram aggregation, where a bucker may have no documents with a specific seed value. For example, build.bat seed:41075 integrate 7.4.0 "readonly" (cherry picked from commit b63a4f3)
diff --git a/src/Tests/Tests/Aggregations/Pipeline/BucketScript/BucketScriptAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/BucketScript/BucketScriptAggregationUsageTests.cs
@@ -20,6 +20,7 @@ public BucketScriptAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage
 				{
 					field = "startedOn",
 					interval = "month",
+					min_doc_count = 1
 				},
 				aggs = new
 				{
@@ -77,6 +78,7 @@ public BucketScriptAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage
 			.DateHistogram("projects_started_per_month", dh => dh
 				.Field(p => p.StartedOn)
 				.Interval(DateInterval.Month)
+				.MinimumDocumentCount(1)
 				.Aggregations(aa => aa
 					.Sum("commits", sm => sm
 						.Field(p => p.NumberOfCommits)
@@ -106,6 +108,7 @@ public BucketScriptAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage
 			{
 				Field = "startedOn",
 				Interval = DateInterval.Month,
+				MinimumDocumentCount = 1,
 				Aggregations =
 					new SumAggregation("commits", "numberOfCommits") &&
 					new FilterAggregation("stable_state")
diff --git a/src/Tests/Tests/Aggregations/Pipeline/Derivative/DerivativeAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/Derivative/DerivativeAggregationUsageTests.cs
@@ -21,6 +21,7 @@ public DerivativeAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage us
 				{
 					field = "startedOn",
 					interval = "month",
+					min_doc_count = 1
 				},
 				aggs = new
 				{
@@ -47,6 +48,7 @@ public DerivativeAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage us
 			.DateHistogram("projects_started_per_month", dh => dh
 				.Field(p => p.StartedOn)
 				.Interval(DateInterval.Month)
+				.MinimumDocumentCount(1)
 				.Aggregations(aa => aa
 					.Sum("commits", sm => sm
 						.Field(p => p.NumberOfCommits)
@@ -62,6 +64,7 @@ public DerivativeAggregationUsageTests(ReadOnlyCluster cluster, EndpointUsage us
 			{
 				Field = "startedOn",
 				Interval = DateInterval.Month,
+				MinimumDocumentCount = 1,
 				Aggregations =
 					new SumAggregation("commits", "numberOfCommits") &&
 					new DerivativeAggregation("commits_derivative", "commits")
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageEwmaAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageEwmaAggregationUsageTests.cs
@@ -41,6 +41,7 @@ public MovingAverageEwmaAggregationUsageTests(ReadOnlyCluster cluster, EndpointU
 				{
 					field = "startedOn",
 					interval = "month",
+					min_doc_count = 1
 				},
 				aggs = new
 				{
@@ -72,6 +73,7 @@ public MovingAverageEwmaAggregationUsageTests(ReadOnlyCluster cluster, EndpointU
 			.DateHistogram("projects_started_per_month", dh => dh
 				.Field(p => p.StartedOn)
 				.Interval(DateInterval.Month)
+				.MinimumDocumentCount(1)
 				.Aggregations(aa => aa
 					.Sum("commits", sm => sm
 						.Field(p => p.NumberOfCommits)
@@ -92,6 +94,7 @@ public MovingAverageEwmaAggregationUsageTests(ReadOnlyCluster cluster, EndpointU
 			{
 				Field = "startedOn",
 				Interval = DateInterval.Month,
+				MinimumDocumentCount = 1,
 				Aggregations =
 					new SumAggregation("commits", "numberOfCommits")
 					&& new MovingAverageAggregation("commits_moving_avg", "commits")
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltLinearAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltLinearAggregationUsageTests.cs
@@ -40,7 +40,8 @@ public MovingAverageHoltLinearAggregationUsageTests(ReadOnlyCluster cluster, End
 				date_histogram = new
 				{
 					field = "startedOn",
-					interval = "month"
+					interval = "month",
+					min_doc_count = 1
 				},
 				aggs = new
 				{
@@ -73,6 +74,7 @@ public MovingAverageHoltLinearAggregationUsageTests(ReadOnlyCluster cluster, End
 			.DateHistogram("projects_started_per_month", dh => dh
 				.Field(p => p.StartedOn)
 				.Interval(DateInterval.Month)
+				.MinimumDocumentCount(1)
 				.Aggregations(aa => aa
 					.Sum("commits", sm => sm.Field(p => p.NumberOfCommits))
 					.MovingAverage("commits_moving_avg", mv => mv
@@ -92,6 +94,7 @@ public MovingAverageHoltLinearAggregationUsageTests(ReadOnlyCluster cluster, End
 			{
 				Field = "startedOn",
 				Interval = DateInterval.Month,
+				MinimumDocumentCount = 1,
 				Aggregations =
 					new SumAggregation("commits", "numberOfCommits")
 					&& new MovingAverageAggregation("commits_moving_avg", "commits")
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltWintersAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageHoltWintersAggregationUsageTests.cs
@@ -39,7 +39,8 @@ public MovingAverageHoltWintersUsageTests(ReadOnlyCluster cluster, EndpointUsage
 				date_histogram = new
 				{
 					field = "startedOn",
-					interval = "month"
+					interval = "month",
+					min_doc_count = 1
 				},
 				aggs = new
 				{
@@ -77,6 +78,7 @@ public MovingAverageHoltWintersUsageTests(ReadOnlyCluster cluster, EndpointUsage
 			.DateHistogram("projects_started_per_month", dh => dh
 				.Field(p => p.StartedOn)
 				.Interval(DateInterval.Month)
+				.MinimumDocumentCount(1)
 				.Aggregations(aa => aa
 					.Sum("commits", sm => sm
 						.Field(p => p.NumberOfCommits)
@@ -103,6 +105,7 @@ public MovingAverageHoltWintersUsageTests(ReadOnlyCluster cluster, EndpointUsage
 			{
 				Field = "startedOn",
 				Interval = DateInterval.Month,
+				MinimumDocumentCount = 1,
 				Aggregations =
 					new SumAggregation("commits", "numberOfCommits")
 					&& new MovingAverageAggregation("commits_moving_avg", "commits")
@@ -142,7 +145,7 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 				var movingAverage = item.MovingAverage("commits_moving_avg");
 
 				// Moving Average specifies a window of 4 so
-				// moving average values should exist from 5th bucketr onwards
+				// moving average values should exist from 5th bucket onwards
 				if (bucketCount <= 4)
 					movingAverage.Should().BeNull();
 				else
diff --git a/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageSimpleAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/MovingAverage/MovingAverageSimpleAggregationUsageTests.cs
@@ -40,7 +40,7 @@ public MovingAverageSimpleAggregationUsageTests(ReadOnlyCluster cluster, Endpoin
 				date_histogram = new
 				{
 					field = "startedOn",
-					interval = "month",
+					interval = "month"
 				},
 				aggs = new
 				{
@@ -59,6 +59,7 @@ public MovingAverageSimpleAggregationUsageTests(ReadOnlyCluster cluster, Endpoin
 							model = "simple",
 							window = 30,
 							predict = 10,
+							gap_policy = "insert_zeros",
 							settings = new { }
 						}
 					}
@@ -79,6 +80,7 @@ public MovingAverageSimpleAggregationUsageTests(ReadOnlyCluster cluster, Endpoin
 						.BucketsPath("commits")
 						.Window(30)
 						.Predict(10)
+						.GapPolicy(GapPolicy.InsertZeros)
 						.Model(m => m
 							.Simple()
 						)
@@ -97,6 +99,7 @@ public MovingAverageSimpleAggregationUsageTests(ReadOnlyCluster cluster, Endpoin
 					{
 						Window = 30,
 						Predict = 10,
+						GapPolicy = GapPolicy.InsertZeros,
 						Model = new SimpleModel()
 					}
 			};
diff --git a/src/Tests/Tests/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregationUsageTests.cs b/src/Tests/Tests/Aggregations/Pipeline/SerialDifferencing/SerialDifferencingAggregationUsageTests.cs
@@ -19,7 +19,8 @@ public SerialDifferencingAggregationUsageTests(ReadOnlyCluster cluster, Endpoint
 				date_histogram = new
 				{
 					field = "startedOn",
-					interval = "month"
+					interval = "month",
+					min_doc_count = 1
 				},
 				aggs = new
 				{
@@ -47,6 +48,7 @@ public SerialDifferencingAggregationUsageTests(ReadOnlyCluster cluster, Endpoint
 			.DateHistogram("projects_started_per_month", dh => dh
 				.Field(p => p.StartedOn)
 				.Interval(DateInterval.Month)
+				.MinimumDocumentCount(1)
 				.Aggregations(aa => aa
 					.Sum("commits", sm => sm
 						.Field(p => p.NumberOfCommits)
@@ -63,6 +65,7 @@ public SerialDifferencingAggregationUsageTests(ReadOnlyCluster cluster, Endpoint
 			{
 				Field = "startedOn",
 				Interval = DateInterval.Month,
+				MinimumDocumentCount = 1,
 				Aggregations =
 					new SumAggregation("commits", "numberOfCommits")
 					&& new SerialDifferencingAggregation("second_difference", "commits")

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public MovingAverageSimpleAggregationUsageTests(ReadOnlyCluster cluster, Endpoin`
`40`	`40`	`date_histogram = new`
`41`	`41`	`{`
`42`	`42`	`field = "startedOn",`
`43`		`- interval = "month",`
	`43`	`+ interval = "month"`
`44`	`44`	`},`
`45`	`45`	`aggs = new`
`46`	`46`	`{`
`@@ -59,6 +59,7 @@ public MovingAverageSimpleAggregationUsageTests(ReadOnlyCluster cluster, Endpoin`
`59`	`59`	`model = "simple",`
`60`	`60`	`window = 30,`
`61`	`61`	`predict = 10,`
	`62`	`+ gap_policy = "insert_zeros",`
`62`	`63`	`settings = new { }`
`63`	`64`	`}`
`64`	`65`	`}`
`@@ -79,6 +80,7 @@ public MovingAverageSimpleAggregationUsageTests(ReadOnlyCluster cluster, Endpoin`
`79`	`80`	`.BucketsPath("commits")`
`80`	`81`	`.Window(30)`
`81`	`82`	`.Predict(10)`
	`83`	`+ .GapPolicy(GapPolicy.InsertZeros)`
`82`	`84`	`.Model(m => m`
`83`	`85`	`.Simple()`
`84`	`86`	`)`
`@@ -97,6 +99,7 @@ public MovingAverageSimpleAggregationUsageTests(ReadOnlyCluster cluster, Endpoin`
`97`	`99`	`{`
`98`	`100`	`Window = 30,`
`99`	`101`	`Predict = 10,`
	`102`	`+ GapPolicy = GapPolicy.InsertZeros,`
`100`	`103`	`Model = new SimpleModel()`
`101`	`104`	`}`
`102`	`105`	`};`