Merge branch 'master' of github.com:elastic/elasticsearch-net

Author: Mpdreamz

build.bat

@@ -17,8 +17,6 @@ if errorlevel 1 (
   exit /b %errorlevel%
 )
 
-
-
 SET TARGET="build"
 SET VERSION=
 SET ESVERSIONS=
@@ -27,7 +25,10 @@ SET SKIPTESTS=0
 SET APIKEY=
 
 
-IF /I "%1"=="skiptests" (set SKIPTESTS="1")
+IF /I "%1"=="skiptests" (
+	set SKIPTESTS="1"
+	SHIFT
+)
 
 IF NOT [%1]==[] (set TARGET="%1")
 

build/scripts/Building.fsx

@@ -7,11 +7,11 @@ open Fake
 open Paths
 open Projects
 
-let gitLink pdbDir =
+let gitLink pdbDir projectName =
     let exe = Paths.Tool("gitlink/lib/net45/GitLink.exe")
     ExecProcess(fun p ->
       p.FileName <- exe
-      p.Arguments <- sprintf @". -u %s -d %s" Paths.Repository pdbDir
+      p.Arguments <- sprintf @". -u %s -d %s -include %s" Paths.Repository pdbDir projectName
     ) (TimeSpan.FromMinutes 5.0) |> ignore
 
 type Build() = 
@@ -28,8 +28,8 @@ type Build() =
         projects
         |> Seq.iter(fun project -> 
             let path = (Paths.Quote project)
-            Tooling.Dnu.Exec Tooling.DotNetRuntime.Desktop Build.BuildFailure project ["restore"; path]
-            Tooling.Dnu.Exec Tooling.DotNetRuntime.Desktop Build.BuildFailure project ["build"; path; "--configuration Release --quiet";]
+            Tooling.Dnu.Exec Tooling.DotNetRuntime.Desktop Build.BuildFailure project ["restore"; path; "--quiet"]
+            Tooling.Dnu.Exec Tooling.DotNetRuntime.Desktop Build.BuildFailure project ["build"; path; "--configuration Release --quiet"]
            )
 
     static member BuildFailure errors =
@@ -44,8 +44,8 @@ type Build() =
 
             //eventhough this says desktop it still builds all the tfm's it just hints wich installed dnx version to use
             let path = (Paths.Quote project)
-            Tooling.Dnu.Exec Tooling.DotNetRuntime.Desktop Build.BuildFailure project ["restore"; path]
-            Tooling.Dnu.Exec Tooling.DotNetRuntime.Desktop Build.BuildFailure project ["build"; path; "--configuration Release";]
+            Tooling.Dnu.Exec Tooling.DotNetRuntime.Desktop Build.BuildFailure project ["restore"; path; "--quiet"]
+            Tooling.Dnu.Exec Tooling.DotNetRuntime.Desktop Build.BuildFailure project ["build"; path; "--configuration Release --quiet"]
            )
 
         projects
@@ -57,8 +57,8 @@ type Build() =
                 match projectName with
                 | "Nest" 
                 | "Elasticsearch.Net" ->
-                    gitLink(Paths.Net45BinFolder projectName)
-                    gitLink(Paths.DotNet51BinFolder projectName)
+                    gitLink (Paths.Net45BinFolder projectName) projectName
+                    gitLink (Paths.DotNet51BinFolder projectName) projectName
                 | _  -> ()
             CopyDir outputFolder binFolder allFiles
         )

build/scripts/Paths.fsx

@@ -119,42 +119,45 @@ module Tooling =
         member this.Path = Paths.Tool(path)
         member this.Exec arguments = exec this.Path arguments
 
-    let private dotTraceCommandLineTools = "JetBrains.dotTrace.CommandLineTools.10.0.20151114.191633"
-    let private buildToolsDirectory = Paths.Build("tools")
-    let private dotTraceDirectory = sprintf "%s/%s" buildToolsDirectory dotTraceCommandLineTools
-    
-    if (Directory.Exists(dotTraceDirectory) = false)
-    then
-        trace (sprintf "No JetBrains DotTrace tooling found in %s. Downloading now" buildToolsDirectory) 
-        let url = sprintf "https://d1opms6zj7jotq.cloudfront.net/resharper/%s.zip" dotTraceCommandLineTools      
-        let zipFile = sprintf "%s/%s.zip" buildToolsDirectory dotTraceCommandLineTools
-        use webClient = new WebClient()
-        webClient.DownloadFile(url, zipFile)
-        System.IO.Compression.ZipFile.ExtractToDirectory(zipFile, dotTraceDirectory)
-        File.Delete zipFile
-        trace "JetBrains DotTrace tooling downloaded"
-
-    let NugetFile = "build/tools/nuget/nuget.exe"
-    if (File.Exists(NugetFile) = false)
-    then
-        trace "Nuget not found %s. Downloading now"
-        let url = "http://nuget.org/nuget.exe" 
-        Directory.CreateDirectory("build/tools/nuget") |> ignore
-        use webClient = new WebClient()
-        webClient.DownloadFile(url, NugetFile)
-        trace "nuget downloaded"
-
-    type ProfilerTooling(path) =
+    let NugetFile = fun _ ->
+        let targetLocation = "build/tools/nuget/nuget.exe" 
+        if (not (File.Exists targetLocation))
+        then
+            trace "Nuget not found %s. Downloading now"
+            let url = "http://nuget.org/nuget.exe" 
+            Directory.CreateDirectory("build/tools/nuget") |> ignore
+            use webClient = new WebClient()
+            webClient.DownloadFile(url, targetLocation)
+            trace "nuget downloaded"
+        targetLocation
+
+    type ProfilerTooling(path) =
+        let dotTraceCommandLineTools = "JetBrains.dotTrace.CommandLineTools.10.0.20151114.191633"
+        let buildToolsDirectory = Paths.Build("tools")
+        let dotTraceDirectory = sprintf "%s/%s" buildToolsDirectory dotTraceCommandLineTools
+        member this.Bootstrap = fun _ ->
+            if (not (Directory.Exists dotTraceDirectory)) then
+                trace (sprintf "No JetBrains DotTrace tooling found in %s. Downloading now" buildToolsDirectory) 
+                let url = sprintf "https://d1opms6zj7jotq.cloudfront.net/resharper/%s.zip" dotTraceCommandLineTools      
+                let zipFile = sprintf "%s/%s.zip" buildToolsDirectory dotTraceCommandLineTools
+                use webClient = new WebClient()
+                webClient.DownloadFile(url, zipFile)
+                System.IO.Compression.ZipFile.ExtractToDirectory(zipFile, dotTraceDirectory)
+                File.Delete zipFile
+                trace "JetBrains DotTrace tooling downloaded"
+            
         member this.Path = sprintf "%s/%s" dotTraceDirectory path
-        member this.Exec arguments = exec this.Path arguments
+        member this.Exec arguments = 
+            this.Bootstrap()
+            exec this.Path arguments
 
     let GitLink = new NugetTooling("GitLink", "gitlink/lib/net45/gitlink.exe")
     let Node = new NugetTooling("node.js", "Node.js/node.exe")
     let private npmCli = "Npm/node_modules/npm/cli.js"
     let Npm = new NugetTooling("npm", npmCli)
     let XUnit = new NugetTooling("xunit.runner.console", "xunit.runner.console/tools/xunit.console.exe")
     let DotTraceProfiler = new ProfilerTooling("ConsoleProfiler.exe")
-    let DotTraceReporter = new ProfilerTooling("Reporter.exe")           
+    let DotTraceReporter = new ProfilerTooling("Reporter.exe")
     let DotTraceSnapshotStats = new ProfilerTooling("SnapshotStat.exe")
 
     //only used to boostrap fake itself

build/scripts/Releasing.fsx

@@ -100,7 +100,7 @@ type Release() =
             ZipHelper.Unzip unzippedDir package
 
             // rename NEST package id
-            if (projectName.Equals("Nest", StringComparison.InvariantCultureIgnoreCase) = true)
+            if (projectName.Equals("Nest", StringComparison.InvariantCultureIgnoreCase))
             then
                 let nuspec = sprintf "%s/Nest.nuspec" unzippedDir
                 FileHelper.RegexReplaceInFileWithEncoding 
@@ -138,7 +138,7 @@ type Release() =
     static member PublishCanaryBuild accessKey = 
         !! "build/output/_packages/*-ci*.nupkg"
         |> Seq.iter(fun f -> 
-            let success = Tooling.execProcess Tooling.NugetFile ["push"; f; accessKey; "-source"; "https://www.myget.org/F/elasticsearch-net/api/v2/package"] 
+            let success = Tooling.execProcess (Tooling.NugetFile()) ["push"; f; accessKey; "-source"; "https://www.myget.org/F/elasticsearch-net/api/v2/package"] 
             match success with
             | 0 -> traceFAKE "publish to myget succeeded" |> ignore
             | _ -> failwith "publish to myget failed" |> ignore

docs/asciidoc/Aggregations/WritingAggregations.doc.asciidoc

@@ -62,20 +62,17 @@ on the request. Using LINQ's `.Aggregate()` method, each function can be applied
 
 [source, csharp]
 ----
+var aggregations = new List<Func<AggregationContainerDescriptor<CommitActivity>, IAggregationContainer>>
 {
-	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; })
-)
+	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

@@ -2,10 +2,10 @@
 Connection pooling is the internal mechanism that takes care of registering what nodes there are in the cluster and which
 we can use to issue client calls on.
 
-== SingleNodeConnectionPool 
+== SingleNodeConnectionPool
 The simplest of all connection pools, this takes a single `Uri` and uses that to connect to elasticsearch for all the calls
 It doesn't opt in to sniffing and pinging behavior, and will never mark nodes dead or alive. The one `Uri` it holds is always
-ready to go. 
+ready to go.
 
 [source, csharp]
 ----
@@ -15,7 +15,7 @@ pool.Nodes.Should().HaveCount(1);
 var node = pool.Nodes.First();
 node.Uri.Port.Should().Be(9201);
 ----
-This type of pool is hardwired to optout out sniffing
+This type of pool is hardwired to opt out of sniffing
 
 [source, csharp]
 ----
@@ -27,7 +27,7 @@ and pinging
 ----
 pool.SupportsPinging.Should().BeFalse();
 ----
-When you use the low ceremony ElasticClient constructor that takes a single Uri
+When you use the low ceremony ElasticClient constructor that takes a single Uri,
 We default to this SingleNodeConnectionPool 
 
 [source, csharp]
@@ -58,15 +58,15 @@ client = new ElasticClient(new ConnectionSettings(pool));
 ----
 client.ConnectionSettings.ConnectionPool.Should().BeOfType<SingleNodeConnectionPool>();
 ----
-== StaticConnectionPool 
-The static connection pool is great if you have a known small sized cluster and do no want to enable 
+== StaticConnectionPool
+The static connection pool is great if you have a known small sized cluster and do no want to enable
 sniffing to find out the cluster topology.
 
 [source, csharp]
 ----
 var uris = Enumerable.Range(9200, 5).Select(p => new Uri("http://localhost:" + p));
 ----
-a connection pool can be seeded using an enumerable of `Uri` 
+a connection pool can be seeded using an enumerable of `Uri`s 
 
 [source, csharp]
 ----
@@ -82,7 +82,7 @@ var nodes = uris.Select(u=>new Node(u));
 ----
 pool = new StaticConnectionPool(nodes);
 ----
-This type of pool is hardwirted to optout out sniffing
+This type of pool is hardwired to opt out of sniffing
 
 [source, csharp]
 ----
@@ -105,9 +105,9 @@ var client = new ElasticClient(new ConnectionSettings(pool));
 ----
 client.ConnectionSettings.ConnectionPool.Should().BeOfType<StaticConnectionPool>();
 ----
-== SniffingConnectionPool 
+== SniffingConnectionPool
 A subclass of StaticConnectionPool that allows itself to be reseeded at run time.
-It comes with a very minor overhead of a ReaderWriterLock to ensure thread safety.
+It comes with a very minor overhead of a `ReaderWriterLockSlim` to ensure thread safety.
 
 [source, csharp]
 ----
@@ -132,19 +132,19 @@ var nodes = uris.Select(u=>new Node(u));
 ----
 pool = new SniffingConnectionPool(nodes);
 ----
-This type of pool is hardwired to opt out of sniffing
+This type of pool is hardwired to opt in to sniffing
 
 [source, csharp]
 ----
 pool.SupportsReseeding.Should().BeTrue();
 ----
-but supports pinging when enabled 
+and pinging 
 
 [source, csharp]
 ----
 pool.SupportsPinging.Should().BeTrue();
 ----
-To create a client using this siffing connection pool pass 
+To create a client using the sniffing connection pool pass 
 the connection pool to the connectionsettings you pass to ElasticClient
 
 [source, csharp]

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

@@ -1,7 +1,7 @@
 = Date time providers
 
-Not typically something you'll have to pass to the client but all calls `to DateTime.Now` 
-in the client have been abstracted by IDateTimeProvider. This allows us to unit test timeouts and clusterfailover
+Not typically something you'll have to pass to the client but all calls to `System.DateTime.UtcNow`
+in the client have been abstracted by `IDateTimeProvider`. This allows us to unit test timeouts and clusterfailover
 in run time not being bound to wall clock time.
 
 [source, csharp]
@@ -14,8 +14,8 @@ dates are always returned in UTC
 ----
 dateTimeProvider.Now().Should().BeCloseTo(DateTime.UtcNow);
 ----
-Another responsibility of this interface is to calculate the time a node has to taken out of rotation
-based on the number of attempts to revive it. For very advance usecases this might be something of interest
+Another responsibility of this interface is to calculate the time a node has to be taken out of rotation
+based on the number of attempts to revive it. For very advanced use cases, this might be something of interest
 to provide a custom implementation for.
 
 [source, csharp]
@@ -38,8 +38,8 @@ Plotting these defaults looks as followed:
 [[timeout]]
 .Default formula, x-axis time in minutes, y-axis number of attempts to revive
 image::timeoutplot.png[dead timeout]	
-The goal here is that whenever a node is resurected and is found to still be offline we send it
-back to the doghouse for an ever increasingly long period untill we hit a bounded maximum.
+The goal here is that whenever a node is resurrected and is found to still be offline, we send it
+_back to the doghouse_ for an ever increasingly long period, until we hit a bounded maximum.
 
 [source, csharp]
 ----

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

@@ -1,4 +1,4 @@
-= 
+= Keeping track of nodes
 
 
 [source, csharp]
@@ -23,8 +23,8 @@ Is resurrected is true on first usage, hints to the transport that a ping might
 ----
 node.IsResurrected.Should().BeTrue();
 ----
-When instantiating your connection pool you could switch these to false to initialize the client to 
-a known cluster topology.  
+When instantiating your connection pool you could switch these to false to initialize the client to
+a known cluster topology.
 
 passing a node with a path should be preserved. Sometimes an elasticsearch node lives behind a proxy 
 

docs/asciidoc/ClientConcepts/ConnectionPooling/BuildingBlocks/RequestPipelines.doc.asciidoc

@@ -1,5 +1,5 @@
-== Request pipeline
-Every request is executed in the context of `RequestPipeline` when you are using the default `ITransport` implementation.
+= Request pipeline
+Every request is executed in the context of `RequestPipeline` when using the default `ITransport` implementation.
 
 
 [source, csharp]
@@ -34,7 +34,7 @@ which can be passed to the transport when instantiating a client
 ----
 var transport = new Transport<ConnectionSettings>(settings, requestPipelineFactory, DateTimeProvider.Default, new MemoryStreamFactory());
 ----
-this allows you to have requests executed on your own custom request pipeline 
+this allows you to have requests executed on your own custom request pipeline
 
 [source, csharp]
 ----

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

@@ -1,18 +1,18 @@
-== Transports
-The ITransport interface can be seen as the motor block of the client. It's interface is deceitfully simple. 
-Its ultimately responsible from translating a client call to a response. If for some reasons you do not agree with the way we wrote
-the internals of the client by implementing a custom ITransport you can circumvent all of it and introduce your own.
+= Transports
+The `ITransport` interface can be seen as the motor block of the client. It's interface is deceitfully simple.
+It's ultimately responsible from translating a client call to a response. If for some reason you do not agree with the way we wrote
+the internals of the client, by implementing a custom `ITransport`, you can circumvent all of it and introduce your own.
 
 
 Transport is generically typed to a type that implements IConnectionConfigurationValues 
 This is the minimum ITransport needs to report back for the client to function.
-e.g in the low level client transport is instantiated like this:
+e.g in the low level client, transport is instantiated like this:
 
 [source, csharp]
 ----
 var lowLevelTransport = new Transport<ConnectionConfiguration>(new ConnectionConfiguration());
 ----
-In the high level client like this. 
+In the high level client like this: 
 
 [source, csharp]
 ----
@@ -23,9 +23,9 @@ var highlevelTransport = new Transport<ConnectionSettings>(new ConnectionSetting
 var connectionPool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
 var inMemoryTransport = new Transport<ConnectionSettings>(new ConnectionSettings(connectionPool, new InMemoryConnection()));
 ----
-The only two methods on ITransport are Request and DoRequestAsync, the default ITransport implementation is responsible for introducing
-many of the building blocks in the client, if these do not work for you can swap them out for your own custom ITransport implementation. 
-If you feel this need report back to us we would love to learn why you'd go down this route!
+The only two methods on `ITransport` are `Request()` and `RequestAsync()`, the default `ITransport` implementation is responsible for introducing
+many of the building blocks in the client, if these do not work for you can swap them out for your own custom `ITransport` implementation. 
+If you feel this need, please let us know as we'd love to learn why you've go down this route!
 
 [source, csharp]
 ----