Merge branch 'fix/1.x-metrics-aggs-script-file-id' into 1.x

Author: russcam

src/Nest/DSL/Aggregations/MetricAggregationBaseDescriptor.cs

@@ -14,6 +14,12 @@ public interface IMetricAggregator
 		[JsonProperty("script")]
 		string Script { get; set; }
 
+		[JsonProperty("script_id")]
+		string ScriptId { get; set; }
+
+		[JsonProperty("script_file")]
+		string ScriptFile { get; set; }
+
 		[JsonProperty("params")]
 		IDictionary<string, object> Params { get; set; }
 
@@ -26,6 +32,8 @@ public abstract class MetricAggregator : IMetricAggregator
 	{
 		public PropertyPathMarker Field { get; set; }
 		public string Script { get; set; }
+		public string ScriptId { get; set; }
+		public string ScriptFile { get; set; }
 		public IDictionary<string, object> Params { get; set; }
 		public string Language { get; set; }
 	}
@@ -40,6 +48,10 @@ public abstract class MetricAggregationBaseDescriptor<TMetricAggregation, T> : I
 
 		string IMetricAggregator.Script { get; set; }
 
+		string IMetricAggregator.ScriptId { get; set; }
+
+		string IMetricAggregator.ScriptFile { get; set; }
+
 		IDictionary<string, object> IMetricAggregator.Params { get; set; }
 
 		string IMetricAggregator.Language { get; set; }
@@ -62,6 +74,18 @@ public TMetricAggregation Script(string script)
 			return (TMetricAggregation)this;
 		}
 
+		public TMetricAggregation ScriptId(string script)
+		{
+			Self.ScriptId = script;
+			return (TMetricAggregation)this;
+		}
+
+		public TMetricAggregation ScriptFile(string script)
+		{
+			Self.ScriptId = script;
+			return (TMetricAggregation)this;
+		}
+
 		public TMetricAggregation Params(Func<FluentDictionary<string, object>, FluentDictionary<string, object>> paramSelector)
 		{
 			Self.Params = paramSelector(new FluentDictionary<string, object>());

src/Tests/Nest.Tests.Integration/Aggregations/MetricAggregationTests.cs

@@ -92,6 +92,47 @@ public void Max()
 			termBucket.Value.Should().HaveValue();
 		}
 
+		[Test]
+		[Ignore("script.inline: on must be set in elasticsearch.yml")]
+		public void ScriptMax()
+		{
+			var results = this.Client.Search<ElasticsearchProject>(s => s
+				.Size(0)
+				.Aggregations(a => a
+					.Max("value_agg", t => t.Script("doc['loc'].value"))
+				)
+			);
+			results.IsValid.Should().BeTrue();
+			var termBucket = results.Aggs.Max("value_agg");
+			termBucket.Should().NotBeNull();
+			termBucket.Value.Should().HaveValue();
+		}
+
+		[Test]
+		[Ignore("script.indexed: on must be set in elasticsearch.yml")]
+		public void ScriptIdMax()
+		{
+			var scriptResponse = this.Client.PutScript(p => p
+				.Script("doc['loc'].value")
+				.Lang(ScriptLang.Groovy)
+				.Id("loc-value")
+			);
+
+			scriptResponse.IsValid.Should().BeTrue();
+
+			var results = this.Client.Search<ElasticsearchProject>(s => s
+				.Size(0)
+				.Aggregations(a => a
+					.Max("value_agg", t => t.ScriptId("loc-value"))
+				)
+			);
+
+			results.IsValid.Should().BeTrue();
+			var termBucket = results.Aggs.Max("value_agg");
+			termBucket.Should().NotBeNull();
+			termBucket.Value.Should().HaveValue();
+		}
+
 		[Test]
 		public void Sum()
 		{