Fix #969: ignore_unavailable wasn't being added to the request body for _msearch

Author: gmarz

src/Nest/DSL/SearchDescriptor.cs

@@ -82,9 +82,11 @@ public interface ISearchRequest : IQueryPath<SearchRequestParameters>
 		string Preference { get; }
 
 		string Routing { get; }
-		
+
 		SearchType? SearchType { get;  }
-		
+
+		bool? IgnoreUnavalable { get; }
+
 		Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set;}
 
 		SearchRequestParameters QueryString { get; set; }
@@ -172,6 +174,12 @@ string ISearchRequest.Routing
 					: string.Join(",", routing);
 			}
 		}
+
+		bool? ISearchRequest.IgnoreUnavalable
+		{
+			get { return this.QueryString == null ? null : this.QueryString.GetQueryStringValue<bool?>("ignore_unavailable"); }
+		}
+
 		public Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
 
 		public SearchRequestParameters QueryString { get; set; }
@@ -233,6 +241,12 @@ string ISearchRequest.Routing
 					: string.Join(",", routing);
 			}
 		}
+
+		bool? ISearchRequest.IgnoreUnavalable
+		{
+			get { return this.QueryString == null ? null : this.QueryString.GetQueryStringValue<bool?>("ignore_unavailable");  }
+		}
+
 		public Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
 		public SearchRequestParameters QueryString { get; set; }
 	}
@@ -273,6 +287,11 @@ string ISearchRequest.Routing
 			}
 		}
 
+		bool? ISearchRequest.IgnoreUnavalable
+		{
+			get { return this.Request.RequestParameters.GetQueryStringValue<bool?>("ignore_unavailable"); }
+		}
+
 		Type ISearchRequest.ClrType { get { return typeof(T); } }
 
 		/// <summary>

src/Nest/ExposedInternals/NestSerializer.cs

@@ -288,7 +288,8 @@ public string SerializeMultiSearch(IMultiSearchRequest multiSearchRequest)
 					type = path.Type,
 					search_type = this.GetSearchType(operation, multiSearchRequest),
 					preference = operation.Preference,
-					routing = operation.Routing
+					routing = operation.Routing,
+					ignore_unavailable = operation.IgnoreUnavalable
 				};
 				var opJson = this.Serialize(op, SerializationFormatting.None).Utf8String();
 

src/Tests/Nest.Tests.Integration/Core/MultiSearch/MultiSearchTests.cs

@@ -58,6 +58,7 @@ public void MultipleComplexSearches()
 		{
 			var result = this.Client.MultiSearch(b => b
 				.Search<ElasticsearchProject>(s => s
+					.IgnoreUnavailable()
 					.Query(q=>q.Term(p=>p.Name, "NEST"))
 					.Filter(f => f.Term(p => p.Name, "NEST"))
 					.FacetTerm(tf=>tf.OnField(p=>p.Name).Global())

src/Tests/Nest.Tests.Unit/Core/MultiSearch/MultiSearchRespectsSearchTypePreferenceAndRouting.json

@@ -55,11 +55,12 @@ public void MultiSearchFixedIndexAndType()
 			uri.AbsolutePath.Should().Be("/myindex/mytype/_msearch");
 		}
 		[Test]
-		public void MultiSearchRespectsSearchTypePreferenceAndRouting()
+		public void MultiSearchHeaderParts()
 		{
 			var result = this._client.MultiSearch(b => b
 				.FixedPath("myindex", "mytype")
 				.Search<ElasticsearchProject>(s => s
+					.IgnoreUnavailable()
 					.Index("myindex2")
 					.Type("mytype2")
 					.MatchAll()
@@ -73,6 +74,7 @@ public void MultiSearchRespectsSearchTypePreferenceAndRouting()
 					.Routing("customvalue2")
 					.SearchType(SearchType.Count))
 				.Search<ElasticsearchProject>(s => s
+					.IgnoreUnavailable()
 					.MatchAll()
 					.Preference("_primary")
 					.Routing("customvalue1")
@@ -87,9 +89,9 @@ public void MultiSearchRespectsSearchTypePreferenceAndRouting()
 			uri.AbsolutePath.Should().Be("/myindex/mytype/_msearch");
 			var results = new[]
 			{
-				@"{""index"":""myindex2"",""type"":""mytype2"",""search_type"":""dfs_query_and_fetch"",""preference"":""_primary"",""routing"":""customvalue1""}",
+				@"{""index"":""myindex2"",""type"":""mytype2"",""search_type"":""dfs_query_and_fetch"",""preference"":""_primary"",""routing"":""customvalue1"",""ignore_unavailable"":true}",
 				@"{""index"":""myindex2"",""type"":""mytype2"",""search_type"":""count"",""preference"":""_primary_first"",""routing"":""customvalue2""}",
-				@"{""type"":""mytype"",""search_type"":""dfs_query_and_fetch"",""preference"":""_primary"",""routing"":""customvalue1""}",
+				@"{""type"":""mytype"",""search_type"":""dfs_query_and_fetch"",""preference"":""_primary"",""routing"":""customvalue1"",""ignore_unavailable"":true}",
 				@"{""type"":""mytype"",""search_type"":""count"",""preference"":""_primary_first"",""routing"":""customvalue2""}"
 			};
 

src/Tests/Nest.Tests.Unit/Core/MultiSearch/MultiSearchTests.cs

@@ -645,9 +645,6 @@
     <None Include="Core\MultiPercolate\MultiPercolateJson.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="Core\MultiSearch\MultiSearchRespectsSearchTypePreferenceAndRouting.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="Core\UpdateSettings\AllUpdateSettings.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>