refresh and consistency no longer part of the bulk action but send through the querystring #394

Author: Mpdreamz

Diff for: src/Nest.Tests.Integration/Core/Bulk/BulkUpdateTests.cs

@@ -21,14 +21,13 @@ public void BulkUpdateObject()
 			result.IsValid.Should().BeTrue();
 
 			//Now lets update all of them giving them a name
-			descriptor = new BulkDescriptor();
+			descriptor = new BulkDescriptor().Refresh();
 			foreach (var i in Enumerable.Range(5000, 1000))
 			{
 				int id = i;
 				descriptor.Update<ElasticSearchProject, object>(op => op
 					.Object(new ElasticSearchProject { Id = id })
 					.Document(new { name = "SufixedName-" + id})
-					.Refresh()
 				);
 			}
 

Diff for: src/Nest.Tests.Unit/Core/Bulk/BulkUrlTests.cs

@@ -20,6 +20,23 @@ public void BulkNonFixed()
 			var uri = new Uri(result.ConnectionStatus.RequestUrl);
 			uri.AbsolutePath.Should().Be("/_bulk");
 		}
+
+		[Test]
+		public void BulkNonFixedWithParams()
+		{
+			var result = this._client.Bulk(b => b
+				.Refresh()
+				.Consistency(Consistency.Quorum)
+				.Index<ElasticSearchProject>(i => i.Object(new ElasticSearchProject {Id = 2}))
+				.Create<ElasticSearchProject>(i => i.Object(new ElasticSearchProject { Id = 3 }))
+				.Delete<ElasticSearchProject>(i => i.Object(new ElasticSearchProject { Id = 4 }))
+			);
+			var status = result.ConnectionStatus;
+			var uri = new Uri(result.ConnectionStatus.RequestUrl);
+			uri.AbsolutePath.Should().Be("/_bulk");
+			uri.Query.Should().Be("?refresh=true&consistency=quorem");
+		}
+
 		[Test]
 		public void BulkFixedIndex()
 		{

Diff for: src/Nest/DSL/BulkCreateDescriptor.cs

@@ -127,21 +127,5 @@ public BulkCreateDescriptor<T> Ttl(string ttl)
 			this._Ttl = ttl; 
 			return this;
 		}
-
-		public BulkCreateDescriptor<T> Consistency(Consistency consistency)
-		{
-			this._Consistency = consistency; 
-			return this;
-		}
-
-		public BulkCreateDescriptor<T> Refresh(bool refresh = true)
-		{
-			this._Refresh = refresh; 
-			return this;
-		}
-
-
-
-
 	}
 }

Diff for: src/Nest/DSL/BulkDeleteDescriptor.cs

@@ -127,21 +127,5 @@ public BulkDeleteDescriptor<T> Ttl(string ttl)
 			this._Ttl = ttl; 
 			return this;
 		}
-
-		public BulkDeleteDescriptor<T> Consistency(Consistency consistency)
-		{
-			this._Consistency = consistency; 
-			return this;
-		}
-
-		public BulkDeleteDescriptor<T> Refresh(bool refresh = true)
-		{
-			this._Refresh = refresh; 
-			return this;
-		}
-
-
-
-
 	}
 }

Diff for: src/Nest/DSL/BulkDescriptor.cs

@@ -5,6 +5,8 @@
 using System.Linq.Expressions;
 using Nest.Domain;
 using System.Collections.Concurrent;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 
 namespace Nest
@@ -14,7 +16,12 @@ public class BulkDescriptor
 		internal string _FixedIndex { get; set; }
 		internal string _FixedType { get; set; }
 
-    internal IList<BaseBulkOperation> _Operations = new SynchronizedCollection<BaseBulkOperation>();
+		[JsonConverter(typeof(StringEnumConverter))]
+		internal Consistency? _Consistency { get; set; }
+
+		internal bool? _Refresh { get; set; }
+
+		internal IList<BaseBulkOperation> _Operations = new SynchronizedCollection<BaseBulkOperation>();
 
 		public BulkDescriptor Create<T>(Func<BulkCreateDescriptor<T>, BulkCreateDescriptor<T>> bulkCreateSelector) where T : class
 		{
@@ -49,7 +56,7 @@ public BulkDescriptor Update<T>(Func<BulkUpdateDescriptor<T, T>, BulkUpdateDescr
 		{
 			return this.Update<T, T>(bulkUpdateSelector);
 		}
-		public BulkDescriptor Update<T, K>(Func<BulkUpdateDescriptor<T, K>, BulkUpdateDescriptor<T, K>> bulkUpdateSelector) 
+		public BulkDescriptor Update<T, K>(Func<BulkUpdateDescriptor<T, K>, BulkUpdateDescriptor<T, K>> bulkUpdateSelector)
 			where T : class
 			where K : class
 		{
@@ -61,6 +68,36 @@ public BulkDescriptor Update<T, K>(Func<BulkUpdateDescriptor<T, K>, BulkUpdateDe
 			return this;
 		}
 
+		/// <summary>
+		/// When making bulk calls, you can require a minimum number of active shards in the partition 
+		/// through the consistency parameter. The values allowed are one, quorum, and all. It defaults to the node level
+		/// setting of action.write_consistency, which in turn defaults to quorum.
+		/// <pre>
+		/// For example, in a N shards with 2 replicas index, there will have to be at least 2 active shards within the relevant partition (quorum) for the 
+		/// operation to succeed. In a N shards with 1 replica scenario, there will need to be a single shard active (in this case, one and quorum is the same).
+		/// </pre>
+		/// </summary>
+		/// <param name="consistency"></param>
+		/// <returns></returns>
+		public BulkDescriptor Consistency(Consistency consistency)
+		{
+			this._Consistency = consistency;
+			return this;
+		}
+
+		/// <summary>
+		/// The refresh parameter can be set to true in order to refresh the relevant shards immediately after the bulk operation has occurred and 
+		/// make it searchable, instead of waiting for the normal refresh interval to expire. 
+		/// Setting it to true can trigger additional load, and may slow down indexing.
+		/// </summary>
+		/// <param name="refresh"></param>
+		/// <returns></returns>
+		public BulkDescriptor Refresh(bool refresh = true)
+		{
+			this._Refresh = refresh;
+			return this;
+		}
+
 		/// <summary>
 		/// Allows you to perform the multiget on a fixed path. 
 		/// Each operation that doesn't specify an index or type will use this fixed index/type

Diff for: src/Nest/DSL/BulkIndexDescriptor.cs

@@ -133,21 +133,5 @@ public BulkIndexDescriptor<T> Ttl(string ttl)
 			this._Ttl = ttl; 
 			return this;
 		}
-
-		public BulkIndexDescriptor<T> Consistency(Consistency consistency)
-		{
-			this._Consistency = consistency; 
-			return this;
-		}
-
-		public BulkIndexDescriptor<T> Refresh(bool refresh = true)
-		{
-			this._Refresh = refresh; 
-			return this;
-		}
-
-
-
-
 	}
 }

Diff for: src/Nest/DSL/BulkUpdateDescriptor.cs

@@ -201,18 +201,6 @@ public BulkUpdateDescriptor<T, K> Ttl(string ttl)
 			return this;
 		}
 
-		public BulkUpdateDescriptor<T, K> Consistency(Consistency consistency)
-		{
-			this._Consistency = consistency; 
-			return this;
-		}
-
-		public BulkUpdateDescriptor<T, K> Refresh(bool refresh = true)
-		{
-			this._Refresh = refresh; 
-			return this;
-		}
-
 		public BulkUpdateDescriptor<T, K> RetriesOnConflict(int retriesOnConflict)
 		{
 			this._RetriesOnConflict = retriesOnConflict;

Diff for: src/Nest/Domain/Bulk/BaseBulkOperation.cs

@@ -41,12 +41,7 @@ public abstract class BaseBulkOperation
 		[JsonProperty("_ttl")]
 		internal string _Ttl { get; set; }
 
-		[JsonProperty("consistency")]
-		[JsonConverter(typeof(StringEnumConverter))]
-		internal Consistency? _Consistency { get; set; }
 
-		[JsonProperty("refresh ")]
-		internal bool? _Refresh { get; set; }
 
 		[JsonProperty("_retry_on_conflict")]
 		internal int? _RetriesOnConflict { get; set; }

Diff for: src/Nest/ElasticClient-Bulk.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Specialized;
 using System.Text.RegularExpressions;
 using System.Collections.Generic;
 using System.Linq;
@@ -66,6 +67,24 @@ private void GenerateBulkPathAndJson(BulkDescriptor bulkDescriptor, out string j
                     path = bulkDescriptor._FixedType + "/" + path;
                 path = bulkDescriptor._FixedIndex + "/" + path;
             }
+	        var queryString = new NameValueCollection();
+	        if (bulkDescriptor._Refresh.HasValue)
+		        queryString.Add("refresh", bulkDescriptor._Refresh.ToString().ToLowerInvariant());
+	        switch (bulkDescriptor._Consistency)
+	        {
+		        case Consistency.All:
+			        queryString.Add("consistency", "all");
+					break;
+				case Consistency.Quorum:
+					queryString.Add("consistency", "quorem");
+					break;
+				case Consistency.One:
+					queryString.Add("consistency", "one");
+					break;
+	        }
+	        if (queryString.HasKeys())
+		        path += queryString.ToQueryString();
+
         }
 		public IBulkResponse Bulk(BulkDescriptor bulkDescriptor)
 		{