added support for nested aggregation type

Mpdreamz · Mpdreamz · commit 13c91bd56ac1 · 2014-03-03T21:27:49.000+01:00
diff --git a/src/Nest/DSL/Aggregations/NestedAggregationDescriptor.cs b/src/Nest/DSL/Aggregations/NestedAggregationDescriptor.cs
@@ -1,11 +1,14 @@
 using System;
 using System.Linq.Expressions;
 using Nest.Resolvers;
+using Nest.Resolvers.Converters;
 using Newtonsoft.Json;
 
 namespace Nest
 {
+	[JsonConverter(typeof(CustomJsonConverter))]
 	public class NestedAggregationDescriptor<T> : BucketAggregationBaseDescriptor<NestedAggregationDescriptor<T>, T>
+		, ICustomJson
 		where T : class
 	{
 		internal class NestedAgg
@@ -14,7 +17,6 @@ internal class NestedAgg
 			internal PropertyPathMarker _Path;
 		}
 
-		[JsonProperty("nested")]
 		internal NestedAgg _Nested;
 
 
@@ -31,5 +33,10 @@ public NestedAggregationDescriptor<T> Path(Expression<Func<T, object>> path)
 			this._Nested._Path = path;
 			return this;
 		}
+
+		object ICustomJson.GetCustomJson()
+		{
+			return this._Nested;
+		}
 	}
 }
diff --git a/src/Nest/Domain/Aggregations/AggregationsHelper.cs b/src/Nest/Domain/Aggregations/AggregationsHelper.cs
@@ -77,9 +77,9 @@ public SingleBucket Missing(string key)
 			return this.TryGet<SingleBucket>(key);
 		}
 
-		public NestedBucket Nested(string key)
+		public SingleBucket Nested(string key)
 		{
-			return this.TryGet<NestedBucket>(key);
+			return this.TryGet<SingleBucket>(key);
 		}
 
 		public Bucket<KeyItem> Terms(string key)
diff --git a/src/Nest/Domain/Aggregations/NestedBucket.cs b/src/Nest/Domain/Aggregations/NestedBucket.cs
@@ -1,6 +1,10 @@
-﻿namespace Nest
+﻿using Newtonsoft.Json;
+
+namespace Nest
 {
-	public class NestedBucket : BucketAggregationBase
+	public class SingleBucket : BucketAggregationBase
 	{
+		[JsonProperty("doc_count")]
+		public long DocCount { get; set; }
 	}
 }
diff --git a/src/Nest/Domain/Aggregations/SingleBucket.cs b/src/Nest/Domain/Aggregations/SingleBucket.cs
diff --git a/src/Nest/Nest.csproj b/src/Nest/Nest.csproj
@@ -105,7 +105,6 @@
     <Compile Include="Domain\Aggregations\KeyItem.cs" />
     <Compile Include="Domain\Aggregations\NestedBucket.cs" />
     <Compile Include="Domain\Aggregations\RangeItem.cs" />
-    <Compile Include="Domain\Aggregations\SingleBucket.cs" />
     <Compile Include="Domain\Aggregations\StatsMetric.cs" />
     <Compile Include="Domain\Aggregations\ValueMetric.cs" />
     <Compile Include="Domain\Alias\AliasAddDescriptor.cs" />
diff --git a/src/Tests/Nest.Tests.Integration/Aggregations/BucketAggregationTests.cs b/src/Tests/Nest.Tests.Integration/Aggregations/BucketAggregationTests.cs
@@ -33,6 +33,7 @@ public void Histogram()
 						.Field(p=>p.IntValues)
 						.Interval(10)
 					)
+
 				)
 			);
 		    results.IsValid.Should().BeTrue();
diff --git a/src/Tests/Nest.Tests.Integration/Aggregations/NestedBucketAggregationTests.cs b/src/Tests/Nest.Tests.Integration/Aggregations/NestedBucketAggregationTests.cs
@@ -15,16 +15,24 @@ public void Terms()
 		    var results = this._client.Search<ElasticsearchProject>(s=>s
 				.Size(0)
 				.Aggregations(a=>a
-					.Nested("followers", n=>n
+					.Nested("contributors", n=>n
+						.Path(p=>p.Contributors)
 						.Aggregations(t=>t
-							.Terms("bucket_agg", m=>m.Field(p=>p.Country))
+							.Average("avg_age", m=>m
+								.Field(p=>p.Contributors.First().Age)
+							)
 						)
 					)
 				)
 			);
 		    results.IsValid.Should().BeTrue();
-		    var bucket = results.Aggs.Terms("bucket_agg");
-		    bucket.Items.Should().NotBeEmpty();
+		    var bucket = results.Aggs.Nested("contributors");
+		    bucket.DocCount.Should().BeGreaterThan(1);
+
+		    var averageAge = bucket.Average("avg_age");
+		    averageAge.Should().NotBeNull();
+		    averageAge.Value.Should().HaveValue()
+			    .And.BeGreaterOrEqualTo(18);
 	    }
 	
     }
diff --git a/src/Tests/Nest.Tests.Integration/Aggregations/ParseResponseItemsTests.cs b/src/Tests/Nest.Tests.Integration/Aggregations/ParseResponseItemsTests.cs
@@ -112,7 +112,6 @@ public void GeoDistanceItem()
 				.Aggregations(a=>a
 					.GeoDistance("my_geod", dh=>dh
 						.Field(p=>p.Origin)
-						//.DistanceType(GeoDistanceType.sloppy_arc)
 						.Origin(28.0, 28.0)
 						.Unit(GeoUnit.km)
 						.Ranges(
diff --git a/src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj b/src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj
@@ -68,8 +68,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Aggregations\SingleBucketAggregationTests - Copy.cs" />
+    <Compile Include="Aggregations\NestedBucketAggregationTests.cs" />
     <Compile Include="Aggregations\BucketAggregationTests.cs" />
+    <Compile Include="Aggregations\SingleBucketAggregationTests.cs" />
     <Compile Include="Aggregations\StatsAggregationTests.cs" />
     <Compile Include="Aggregations\MetricAggregationTests.cs" />
     <Compile Include="Aggregations\TermsAggregationTests.cs" />
diff --git a/src/Tests/Nest.Tests.MockData/DataSources/AgeSource.cs b/src/Tests/Nest.Tests.MockData/DataSources/AgeSource.cs
@@ -0,0 +1,16 @@
+﻿using System;
+using AutoPoco.Engine;
+
+namespace Nest.Tests.MockData.DataSources
+{
+	public class AgeSource : DatasourceBase<int>
+	{
+		private Random mRandom = new Random(1337);
+		public override int Next(IGenerationSession session)
+		{
+			int f = mRandom.Next(18, 99);
+			return f;
+		}
+
+	}
+}
diff --git a/src/Tests/Nest.Tests.MockData/Domain/ElasticsearchProject.cs b/src/Tests/Nest.Tests.MockData/Domain/ElasticsearchProject.cs
@@ -22,6 +22,9 @@ public class ElasticsearchProject
 		public int LOC { get; set; }
 		public List<Person> Followers { get; set; }
 
+		[ElasticProperty(Type=FieldType.nested)]
+		public List<Person> Contributors { get; set; }
+		
 		public List<Person> NestedFollowers { get; set; }
 
 		[ElasticProperty(Type=FieldType.geo_point)]
diff --git a/src/Tests/Nest.Tests.MockData/Nest.Tests.MockData.csproj b/src/Tests/Nest.Tests.MockData/Nest.Tests.MockData.csproj
@@ -73,6 +73,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="DataSources\AgeSource.cs" />
     <Compile Include="DataSources\BoolSource.cs" />
     <Compile Include="DataSources\IncrementalNameSource.cs" />
     <Compile Include="DataSources\FloatArraySource.cs" />
diff --git a/src/Tests/Nest.Tests.MockData/NestTestData.cs b/src/Tests/Nest.Tests.MockData/NestTestData.cs
@@ -44,6 +44,7 @@ public static IGenerationSession Session
 						.Setup(c => c.FirstName).Use<FirstNameSource>()
 						.Setup(c => c.LastName).Use<LastNameSource>()
 						.Setup(c => c.DateOfBirth).Use<DateOfBirthSource>()
+						.Setup(c => c.Age).Use<AgeSource>()
 						.Setup(c => c.PlaceOfBirth).Use<GeoLocationSource>();
 					x.Include<ElasticsearchProject>()
 						.Setup(c => c.Id).Use<IntegerIdSource>()
@@ -59,6 +60,7 @@ public static IGenerationSession Session
 						.Setup(c => c.Origin).Use<GeoLocationSource>()
 						.Setup(c => c.Name).Use<ElasticsearchProjectsDataSource>()
 						.Setup(c => c.Followers).Value(new List<Person>())
+						.Setup(c => c.Contributors).Value(new List<Person>())
 						.Setup(c => c.StartedOn).Use<DateOfBirthSource>()
 						.Setup(c => c.Content).Use<ElasticsearchProjectDescriptionSource>();
 				});
@@ -100,13 +102,16 @@ public static IEnumerable<ElasticsearchProject> Data
 					// Get a single user
 					var count = ElasticsearchProjectsDataSource.Count();
 					var users = Session.List<Person>(100).Get();
+					var contributors = Session.List<Person>(100).Get();
 					_Data = Session.List<ElasticsearchProject>(count).Get();
 					var i = 0;
 					foreach (var p in _Data)
 					{
 						var take = (int)100 / count;
 						var skip = i * take;
 						var followers = users.Skip(i * take).Take(take).ToList();
+						var cont = contributors.Skip(i * take).Take(take).ToList();
+						p.Contributors = cont;
 						p.Followers = followers;
 						i++;
 					}

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,14 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq.Expressions;`
`3`	`3`	`using Nest.Resolvers;`
	`4`	`+using Nest.Resolvers.Converters;`
`4`	`5`	`using Newtonsoft.Json;`
`5`	`6`
`6`	`7`	`namespace Nest`
`7`	`8`	`{`
	`9`	`+ [JsonConverter(typeof(CustomJsonConverter))]`
`8`	`10`	`public class NestedAggregationDescriptor<T> : BucketAggregationBaseDescriptor<NestedAggregationDescriptor<T>, T>`
	`11`	`+ , ICustomJson`
`9`	`12`	`where T : class`
`10`	`13`	`{`
`11`	`14`	`internal class NestedAgg`
`@@ -14,7 +17,6 @@ internal class NestedAgg`
`14`	`17`	`internal PropertyPathMarker _Path;`
`15`	`18`	`}`
`16`	`19`
`17`		`- [JsonProperty("nested")]`
`18`	`20`	`internal NestedAgg _Nested;`
`19`	`21`
`20`	`22`
`@@ -31,5 +33,10 @@ public NestedAggregationDescriptor<T> Path(Expression<Func<T, object>> path)`
`31`	`33`	`this._Nested._Path = path;`
`32`	`34`	`return this;`
`33`	`35`	`}`
	`36`	`+`
	`37`	`+ object ICustomJson.GetCustomJson()`
	`38`	`+ {`
	`39`	`+ return this._Nested;`
	`40`	`+ }`
`34`	`41`	`}`
`35`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,9 @@ public SingleBucket Missing(string key)`
`77`	`77`	`return this.TryGet<SingleBucket>(key);`
`78`	`78`	`}`
`79`	`79`
`80`		`- public NestedBucket Nested(string key)`
	`80`	`+ public SingleBucket Nested(string key)`
`81`	`81`	`{`
`82`		`- return this.TryGet<NestedBucket>(key);`
	`82`	`+ return this.TryGet<SingleBucket>(key);`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public Bucket<KeyItem> Terms(string key)`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,10 @@`
`1`		`-namespace Nest`
	`1`	`+using Newtonsoft.Json;`
	`2`	`+`
	`3`	`+namespace Nest`
`2`	`4`	`{`
`3`		`- public class NestedBucket : BucketAggregationBase`
	`5`	`+ public class SingleBucket : BucketAggregationBase`
`4`	`6`	`{`
	`7`	`+ [JsonProperty("doc_count")]`
	`8`	`+ public long DocCount { get; set; }`
`5`	`9`	`}`
`6`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public void Histogram()`
`33`	`33`	`.Field(p=>p.IntValues)`
`34`	`34`	`.Interval(10)`
`35`	`35`	`)`
	`36`	`+`
`36`	`37`	`)`
`37`	`38`	`);`
`38`	`39`	`results.IsValid.Should().BeTrue();`
Original file line number	Diff line number	Diff line change
`@@ -15,16 +15,24 @@ public void Terms()`
`15`	`15`	`var results = this._client.Search<ElasticsearchProject>(s=>s`
`16`	`16`	`.Size(0)`
`17`	`17`	`.Aggregations(a=>a`
`18`		`- .Nested("followers", n=>n`
	`18`	`+ .Nested("contributors", n=>n`
	`19`	`+ .Path(p=>p.Contributors)`
`19`	`20`	`.Aggregations(t=>t`
`20`		`- .Terms("bucket_agg", m=>m.Field(p=>p.Country))`
	`21`	`+ .Average("avg_age", m=>m`
	`22`	`+ .Field(p=>p.Contributors.First().Age)`
	`23`	`+ )`
`21`	`24`	`)`
`22`	`25`	`)`
`23`	`26`	`)`
`24`	`27`	`);`
`25`	`28`	`results.IsValid.Should().BeTrue();`
`26`		`- var bucket = results.Aggs.Terms("bucket_agg");`
`27`		`- bucket.Items.Should().NotBeEmpty();`
	`29`	`+ var bucket = results.Aggs.Nested("contributors");`
	`30`	`+ bucket.DocCount.Should().BeGreaterThan(1);`
	`31`	`+`
	`32`	`+ var averageAge = bucket.Average("avg_age");`
	`33`	`+ averageAge.Should().NotBeNull();`
	`34`	`+ averageAge.Value.Should().HaveValue()`
	`35`	`+ .And.BeGreaterOrEqualTo(18);`
`28`	`36`	`}`
`29`	`37`
`30`	`38`	`}`