Merge branch 'master' into refactor/aggs-metadata

# Conflicts:
#	src/Tests/Aggregations/WritingAggregations.doc.cs

Author: russcam

docs/asciidoc/Aggregations/WritingAggregations.doc.asciidoc

@@ -12,11 +12,11 @@ It benefits from types that are carried over to sub aggregations
 [source, csharp]
 ----
 s => s
-.Aggregations(aggs=>aggs
+.Aggregations(aggs => aggs
 	.Children<CommitActivity>("name_of_child_agg", child => child
-		.Aggregations(childAggs=>childAggs
-			.Average("average_per_child", avg=>avg.Field(p=>p.ConfidenceFactor))
-			.Max("max_per_child", avg=>avg.Field(p=>p.ConfidenceFactor))
+		.Aggregations(childAggs => childAggs
+			.Average("average_per_child", avg => avg.Field(p => p.ConfidenceFactor))
+			.Max("max_per_child", avg => avg.Field(p => p.ConfidenceFactor))
 		)
 	)
 )
@@ -31,9 +31,9 @@ new SearchRequest<Project>
 {
 	Aggregations = new ChildrenAggregation("name_of_child_agg", typeof(CommitActivity))
 	{
-		Aggregations = 
-			new AverageAggregation("average_per_child", "confidenceFactor") &&
-			new MaxAggregation("max_per_child", "confidenceFactor")
+		Aggregations =
+			new AverageAggregation("average_per_child", "confidenceFactor") 
+			&& new MaxAggregation("max_per_child", "confidenceFactor")
 	}
 }
 ----
@@ -50,9 +50,32 @@ new SearchRequest<Project>
 {
 	Aggregations = new ChildrenAggregation("name_of_child_agg", typeof(CommitActivity))
 	{
-		Aggregations = 
-			new AverageAggregation("average_per_child", Field<CommitActivity>(p=>p.ConfidenceFactor))
-			&& new MaxAggregation("max_per_child", Field<CommitActivity>(p=>p.ConfidenceFactor))
+		Aggregations =
+			new AverageAggregation("average_per_child", Field<CommitActivity>(p => p.ConfidenceFactor))
+			&& new MaxAggregation("max_per_child", Field<CommitActivity>(p => p.ConfidenceFactor))
 	}
 }
 ----
+An advanced scenario may involve an existing collection of aggregation functions that should be set as aggregations 
+on the request. Using LINQ's `.Aggregate()` method, each function can be applied to the aggregation descriptor
+(`childAggs` below) in turn, returning the descriptor after each function application.
+
+[source, csharp]
+----
+{
+	var aggregations = new List<Func<AggregationContainerDescriptor<CommitActivity>, IAggregationContainer>>
+	{
+		a => a.Average("average_per_child", avg => avg.Field(p => p.ConfidenceFactor)),
+		a => a.Max("max_per_child", avg => avg.Field(p => p.ConfidenceFactor))
+	};
+
+	return s => s
+		.Aggregations(aggs => aggs
+			.Children<CommitActivity>("name_of_child_agg", child => child
+.Aggregations(childAggs =>
+	aggregations.Aggregate(childAggs, (acc, agg) => { agg(acc); return acc; })
+)
+			)
+		);
+}
+----

docs/asciidoc/ClientConcepts/ConnectionPooling/BuildingBlocks/ConnectionPooling.Doc.asciidoc

@@ -121,8 +121,8 @@ var pool = new SniffingConnectionPool(uris);
 ----
 Or using an enumerable of `Node`
 A major benefit here is you can include known node roles when seeding 
-NEST can use this information to favour sniffing on master eligable nodes first
-and take master only nodes out of rotation for issueing client calls on.
+NEST can use this information to favour sniffing on master eligible nodes first
+and take master only nodes out of rotation for issuing client calls on.
 
 [source, csharp]
 ----
@@ -132,7 +132,7 @@ var nodes = uris.Select(u=>new Node(u));
 ----
 pool = new SniffingConnectionPool(nodes);
 ----
-This type of pool is hardwirted to optout out sniffing
+This type of pool is hardwired to opt out of sniffing
 
 [source, csharp]
 ----

docs/asciidoc/ClientConcepts/ConnectionPooling/BuildingBlocks/KeepingTrackOfNodes.Doc.asciidoc

@@ -7,11 +7,11 @@ var node = new Node(new Uri("http://localhost:9200"));
 node.Uri.Should().NotBeNull();
 node.Uri.Port.Should().Be(9200);
 ----
-By default master eligable and holds data is presumed to be true *
+By default master eligible and holds data is presumed to be true *
 
 [source, csharp]
 ----
-node.MasterEligable.Should().BeTrue();
+node.MasterEligible.Should().BeTrue();
 ----
 [source, csharp]
 ----
@@ -88,11 +88,11 @@ Nodes are considered equal if they have the same endpoint no matter what other m
 
 [source, csharp]
 ----
-var node = new Node(new Uri("http://localhost:9200")) { MasterEligable = false };
+var node = new Node(new Uri("http://localhost:9200")) { MasterEligible = false };
 ----
 [source, csharp]
 ----
-var nodeAsMaster = new Node(new Uri("http://localhost:9200")) { MasterEligable = true };
+var nodeAsMaster = new Node(new Uri("http://localhost:9200")) { MasterEligible = true };
 (node == nodeAsMaster).Should().BeTrue();
 (node != nodeAsMaster).Should().BeFalse();
 var uri = new Uri("http://localhost:9200");

docs/asciidoc/ClientConcepts/ConnectionPooling/Exceptions/UnexpectedExceptions.doc.asciidoc

@@ -43,7 +43,11 @@ can still see the audit trail for the whole coordinated request.
 ----
 var audit = new Auditor(() => Framework.Cluster
 				.Nodes(10)
+#if DOTNETCORE
+				.ClientCalls(r => r.OnPort(9200).FailAlways(new System.Net.Http.HttpRequestException("recover")))
+#else
 				.ClientCalls(r => r.OnPort(9200).FailAlways(new WebException("recover")))
+#endif 
 				.ClientCalls(r => r.OnPort(9201).FailAlways(new Exception("boom!")))
 				.StaticConnectionPool()
 				.Settings(s => s.DisablePing())

docs/asciidoc/ClientConcepts/ConnectionPooling/RoundRobin/RoundRobin.doc.asciidoc

@@ -45,12 +45,12 @@ comes 9200 again
 
 [source, csharp]
 ----
-startingPositions = new List<int>();
+var threadedStartPositions = new ConcurrentBag<int>();
 ----
 [source, csharp]
 ----
 var threads = Enumerable.Range(0, 20)
-				.Select(i => CreateThreadCallingGetNext(pool, startingPositions))
+				.Select(i => CreateThreadCallingGetNext(pool, threadedStartPositions))
 				.ToList();
 t.Start();
 t.Join();
@@ -60,7 +60,7 @@ because we started `NumberOfNodes * 2` threads
 
 [source, csharp]
 ----
-var grouped = startingPositions.GroupBy(p => p);
+var grouped = threadedStartPositions.GroupBy(p => p).ToList();
 ----
 [source, csharp]
 ----

docs/asciidoc/ClientConcepts/ConnectionPooling/Sniffing/OnConnectionFailure.doc.asciidoc

@@ -5,14 +5,14 @@ This can be very handy to force a refresh of the pools known healthy node by ins
 A sniff tries to get the nodes by asking each currently known node until one response.
 
 Here we seed our connection with 5 known nodes 9200-9204 of which we think
-9202, 9203, 9204 are master eligable nodes. Our virtualized cluster will throw once when doing 
+9202, 9203, 9204 are master eligible nodes. Our virtualized cluster will throw once when doing 
 a search on 9201. This should a sniff to be kicked off.
 
 [source, csharp]
 ----
 var audit = new Auditor(() => Framework.Cluster
 	.Nodes(5)
-	.MasterEligable(9202, 9203, 9204)
+	.MasterEligible(9202, 9203, 9204)
 	.ClientCalls(r => r.SucceedAlways())
 	.ClientCalls(r => r.OnPort(9201).Fails(Once))
 ----
@@ -24,7 +24,7 @@ still fails once
 ----
 .Sniff(p => p.SucceedAlways(Framework.Cluster
 		.Nodes(3)
-		.MasterEligable(9200, 9202)
+		.MasterEligible(9200, 9202)
 		.ClientCalls(r => r.OnPort(9201).Fails(Once))
 ----
 After this second failure on 9201 another sniff will be returned a cluster that no 
@@ -34,7 +34,7 @@ longer fails but looks completely different (9210-9212) we should be able to han
 ----
 .Sniff(s => s.SucceedAlways(Framework.Cluster
 .Nodes(3, 9210)
-.MasterEligable(9210, 9212)
+.MasterEligible(9210, 9212)
 .ClientCalls(r => r.SucceedAlways())
 .Sniff(r => r.SucceedAlways())
 		))
@@ -102,15 +102,15 @@ Only we enable pinging (default is true) and make the ping fail
 ----
 var audit = new Auditor(() => Framework.Cluster
 	.Nodes(5)
-	.MasterEligable(9202, 9203, 9204)
+	.MasterEligible(9202, 9203, 9204)
 	.Ping(r => r.OnPort(9201).Fails(Once))
 	.Sniff(p => p.SucceedAlways(Framework.Cluster
 		.Nodes(3)
-		.MasterEligable(9200, 9202)
+		.MasterEligible(9200, 9202)
 		.Ping(r => r.OnPort(9201).Fails(Once))
 		.Sniff(s => s.SucceedAlways(Framework.Cluster
 .Nodes(3, 9210)
-.MasterEligable(9210, 9211)
+.MasterEligible(9210, 9211)
 .Ping(r => r.SucceedAlways())
 .Sniff(r => r.SucceedAlways())
 		))

docs/asciidoc/ClientConcepts/ConnectionPooling/Sniffing/OnStaleClusterState.doc.asciidoc

@@ -9,15 +9,15 @@ but without sniffing periodically it will never find the nodes that have been ad
 ----
 var audit = new Auditor(() => Framework.Cluster
 				.Nodes(10)
-				.MasterEligable(9202, 9203, 9204)
+				.MasterEligible(9202, 9203, 9204)
 				.ClientCalls(r => r.SucceedAlways())
 				.Sniff(s => s.SucceedAlways(Framework.Cluster
 					.Nodes(100)
-					.MasterEligable(9202, 9203, 9204)
+					.MasterEligible(9202, 9203, 9204)
 					.ClientCalls(r => r.SucceedAlways())
 					.Sniff(ss => ss.SucceedAlways(Framework.Cluster
 						.Nodes(10)
-						.MasterEligable(9202, 9203, 9204)
+						.MasterEligible(9202, 9203, 9204)
 						.ClientCalls(r => r.SucceedAlways())
 					))
 				))

docs/asciidoc/ClientConcepts/ConnectionPooling/Sniffing/OnStartup.doc.asciidoc

@@ -82,9 +82,9 @@ await audit.TraceCall(new ClientCall {
 			});
 var audit = new Auditor(() => Framework.Cluster
 				.Nodes(new[] {
-					new Node(new Uri("http://localhost:9200")) { MasterEligable = false },
-					new Node(new Uri("http://localhost:9201")) { MasterEligable = false },
-					new Node(new Uri("http://localhost:9202")) { MasterEligable = true },
+					new Node(new Uri("http://localhost:9200")) { MasterEligible = false },
+					new Node(new Uri("http://localhost:9201")) { MasterEligible = false },
+					new Node(new Uri("http://localhost:9202")) { MasterEligible = true },
 				})
 				.Sniff(s => s.Succeeds(Always))
 				.SniffingConnectionPool()
@@ -98,9 +98,9 @@ await audit.TraceCall(new ClientCall {
 			});
 var audit = new Auditor(() => Framework.Cluster
 				.Nodes(new[] {
-					new Node(new Uri("http://localhost:9200")) { MasterEligable = true },
-					new Node(new Uri("http://localhost:9201")) { MasterEligable = true },
-					new Node(new Uri("http://localhost:9202")) { MasterEligable = false },
+					new Node(new Uri("http://localhost:9200")) { MasterEligible = true },
+					new Node(new Uri("http://localhost:9201")) { MasterEligible = true },
+					new Node(new Uri("http://localhost:9202")) { MasterEligible = false },
 				})
 				.Sniff(s => s.Fails(Always))
 				.Sniff(s => s.OnPort(9202).Succeeds(Always))

docs/asciidoc/ClientConcepts/ConnectionPooling/Sniffing/RoleDetection.doc.asciidoc

@@ -1,6 +1,6 @@
 == Sniffing role detection
 
-When we sniff the custer state we detect the role of the node whether its master eligable and holds data
+When we sniff the custer state we detect the role of the node whether its master eligible and holds data
 We use this information when selecting a node to perform an API call on.
 
 [source, csharp]
@@ -9,7 +9,7 @@ var audit = new Auditor(() => Framework.Cluster
 				.Nodes(10)
 				.Sniff(s => s.Fails(Always))
 				.Sniff(s => s.OnPort(9202)
-					.Succeeds(Always, Framework.Cluster.Nodes(8).MasterEligable(9200, 9201, 9202))
+					.Succeeds(Always, Framework.Cluster.Nodes(8).MasterEligible(9200, 9201, 9202))
 				)
 				.SniffingConnectionPool()
 				.AllDefaults()
@@ -19,21 +19,21 @@ var audit = new Auditor(() => Framework.Cluster
 				{
 					pool.Should().NotBeNull();
 					pool.Nodes.Should().HaveCount(10);
-					pool.Nodes.Where(n => n.MasterEligable).Should().HaveCount(10);
+					pool.Nodes.Where(n => n.MasterEligible).Should().HaveCount(10);
 				},
 				AssertPoolAfterCall = (pool) =>
 				{
 					pool.Should().NotBeNull();
 					pool.Nodes.Should().HaveCount(8);
-					pool.Nodes.Where(n => n.MasterEligable).Should().HaveCount(3);
+					pool.Nodes.Where(n => n.MasterEligible).Should().HaveCount(3);
 				}
 			};
 pool.Should().NotBeNull();
 pool.Nodes.Should().HaveCount(10);
-pool.Nodes.Where(n => n.MasterEligable).Should().HaveCount(10);
+pool.Nodes.Where(n => n.MasterEligible).Should().HaveCount(10);
 pool.Should().NotBeNull();
 pool.Nodes.Should().HaveCount(8);
-pool.Nodes.Where(n => n.MasterEligable).Should().HaveCount(3);
+pool.Nodes.Where(n => n.MasterEligible).Should().HaveCount(3);
 await audit.TraceStartup();
 var audit = new Auditor(() => Framework.Cluster
 				.Nodes(10)
@@ -67,10 +67,10 @@ pool.Nodes.Should().HaveCount(8);
 pool.Nodes.Where(n => n.HoldsData).Should().HaveCount(5);
 await audit.TraceStartup();
 var node = SniffAndReturnNode();
-node.MasterEligable.Should().BeTrue();
+node.MasterEligible.Should().BeTrue();
 node.HoldsData.Should().BeFalse();
 node = await SniffAndReturnNodeAsync();
-node.MasterEligable.Should().BeTrue();
+node.MasterEligible.Should().BeTrue();
 node.HoldsData.Should().BeFalse();
 var pipeline = CreatePipeline();
 pipeline.Sniff();