Merge branch 'develop' of github.com:elasticsearch/elasticsearch-net into develop

Author: Mpdreamz

new_docs/contents/.DS_Store

@@ -1,19 +1,19 @@
 ---
 template: layout.jade
-title: Breaking changes
+title: Breaking Changes
 menusection: concepts
 menuitem: breaking-changes
 ---
 
-#Breaking changes
+#Breaking Changes
 
 ## Elasticsearch 1.0
 
 Elasticsearch 1.0 comes with it's own set of breaking changes which [are all documented in the elasticsearch documentation](http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/breaking-changes.html). This page describes breaking changes NEST introduces in its 1.0 release and to an extend how you should handle Elasticsearch 1.0 changes in your exisiting code base using NEST prior to NEST 1.0.
 
 ## NEST 1.0
 
-### Strong named packages
+### Strong Named Packages
 
 Prior to 1.0 NEST came with a `NEST` and `NEST.Signed` nuget package. In 1.0 there is one package called `NEST` which is a signed strong named assembly. We follow the example of JSON.NET and only change our `AssemblyVersion` on major releases only update the `AssemblyFileVersion` for every release. This way you get most of the benefits of unsigned assemblies while still providing support for developers who's business guidelines mandates the usage of signed assemblies.
 
@@ -38,7 +38,7 @@ to `PutMappingDescriptor<T>`
 
 IResponse.Error.Exception no longer exists, it is inlined to IResponse.OriginalException. The Error property did not hold any information that was not available on IResponse.ConnectionStatus.
 
-### Response shortcuts
+### Response Shortcuts
 
 Prior to 1.0 some calls directly returned a bool or value instead of the full envelopped Elasticsearch response.
 
@@ -63,7 +63,7 @@ Or in a separate put mapping call:
 
     var response = this._client.Map<ElasticsearchProject>(m=>m.MapFromAttributes()......);
 
-#### Alias helpers
+#### Alias Helpers
 
 NEST 0.12.0 had some alias helpers, `SwapAlias()`, `GetIndicesPointingToAlias()` these have been removed in favor of just `Alias()` and `GetAliases()`. Especially the later could benefit from some extension methods that make the common use cases a bit easier to program with. These did not make the beta release.
 

new_docs/contents/breaking-changes.md

@@ -9,7 +9,7 @@ menuitem: esnet-building-requests
 
 This section decribes how to build requests to Elasticsearch.
 
-## Calling an API endpoint
+## Calling an API Endpoint
 
 `Elasticsearch.Net` maps **all** the `Elasticsearch` API endpoints to methods. The reason it can do this is because all these methods are generated from 
 [the official client rest specification](https://github.com/elasticsearch/elasticsearch/tree/master/rest-api-spec/api). This specification documents all 
@@ -32,7 +32,7 @@ Unknown querystring parameters can still be added:
 
 The querystring parameter is always optional.
 
-## Providing request body
+## Providing Request Body
 
 Some endpoints need a request body this can be passed in a couple of ways.
 

new_docs/contents/elasticsearch-net/building-requests.md

@@ -1,6 +1,6 @@
 ---
 template: layout.jade
-title: Quick Start
+title: Errors
 menusection: 
 menuitem: esnet-errors
 ---

new_docs/contents/elasticsearch-net/errors.md

@@ -1,11 +1,11 @@
 ---
 template: layout.jade
-title: Handling responses
+title: Handling Responses
 menusection: 
 menuitem: esnet-handling-responses
 ---
 
-# Handling responses
+# Handling Responses
 
 Describes how to handle the the response objects from `Elasticsearch.Net`
 
@@ -34,7 +34,7 @@ A `byte[]` representation of the response from elasticsearch, only set when `Exp
 #### Response
 The deserialized `T` object representing the response.
 
-## Typed API calls
+## Typed API Calls
 
 `Elasticsearch.Net` does not provide typed objects representing the responses this is up to the developer to map. 
 

new_docs/contents/elasticsearch-net/handling-responses.md

@@ -1,12 +1,12 @@
 ---
 template: layout.jade
-title: Connecting
+title: Handling Responses
 menusection: concepts
 menuitem: handling-responses
 ---
 
 
-# Handling responses
+# Handling Responses
 
 
 All the return objects from API calls in NEST client implement:

new_docs/contents/nest/handling-responses.markdown

@@ -1,6 +1,6 @@
 ---
 template: layout.jade
-title: Connecting
+title: Type/Index Inference
 menusection: concepts
 menuitem: index-type-inference
 ---
@@ -40,11 +40,11 @@ As noted in the [quick start](/nest/quick-start.html) you can always pass **expl
         .Ttl("1m")
     );
 
-This will index the document using `/another-index/another-type/1-should-not-be-the-id?refresh=true&&ttl=1m` as the url. 
+This will index the document using `/another-index/another-type/1-should-not-be-the-id?refresh=true&ttl=1m` as the url. 
 
 There are a couple of places within NEST where inference comes in to play
 
-## Index name inference
+## Index Name Inference
 
 Whenever an explicit index name is not provided NEST will look to see if the type has it's own default index name on the connection settings.
 
@@ -56,12 +56,12 @@ Whenever an explicit index name is not provided NEST will look to see if the typ
      // searches in /my-type-index/mytype/_search
      client.Search<MyType>()
 
-     // searches in /my-default-index/mytype/_search
+     // searches in /my-default-index/person/_search
      client.Search<Person>()
 
 `MyType` defaults to `my-type-index` because it is explicitly configured but `Person` will default to the global fallback `my-default-index`.
 
-## Type name inference
+## Type Name Inference
 
 Whenever NEST needs a type name but is not given one explicitly it will use the given CLR type to infer it's Elasticsearch type name.
 
@@ -90,7 +90,7 @@ Prior to NEST 1.0 typenames were by default lowercased AND pluralized, if you wa
 
     settings.PluralizeTypeNames();
 
-## Property name inference
+## Property Name Inference
 In many places `NEST` allows you to pass property names and JSON paths as C# expressions i.e
 
     .Query(q=>q.Term(p=>p.Followers.First().FirstName, "martijn"))
@@ -107,7 +107,7 @@ This will leave property names untouched.
 
 Properties marked with `[ElasticAttibute(Name="")]` or `[JsonProperty(Name="")]` will pass the configured name verbatim. 
 
-## Id inference
+## Id Inference
 
 Whenever an object is passed that needs to specify an id (i.e index, bulk operations) the object is inspected to see if it has an `Id` property and if so, that value will be used.
 

new_docs/contents/nest/index-type-inference.markdown

@@ -1,6 +1,6 @@
 ---
 template: layout.jade
-title: Connecting
+title: Searching
 menusection: concepts
 menuitem: searching
 ---

new_docs/contents/nest/searching.markdown

@@ -1,6 +1,6 @@
 ---
 template: layout.jade
-title: Connecting
+title: Writing Queries
 menusection: concepts
 menuitem: writing-queries
 ---
@@ -14,7 +14,7 @@ One of the most important things to grasp when using Nest is how to write querie
         ///EXAMPLE HERE
     );
 
-## Raw strings
+## Raw Strings
 Although not preferred by me personally, many folks like to build their own JSON strings and just pass that along.
 
     .QueryRaw("\"match_all\" : { }")
@@ -25,7 +25,7 @@ Nest does not modify this in anyway and just writes this straight into the JSON
 ## Query DSL
 The preferred way to write queries, since it gives you alot of cool features.
 
-### Lambda expressions
+### Lambda Expressions
     .Query(q=>q
         .Term(p=>p.Name, "NEST")
     )
@@ -44,7 +44,7 @@ Of course if you need to pass the property name as string NEST will allow you to
         .Term("followers.firstName", "martijn")
     )
 
-### Static query/filter generator. 
+### Static Query/Filter Generator
 Sometimes you'll need to resuse a filter or query often. To aid with this you can also write queries like this:
 
     var termQuery = Query<ElasticSearchProject>
@@ -61,7 +61,7 @@ Sometimes you'll need to resuse a filter or query often. To aid with this you ca
 
 Similarly `Filter<T>.[Filter]()` methods exist for filters.
 
-### Boolean queries 
+### Boolean Queries 
 As can be seen in the previous example writing out boolean queries can turn into a really tedious and verbose effort. Luckily NEST supports bitwise operators and so we can rewrite the previous as such:
 
     .Query(q=>q.MatchAll() && termQuery)
@@ -96,7 +96,7 @@ You can mix and match this to any level of complexity until it satisfies your qu
 
 Will query all php clients except 'Elastica` or where the name equals `NEST`.
 
-#### Clean output support
+#### Clean Output Support
 Normally writing three boolean must clauses looks like this (psuedo code)
 
     must
@@ -114,7 +114,7 @@ A naive implemenation of the bitwise operators would make all the queries sent t
 
 This degrades rather rapidly and makes inspecting generated queries quite a chore. NEST does it's best to detect these cases and will always write them in the first, cleaner form.
 
-## Conditionless queries
+## Conditionless Queries
 
 Writing complex boolean queries is one thing, but more often then not you'll want to make decisions on how to query based on user input. 
 

new_docs/contents/nest/writing-queries.markdown

@@ -178,12 +178,9 @@ protected virtual HttpWebRequest CreateWebRequest(Uri uri, string method, byte[]
 				myReq.Accept = requestSpecificConfig.ContentType;
 				myReq.ContentType = requestSpecificConfig.ContentType;
 			}
-			var timeout = this.ConnectionSettings.Timeout;
-			if (requestSpecificConfig != null && requestSpecificConfig.RequestTimeout.HasValue)
-				timeout = requestSpecificConfig.RequestTimeout.Value;
-
-			myReq.Timeout = timeout; // 1 minute timeout.
-			myReq.ReadWriteTimeout = timeout; // 1 minute timeout.
+			var timeout = GetRequestTimeout(requestSpecificConfig);
+			myReq.Timeout = timeout;
+			myReq.ReadWriteTimeout = timeout;
 			myReq.Method = method;
 
 			//WebRequest won't send Content-Length: 0 for empty bodies
@@ -251,7 +248,7 @@ protected virtual Task<ElasticsearchResponse<Stream>> DoAsyncRequest(HttpWebRequ
 			  || this._resourceLock == null)
 				return this.CreateIterateTask(request, data, requestSpecificConfig, tcs);
 
-			var timeout = this.ConnectionSettings.Timeout;
+			var timeout = GetRequestTimeout(requestSpecificConfig);
 			var path = request.RequestUri.ToString();
 			var method = request.Method;
 			if (!this._resourceLock.WaitOne(timeout))
@@ -280,9 +277,8 @@ private Task<ElasticsearchResponse<Stream>> CreateIterateTask(HttpWebRequest req
 
 		private IEnumerable<Task> _AsyncSteps(HttpWebRequest request, TaskCompletionSource<ElasticsearchResponse<Stream>> tcs, byte[] data, IRequestConfiguration requestSpecificConfig)
 		{
-			var timeout = this.ConnectionSettings.Timeout;
-			if (requestSpecificConfig != null && requestSpecificConfig.ConnectTimeout.HasValue)
-				timeout = requestSpecificConfig.ConnectTimeout.Value;
+			var timeout = GetRequestTimeout(requestSpecificConfig);
+
 			if (data != null)
 			{
 				var getRequestStream = Task.Factory.FromAsync<Stream>(request.BeginGetRequestStream, request.EndGetRequestStream, null);
@@ -320,7 +316,7 @@ private IEnumerable<Task> _AsyncSteps(HttpWebRequest request, TaskCompletionSour
 			tcs.TrySetResult(cs);
 		}
 
-		public void Iterate(HttpWebRequest request, byte[] data, IEnumerable<Task> asyncIterator, TaskCompletionSource<ElasticsearchResponse<Stream>> tcs)
+		private void Iterate(HttpWebRequest request, byte[] data, IEnumerable<Task> asyncIterator, TaskCompletionSource<ElasticsearchResponse<Stream>> tcs)
 		{
 			var enumerator = asyncIterator.GetEnumerator();
 			Action<Task> recursiveBody = null;
@@ -353,7 +349,12 @@ public void Iterate(HttpWebRequest request, byte[] data, IEnumerable<Task> async
 			recursiveBody(null);
 		}
 
+		private int GetRequestTimeout(IRequestConfiguration requestConfiguration)
+		{
+			if (requestConfiguration != null && requestConfiguration.ConnectTimeout.HasValue)
+				return requestConfiguration.RequestTimeout.Value;
 
-
+			return this.ConnectionSettings.Timeout;
+		}
 	}
 }

src/Elasticsearch.Net/Connection/HttpConnection.cs

@@ -520,6 +520,7 @@ public FilterContainer Terms(Expression<Func<T, object>> fieldDescriptor, IEnume
 			ITermsFilter filter = new TermsFilterDescriptor();
 			filter.Field = fieldDescriptor;
 			filter.Terms = terms;
+		    filter.Execution = Execution;
 			return this.New(filter, f=>f.Terms = filter);
 		}
 
@@ -531,6 +532,7 @@ public FilterContainer Terms(string field, IEnumerable<string> terms, TermsExecu
 			ITermsFilter filter = new TermsFilterDescriptor();
 			filter.Field = field;
 			filter.Terms = terms ?? Enumerable.Empty<string>();
+            filter.Execution = Execution;
 			return this.New(filter, f=>f.Terms = filter);
 		}
 

src/Nest/DSL/Filter/FilterDescriptor.cs

@@ -33,16 +33,16 @@ public void FailoverShouldOnlyPingDeadNodes()
 			metrics.Requests.Count.Should().Be(4);
 			metrics.Requests[0].Node.Port.Should().Be(9202);
 			metrics.Requests[0].RequestType.Should().Be(RequestType.Ping);
-			metrics.Requests[0].EllapsedMilliseconds.Should().BeLessOrEqualTo(100);
+			metrics.Requests[0].EllapsedMilliseconds.Should().BeLessOrEqualTo(200);
 			metrics.Requests[1].Node.Port.Should().Be(9201);
 			metrics.Requests[1].RequestType.Should().Be(RequestType.Ping);
-			metrics.Requests[1].EllapsedMilliseconds.Should().BeLessOrEqualTo(100);
+			metrics.Requests[1].EllapsedMilliseconds.Should().BeLessOrEqualTo(200);
 			metrics.Requests[2].Node.Port.Should().Be(9200);
 			metrics.Requests[2].RequestType.Should().Be(RequestType.Ping);
-			metrics.Requests[2].EllapsedMilliseconds.Should().BeLessOrEqualTo(100);
+			metrics.Requests[2].EllapsedMilliseconds.Should().BeLessOrEqualTo(200);
 			metrics.Requests[3].Node.Port.Should().Be(9200);
 			metrics.Requests[3].RequestType.Should().Be(RequestType.ElasticsearchCall);
-			metrics.Requests[3].EllapsedMilliseconds.Should().BeLessOrEqualTo(100);
+			metrics.Requests[3].EllapsedMilliseconds.Should().BeLessOrEqualTo(200);
 
 			rootNode = client.RootNodeInfo();
 			metrics = rootNode.ConnectionStatus.Metrics;

src/Tests/Nest.Tests.Integration/Failover/FailoverPingTests.cs

@@ -55,5 +55,7 @@ public class ElasticsearchProject
 
 		[ElasticProperty(Type=FieldType.Object)]
 		public Product Product { get; set; }
+
+        public string[] MyStringArrayField { get; set; }
 	}
 }

src/Tests/Nest.Tests.MockData/Domain/ElasticsearchProject.cs

@@ -52,6 +52,52 @@ public void TermsFilterWithCache()
 			Assert.True(json.JsonEquals(expected), json);
 		}
 
+        [Test]
+        public void TermsFilter_EnumerableOfStringOverLoad_WithNonDefaultExecutionSpecified_AppliesExecution()
+        {
+            var s = new SearchDescriptor<ElasticsearchProject>()
+                .From(0)
+                .Size(10)
+                .Filter(ff => ff
+                    .Terms(f => f.MyStringArrayField, new[] { "elasticsearch.pm" }, Execution: TermsExecution.Bool)
+                );
+
+            var json = TestElasticClient.Serialize(s);
+            var expected = @"{ from: 0, size: 10, 
+				filter : {
+						terms: {
+							""myStringArrayField"": [""elasticsearch.pm""],
+							execution: ""bool""
+						}
+
+					}
+			}";
+            Assert.True(json.JsonEquals(expected), json);
+        }
+
+        [Test]
+        public void TermsFilter_NonLambdaField_WithNonDefaultExecutionSpecified_AppliesExecution()
+        {
+            var s = new SearchDescriptor<ElasticsearchProject>()
+                .From(0)
+                .Size(10)
+                .Filter(ff => ff
+                    .Terms("myStringArrayField", new[] { "elasticsearch.pm" }, Execution: TermsExecution.Bool)
+                );
+
+            var json = TestElasticClient.Serialize(s);
+            var expected = @"{ from: 0, size: 10, 
+				filter : {
+						terms: {
+							""myStringArrayField"": [""elasticsearch.pm""],
+							execution: ""bool""
+						}
+
+					}
+			}";
+            Assert.True(json.JsonEquals(expected), json);
+        }
+
 		[Test]
 		public void TermsFilterWithConditionlessQueryWithCache()
 		{

src/Tests/Nest.Tests.Unit/Search/Filter/Singles/TermsFilterJson.cs

@@ -201,7 +201,8 @@ public void TestFieldsWithExclusionsByProperty()
 			""stupidIntIWantAsLong"",
 			""myAttachment"",
 			""myBinaryField"",
-			""product""
+			""product"",
+            ""myStringArrayField""
 		  ]
 		}";
 		  Assert.True(json.JsonEquals(expected));