Mapping time boost was removed in 7.10 (#5089)

Mpdreamz · web-flow · commit 8156db4972ab · 2020-11-12T11:56:04.000+01:00
* Mapping time boost was removed in 7.10

This was always a NOOP on the server and was removed from the server.

Here we obsolete them with a compiler warning

* fix testcase still sending Boost
diff --git a/src/Nest/Mapping/Types/Core/Number/NumberAttribute.cs b/src/Nest/Mapping/Types/Core/Number/NumberAttribute.cs
@@ -16,8 +16,10 @@ public NumberAttribute(NumberType type) : base(type.ToFieldType()) { }
 
 		public double Boost
 		{
+#pragma warning disable 618
 			get => Self.Boost.GetValueOrDefault();
 			set => Self.Boost = value;
+#pragma warning restore 618
 		}
 
 		public bool Coerce
diff --git a/src/Nest/Mapping/Types/Core/Number/NumberProperty.cs b/src/Nest/Mapping/Types/Core/Number/NumberProperty.cs
@@ -16,6 +16,7 @@ namespace Nest
 	[InterfaceDataContract]
 	public interface INumberProperty : IDocValuesProperty
 	{
+		[Obsolete("The server always treated this as a noop and has been removed in 7.10")]
 		[DataMember(Name = "boost")]
 		double? Boost { get; set; }
 
@@ -79,6 +80,7 @@ protected NumberPropertyDescriptorBase(FieldType type) : base(type) { }
 
 		public TDescriptor Index(bool? index = true) => Assign(index, (a, v) => a.Index = v);
 
+		[Obsolete("The server always treated this as a noop and has been removed in 7.10")]
 		public TDescriptor Boost(double? boost) => Assign(boost, (a, v) => a.Boost = v);
 
 		public TDescriptor NullValue(double? nullValue) => Assign(nullValue, (a, v) => a.NullValue = v);
diff --git a/src/Nest/Mapping/Types/Core/Range/RangePropertyAttributeBase.cs b/src/Nest/Mapping/Types/Core/Range/RangePropertyAttributeBase.cs
@@ -10,8 +10,10 @@ protected RangePropertyAttributeBase(RangeType type) : base(type.ToFieldType())
 
 		public double Boost
 		{
+#pragma warning disable 618
 			get => Self.Boost.GetValueOrDefault();
 			set => Self.Boost = value;
+#pragma warning restore 618
 		}
 
 		public bool Coerce
diff --git a/src/Nest/Mapping/Types/Core/Range/RangePropertyBase.cs b/src/Nest/Mapping/Types/Core/Range/RangePropertyBase.cs
@@ -2,6 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System;
 using System.Runtime.Serialization;
 using Elasticsearch.Net.Utf8Json;
 
@@ -13,6 +14,7 @@ public interface IRangeProperty : IDocValuesProperty
 		/// <summary>
 		/// Mapping field-level query time boosting. Accepts a floating point number, defaults to 1.0.
 		/// </summary>
+		[Obsolete("The server always treated this as a noop and has been removed in 7.10")]
 		[DataMember(Name ="boost")]
 		double? Boost { get; set; }
 
@@ -59,6 +61,7 @@ protected RangePropertyDescriptorBase(RangeType type) : base(type.ToFieldType())
 		public TDescriptor Coerce(bool? coerce = true) => Assign(coerce, (a, v) => a.Coerce = v);
 
 		/// <inheritdoc cref="IRangeProperty.Boost" />
+		[Obsolete("The server always treated this as a noop and has been removed in 7.10")]
 		public TDescriptor Boost(double? boost) => Assign(boost, (a, v) => a.Boost = v);
 
 		/// <inheritdoc cref="IRangeProperty.Index" />
diff --git a/src/Nest/Mapping/Types/Specialized/Ip/IpAttribute.cs b/src/Nest/Mapping/Types/Specialized/Ip/IpAttribute.cs
@@ -2,12 +2,15 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System;
+
 namespace Nest
 {
 	public class IpAttribute : ElasticsearchDocValuesPropertyAttributeBase, IIpProperty
 	{
 		public IpAttribute() : base(FieldType.Ip) { }
 
+		[Obsolete("The server always treated this as a noop and has been removed in 7.10")]
 		public double Boost
 		{
 			get => Self.Boost.GetValueOrDefault();
diff --git a/src/Nest/Mapping/Types/Specialized/Ip/IpProperty.cs b/src/Nest/Mapping/Types/Specialized/Ip/IpProperty.cs
@@ -2,6 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System;
 using System.Diagnostics;
 using System.Runtime.Serialization;
 using Elasticsearch.Net.Utf8Json;
@@ -14,6 +15,7 @@ namespace Nest
 	[InterfaceDataContract]
 	public interface IIpProperty : IDocValuesProperty
 	{
+		[Obsolete("The server always treated this as a noop and has been removed in 7.10")]
 		[DataMember(Name ="boost")]
 		double? Boost { get; set; }
 
@@ -49,6 +51,7 @@ public IpPropertyDescriptor() : base(FieldType.Ip) { }
 
 		public IpPropertyDescriptor<T> Index(bool? index = true) => Assign(index, (a, v) => a.Index = v);
 
+		[Obsolete("The server always treated this as a noop and has been removed in 7.10")]
 		public IpPropertyDescriptor<T> Boost(double? boost) => Assign(boost, (a, v) => a.Boost = v);
 
 		public IpPropertyDescriptor<T> NullValue(string nullValue) => Assign(nullValue, (a, v) => a.NullValue = v);
diff --git a/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountAttribute.cs b/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountAttribute.cs
@@ -16,8 +16,10 @@ public string Analyzer
 
 		public double Boost
 		{
+#pragma warning disable 618
 			get => Self.Boost.GetValueOrDefault();
 			set => Self.Boost = value;
+#pragma warning restore 618
 		}
 
 		public bool Index
diff --git a/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountProperty.cs b/src/Nest/Mapping/Types/Specialized/TokenCount/TokenCountProperty.cs
@@ -2,6 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System;
 using System.Diagnostics;
 using System.Runtime.Serialization;
 using Elasticsearch.Net.Utf8Json;
@@ -18,6 +19,7 @@ public interface ITokenCountProperty : IDocValuesProperty
 		[DataMember(Name ="analyzer")]
 		string Analyzer { get; set; }
 
+		[Obsolete("The server always treated this as a noop and has been removed in 7.10")]
 		[DataMember(Name ="boost")]
 		double? Boost { get; set; }
 
@@ -58,6 +60,7 @@ public TokenCountPropertyDescriptor() : base(FieldType.TokenCount) { }
 
 		public TokenCountPropertyDescriptor<T> Analyzer(string analyzer) => Assign(analyzer, (a, v) => a.Analyzer = v);
 
+		[Obsolete("The server always treated this as a noop and has been removed in 7.10")]
 		public TokenCountPropertyDescriptor<T> Boost(double? boost) => Assign(boost, (a, v) => a.Boost = v);
 
 		public TokenCountPropertyDescriptor<T> Index(bool? index = true) => Assign(index, (a, v) => a.Index = v);
diff --git a/tests/Tests/ClientConcepts/Troubleshooting/DebuggerDisplayTests.cs b/tests/Tests/ClientConcepts/Troubleshooting/DebuggerDisplayTests.cs
@@ -132,7 +132,7 @@ [U] public void TaskId()
 		public void MappingProperties()
 		{
 			var nested = new NestedProperty() { Name = "hello" };
-			var ip = new IpPropertyDescriptor<Project>().Name("field").Boost(2);
+			var ip = new IpPropertyDescriptor<Project>().Name("field");
 
 			DebugFor(nested).Should().StartWith("Type: nested");
 			DebugFor(ip).Should().StartWith("Type: ip");
diff --git a/tests/Tests/Mapping/Types/Core/Number/NumberPropertyTests.cs b/tests/Tests/Mapping/Types/Core/Number/NumberPropertyTests.cs
@@ -25,7 +25,6 @@ public NumberPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(
 					similarity = "BM25",
 					store = true,
 					index = false,
-					boost = 1.5,
 					null_value = 0.0,
 					ignore_malformed = true,
 					coerce = true
@@ -41,7 +40,6 @@ public NumberPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(
 				.Similarity("BM25")
 				.Store()
 				.Index(false)
-				.Boost(1.5)
 				.NullValue(0.0)
 				.IgnoreMalformed()
 				.Coerce()
@@ -57,7 +55,6 @@ public NumberPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(
 					Similarity = "BM25",
 					Store = true,
 					Index = false,
-					Boost = 1.5,
 					NullValue = 0.0,
 					IgnoreMalformed = true,
 					Coerce = true
@@ -82,7 +79,6 @@ public ScaledFloatNumberPropertyTests(WritableCluster cluster, EndpointUsage usa
 					similarity = "BM25",
 					store = true,
 					index = false,
-					boost = 1.5,
 					null_value = 0.0,
 					ignore_malformed = true,
 					coerce = true
@@ -99,7 +95,6 @@ public ScaledFloatNumberPropertyTests(WritableCluster cluster, EndpointUsage usa
 				.Similarity("BM25")
 				.Store()
 				.Index(false)
-				.Boost(1.5)
 				.NullValue(0.0)
 				.IgnoreMalformed()
 				.Coerce()
@@ -116,7 +111,6 @@ public ScaledFloatNumberPropertyTests(WritableCluster cluster, EndpointUsage usa
 					Similarity = "BM25",
 					Store = true,
 					Index = false,
-					Boost = 1.5,
 					NullValue = 0.0,
 					IgnoreMalformed = true,
 					Coerce = true
diff --git a/tests/Tests/Mapping/Types/Core/Range/DateRange/DateRangePropertyTests.cs b/tests/Tests/Mapping/Types/Core/Range/DateRange/DateRangePropertyTests.cs
@@ -30,7 +30,6 @@ public DateRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : ba
 							type = "date_range",
 							store = true,
 							index = false,
-							boost = 1.5,
 							coerce = true
 						}
 					}
@@ -46,7 +45,6 @@ public DateRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : ba
 						.Name(p => p.Dates)
 						.Store()
 						.Index(false)
-						.Boost(1.5)
 						.Coerce()
 					)
 				)
@@ -65,7 +63,6 @@ public DateRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : ba
 							{
 								Store = true,
 								Index = false,
-								Boost = 1.5,
 								Coerce = true
 							}
 						}
diff --git a/tests/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangePropertyTests.cs b/tests/Tests/Mapping/Types/Core/Range/DoubleRange/DoubleRangePropertyTests.cs
@@ -30,7 +30,6 @@ public DoubleRangePropertyTests(WritableCluster cluster, EndpointUsage usage) :
 							type = "double_range",
 							store = true,
 							index = false,
-							boost = 1.5,
 							coerce = true
 						}
 					}
@@ -46,7 +45,6 @@ public DoubleRangePropertyTests(WritableCluster cluster, EndpointUsage usage) :
 						.Name(p => p.Doubles)
 						.Store()
 						.Index(false)
-						.Boost(1.5)
 						.Coerce()
 					)
 				)
@@ -65,7 +63,6 @@ public DoubleRangePropertyTests(WritableCluster cluster, EndpointUsage usage) :
 							{
 								Store = true,
 								Index = false,
-								Boost = 1.5,
 								Coerce = true
 							}
 						}
diff --git a/tests/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangePropertyTests.cs b/tests/Tests/Mapping/Types/Core/Range/FloatRange/FloatRangePropertyTests.cs
@@ -30,7 +30,6 @@ public FloatRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : b
 							type = "float_range",
 							store = true,
 							index = false,
-							boost = 1.5,
 							coerce = true
 						}
 					}
@@ -46,7 +45,6 @@ public FloatRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : b
 						.Name(p => p.Floats)
 						.Store()
 						.Index(false)
-						.Boost(1.5)
 						.Coerce()
 					)
 				)
@@ -65,7 +63,6 @@ public FloatRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : b
 							{
 								Store = true,
 								Index = false,
-								Boost = 1.5,
 								Coerce = true
 							}
 						}
diff --git a/tests/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangePropertyTests.cs b/tests/Tests/Mapping/Types/Core/Range/IntegerRange/IntegerRangePropertyTests.cs
@@ -30,7 +30,6 @@ public IntegerRangePropertyTests(WritableCluster cluster, EndpointUsage usage) :
 							type = "integer_range",
 							store = true,
 							index = false,
-							boost = 1.5,
 							coerce = true
 						}
 					}
@@ -46,7 +45,6 @@ public IntegerRangePropertyTests(WritableCluster cluster, EndpointUsage usage) :
 						.Name(p => p.Integers)
 						.Store()
 						.Index(false)
-						.Boost(1.5)
 						.Coerce()
 					)
 				)
@@ -65,7 +63,6 @@ public IntegerRangePropertyTests(WritableCluster cluster, EndpointUsage usage) :
 							{
 								Store = true,
 								Index = false,
-								Boost = 1.5,
 								Coerce = true
 							}
 						}
diff --git a/tests/Tests/Mapping/Types/Core/Range/IpRange/IpRangePropertyTests.cs b/tests/Tests/Mapping/Types/Core/Range/IpRange/IpRangePropertyTests.cs
@@ -30,7 +30,6 @@ public IpRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : base
 							type = "ip_range",
 							store = true,
 							index = false,
-							boost = 1.5,
 							coerce = true
 						}
 					}
@@ -46,7 +45,6 @@ public IpRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : base
 						.Name(p => p.Ips)
 						.Store()
 						.Index(false)
-						.Boost(1.5)
 						.Coerce()
 					)
 				)
@@ -65,7 +63,6 @@ public IpRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : base
 							{
 								Store = true,
 								Index = false,
-								Boost = 1.5,
 								Coerce = true
 							}
 						}
diff --git a/tests/Tests/Mapping/Types/Core/Range/LongRange/LongRangePropertyTests.cs b/tests/Tests/Mapping/Types/Core/Range/LongRange/LongRangePropertyTests.cs
@@ -30,7 +30,6 @@ public LongRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : ba
 							type = "long_range",
 							store = true,
 							index = false,
-							boost = 1.5,
 							coerce = true
 						}
 					}
@@ -46,7 +45,6 @@ public LongRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : ba
 						.Name(p => p.Longs)
 						.Store()
 						.Index(false)
-						.Boost(1.5)
 						.Coerce()
 					)
 				)
@@ -65,7 +63,6 @@ public LongRangePropertyTests(WritableCluster cluster, EndpointUsage usage) : ba
 							{
 								Store = true,
 								Index = false,
-								Boost = 1.5,
 								Coerce = true
 							}
 						}
diff --git a/tests/Tests/Mapping/Types/Specialized/Ip/IpAttributeTests.cs b/tests/Tests/Mapping/Types/Specialized/Ip/IpAttributeTests.cs
@@ -10,7 +10,6 @@ public class IpTest
 	{
 		[Ip(
 			Index = false,
-			Boost = 1.3,
 			NullValue = "127.0.0.1")]
 		public string Full { get; set; }
 
@@ -28,7 +27,6 @@ public class IpAttributeTests : AttributeTestsBase<IpTest>
 				{
 					type = "ip",
 					index = false,
-					boost = 1.3,
 					null_value = "127.0.0.1"
 				},
 				minimal = new
diff --git a/tests/Tests/Mapping/Types/Specialized/Ip/IpPropertyTests.cs b/tests/Tests/Mapping/Types/Specialized/Ip/IpPropertyTests.cs
@@ -22,7 +22,6 @@ public IpPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(clus
 				{
 					type = "ip",
 					index = false,
-					boost = 1.3,
 					null_value = "127.0.0.1",
 					doc_values = true,
 					store = true,
@@ -34,7 +33,6 @@ public IpPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(clus
 			.Ip(s => s
 				.Name(p => p.Name)
 				.Index(false)
-				.Boost(1.3)
 				.NullValue("127.0.0.1")
 				.DocValues()
 				.Store()
@@ -47,7 +45,6 @@ public IpPropertyTests(WritableCluster cluster, EndpointUsage usage) : base(clus
 				"name", new IpProperty
 				{
 					Index = false,
-					Boost = 1.3,
 					NullValue = "127.0.0.1",
 					DocValues = true,
 					Store = true,
diff --git a/tests/Tests/Mapping/Types/Specialized/TokenCount/TokenCountPropertyTests.cs b/tests/Tests/Mapping/Types/Specialized/TokenCount/TokenCountPropertyTests.cs

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,10 @@ public NumberAttribute(NumberType type) : base(type.ToFieldType()) { }`
`16`	`16`
`17`	`17`	`public double Boost`
`18`	`18`	`{`
	`19`	`+#pragma warning disable 618`
`19`	`20`	`get => Self.Boost.GetValueOrDefault();`
`20`	`21`	`set => Self.Boost = value;`
	`22`	`+#pragma warning restore 618`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`public bool Coerce`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,10 @@ protected RangePropertyAttributeBase(RangeType type) : base(type.ToFieldType())`
`10`	`10`
`11`	`11`	`public double Boost`
`12`	`12`	`{`
	`13`	`+#pragma warning disable 618`
`13`	`14`	`get => Self.Boost.GetValueOrDefault();`
`14`	`15`	`set => Self.Boost = value;`
	`16`	`+#pragma warning restore 618`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`public bool Coerce`
Original file line number	Diff line number	Diff line change
`@@ -2,12 +2,15 @@`
`2`	`2`	`// Elasticsearch B.V licenses this file to you under the Apache 2.0 License.`
`3`	`3`	`// See the LICENSE file in the project root for more information`
`4`	`4`
	`5`	`+using System;`
	`6`	`+`
`5`	`7`	`namespace Nest`
`6`	`8`	`{`
`7`	`9`	`public class IpAttribute : ElasticsearchDocValuesPropertyAttributeBase, IIpProperty`
`8`	`10`	`{`
`9`	`11`	`public IpAttribute() : base(FieldType.Ip) { }`
`10`	`12`
	`13`	`+ [Obsolete("The server always treated this as a noop and has been removed in 7.10")]`
`11`	`14`	`public double Boost`
`12`	`15`	`{`
`13`	`16`	`get => Self.Boost.GetValueOrDefault();`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,10 @@ public string Analyzer`
`16`	`16`
`17`	`17`	`public double Boost`
`18`	`18`	`{`
	`19`	`+#pragma warning disable 618`
`19`	`20`	`get => Self.Boost.GetValueOrDefault();`
`20`	`21`	`set => Self.Boost = value;`
	`22`	`+#pragma warning restore 618`
`21`	`23`	`}`
`22`	`24`
`23`	`25`	`public bool Index`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ [U] public void TaskId()`
`132`	`132`	`public void MappingProperties()`
`133`	`133`	`{`
`134`	`134`	`var nested = new NestedProperty() { Name = "hello" };`
`135`		`- var ip = new IpPropertyDescriptor<Project>().Name("field").Boost(2);`
	`135`	`+ var ip = new IpPropertyDescriptor<Project>().Name("field");`
`136`	`136`
`137`	`137`	`DebugFor(nested).Should().StartWith("Type: nested");`
`138`	`138`	`DebugFor(ip).Should().StartWith("Type: ip");`