Skip to content

Commit e92b893

Browse files
Stuart CamMpdreamz
authored andcommitted
Feature/6.0 breaking changes (#2944)
* Breaking Changes Document API Changes - version type force remove - Deleted enum value - found field removed in the Delete API - Deleted property Mapping Changes - The include_in_all mapping parameter is now disallowed - Deleted all IncludeInAll and include_in_all references * The deprecated min_word_len (a synonym for min_word_length) and max_word_len (a synonym for max_word_length) have been removed. * Support custom normalizer in Analyze API Analyze API can analyze normalizer and custom normalizer. In previous versions of Elasticsearch, Analyze API is requiring a tokenizer or analyzer parameter. In Elasticsearch 6.0.0, Analyze API can analyze a text as a keyword field with custom normalizer or if char_filter/filter is set and tokenizer/analyzer is not set. * For geo_distance queries, sorting, and aggregations the sloppy_arc option has been removed from the distance_type parameter. * The disable_coord parameter of the bool and common_terms queries has been removed. If provided, it will be ignored and issue a deprecation warning. * The split_on_whitespace parameter for the query_string query has been removed. If provided, it will be ignored and issue a deprecation warning. The query_string query now splits on operator only. * The use_dis_max parameter for the query_string query has been removed. If provided, it will be ignored and issue a deprecation warning. The tie_breaker parameter must be used instead. * The auto_generate_phrase_queries parameter for the query_string query has been removed, use an explicit quoted query instead. If provided, it will be ignored and issue a deprecation warning. * The all_fields parameter for the query_string has been removed. Also removed from simple_query_string. * The deprecated multi term rewrite parameters constant_score_auto, constant_score_filter (synonyms for constant_score) have been removed. * The postings highlighter has been removed from Lucene and Elasticsearch. The unified highlighter outputs the same highlighting when index_options is set to offsets. * Store throttling has been removed. As a consequence, the indices.store.throttle.type and indices.store.throttle.max_bytes_per_sec cluster settings and the index.store.throttle.type and index.store.throttle.max_bytes_per_sec index settings are not recognized anymore. * Removal of throttle_time in the store stats. Given that store throttling has been removed, the store stats do not report throttle_time anymore. * FS stats no longer reports if the disk spins Elasticsearch has defaulted to assuming that it is running on SSDs since the 2.x series of Elasticsearch. As such, Elasticsearch no longer needs to collect information from the operating system as to whether or not the underlying disks of each data path spin or not. While this functionality was no longer needed starting in the 2.x series of Elasticsearch, it was maintained in the filesystem section of the nodes stats APIs. This information has now been removed. * Fix tests
1 parent 2e08191 commit e92b893

File tree

33 files changed

+133
-283
lines changed

33 files changed

+133
-283
lines changed

src/Elasticsearch.Net/Domain/Enums.Generated.cs

Lines changed: 96 additions & 99 deletions
Large diffs are not rendered by default.

src/Nest/Cluster/NodesStats/NodeStats.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,8 +390,6 @@ public class DataPathStats
390390
public string Mount { get; internal set; }
391391
[JsonProperty("type")]
392392
public string Type { get; internal set; }
393-
[JsonProperty("spins")]
394-
public bool? Spins { get; internal set; }
395393
[JsonProperty("total")]
396394
public string Total { get; internal set; }
397395
[JsonProperty("total_in_bytes")]

src/Nest/CommonOptions/Geo/GeoDistanceType.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ namespace Nest
77
[JsonConverter(typeof(StringEnumConverter))]
88
public enum GeoDistanceType
99
{
10-
[EnumMember(Value = "sloppy_arc")]
11-
SloppyArc,
1210
[EnumMember(Value = "arc")]
1311
Arc,
1412
[EnumMember(Value = "plane")]
1513
Plane
1614
}
17-
}
15+
}

src/Nest/CommonOptions/Stats/StoreStats.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ public class StoreStats
1111
[JsonProperty("size_in_bytes")]
1212
public double SizeInBytes { get; set; }
1313

14-
[JsonProperty("throttle_time")]
15-
public string ThrottleTime { get; set; }
16-
1714
[JsonProperty("throttle_time_in_millis")]
1815
public long ThrottleTimeInMilliseconds { get; set; }
1916
}

src/Nest/Document/Multiple/Bulk/BulkResponseItem/BulkDeleteResponseItem.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ namespace Nest
77
public class BulkDeleteResponseItem : BulkResponseItemBase
88
{
99
public override string Operation { get; internal set; }
10-
[JsonProperty("found")]
11-
public bool Found { get; internal set; }
1210
}
13-
}
11+
}

src/Nest/Indices/Analyze/AnalyzeRequest.cs

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ public partial interface IAnalyzeRequest
1313
[JsonProperty("analyzer")]
1414
string Analyzer { get; set; }
1515

16+
///<summary>The name of the normalizer to use</summary>
17+
[JsonProperty("normalizer")]
18+
string Normalizer { get; set; }
19+
1620
///<summary>A collection of character filters to use for the analysis</summary>
1721
[JsonProperty("char_filter")]
1822
string[] CharFilter { get; set; }
@@ -42,29 +46,33 @@ public AnalyzeRequest(IndexName indices, string textToAnalyze)
4246
this.Text = new[] { textToAnalyze };
4347
}
4448

45-
///<summary>The name of the analyzer to use</summary>
49+
/// <inheritdoc />
4650
public string Analyzer { get; set; }
4751

48-
///<summary>A collection of character filters to use for the analysis</summary>
52+
/// <inheritdoc />
53+
public string Normalizer { get; set; }
54+
55+
/// <inheritdoc />
4956
public string[] CharFilter { get; set; }
5057

51-
///<summary>A collection of filters to use for the analysis</summary>
52-
public string[] Filter { get; set; }
58+
/// <inheritdoc />
59+
public string[] Filter { get; set; }
5360

54-
///<summary>Use the analyzer configured for this field (instead of passing the analyzer name)</summary>
61+
/// <inheritdoc />
5562
public Field Field { get; set; }
5663

57-
///<summary>The text on which the analysis should be performed</summary>
64+
/// <inheritdoc />
5865
public string[] Text { get; set; }
5966

60-
///<summary>The name of the tokenizer to use for the analysis</summary>
67+
/// <inheritdoc />
6168
public string Tokenizer { get; set; }
6269
}
6370

6471
[DescriptorFor("IndicesAnalyze")]
6572
public partial class AnalyzeDescriptor
6673
{
6774
string IAnalyzeRequest.Analyzer { get; set; }
75+
string IAnalyzeRequest.Normalizer { get; set; }
6876
string[] IAnalyzeRequest.CharFilter { get; set; }
6977
string[] IAnalyzeRequest.Filter { get; set; }
7078
Field IAnalyzeRequest.Field { get; set; }
@@ -74,6 +82,9 @@ public partial class AnalyzeDescriptor
7482
///<summary>The name of the analyzer to use</summary>
7583
public AnalyzeDescriptor Analyzer(string analyser) => Assign(a => a.Analyzer = analyser);
7684

85+
///<summary>The name of the normalizer to use</summary>
86+
public AnalyzeDescriptor Normalizer(string normalizer) => Assign(a => a.Normalizer = normalizer);
87+
7788
///<summary>A collection of character filters to use for the analysis</summary>
7889
public AnalyzeDescriptor CharFilter(params string[] charFilter) => Assign(a => a.CharFilter = charFilter);
7990

src/Nest/Indices/IndexSettings/IndexTemplates/GetIndexTemplate/TemplateMapping.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
32
using Newtonsoft.Json;
43

54
namespace Nest

src/Nest/Indices/MappingManagement/PutMapping/PutMappingRequest.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ internal PutMappingRequest() { }
2121
/// <inheritdoc/>
2222
public bool? DateDetection { get; set; }
2323
/// <inheritdoc/>
24-
public bool? IncludeInAll { get; set; }
25-
/// <inheritdoc/>
2624
public IEnumerable<string> DynamicDateFormats { get; set; }
2725
/// <inheritdoc/>
2826
public IDynamicTemplateContainer DynamicTemplates { get; set; }
@@ -61,8 +59,6 @@ public PutMappingRequest() : this(typeof(T), typeof(T)) { }
6159
/// <inheritdoc/>
6260
public bool? DateDetection { get; set; }
6361
/// <inheritdoc/>
64-
public bool? IncludeInAll { get; set; }
65-
/// <inheritdoc/>
6662
public IEnumerable<string> DynamicDateFormats { get; set; }
6763
/// <inheritdoc/>
6864
public IDynamicTemplateContainer DynamicTemplates { get; set; }
@@ -102,7 +98,6 @@ public PutMappingDescriptor(IndexName index, TypeName type) : base(r=>r.Required
10298

10399
IAllField ITypeMapping.AllField { get; set; }
104100
bool? ITypeMapping.DateDetection { get; set; }
105-
bool? ITypeMapping.IncludeInAll { get; set; }
106101
IEnumerable<string> ITypeMapping.DynamicDateFormats { get; set; }
107102
string ITypeMapping.Analyzer { get; set; }
108103
string ITypeMapping.SearchAnalyzer { get; set; }
@@ -136,9 +131,6 @@ public PutMappingDescriptor<T> AutoMap(IPropertyVisitor visitor = null, int maxR
136131
/// <inheritdoc/>
137132
public PutMappingDescriptor<T> Dynamic(bool dynamic = true) => Assign(a => a.Dynamic = dynamic);
138133

139-
/// <inheritdoc/>
140-
public PutMappingDescriptor<T> IncludeInAll(bool include = true) => Assign(a => a.IncludeInAll = include);
141-
142134
/// <inheritdoc/>
143135
public PutMappingDescriptor<T> Parent(TypeName parentType) => Assign(a => a.ParentField = new ParentField { Type = parentType });
144136

src/Nest/Mapping/TypeMapping.cs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ public interface ITypeMapping
1717
[JsonProperty("numeric_detection")]
1818
bool? NumericDetection { get; set; }
1919

20-
[JsonProperty("include_in_all")]
21-
bool? IncludeInAll { get; set; }
22-
2320
[Obsolete("Scheduled to be removed in 6.0. Default analyzers can no longer be specified at the type level. Use an index or field level analyzer instead.")]
2421
[JsonProperty("analyzer")]
2522
string Analyzer { get; set; }
@@ -70,8 +67,6 @@ public class TypeMapping : ITypeMapping
7067
/// <inheritdoc/>
7168
public bool? DateDetection { get; set; }
7269
/// <inheritdoc/>
73-
public bool? IncludeInAll { get; set; }
74-
/// <inheritdoc/>
7570
public Union<bool, DynamicMapping> Dynamic { get; set; }
7671
/// <inheritdoc/>
7772
public IEnumerable<string> DynamicDateFormats { get; set; }
@@ -109,7 +104,6 @@ public class TypeMappingDescriptor<T> : DescriptorBase<TypeMappingDescriptor<T>,
109104
{
110105
IAllField ITypeMapping.AllField { get; set; }
111106
bool? ITypeMapping.DateDetection { get; set; }
112-
bool? ITypeMapping.IncludeInAll { get; set; }
113107
Union<bool, DynamicMapping> ITypeMapping.Dynamic { get; set; }
114108
IEnumerable<string> ITypeMapping.DynamicDateFormats { get; set; }
115109
IDynamicTemplateContainer ITypeMapping.DynamicTemplates { get; set; }
@@ -156,9 +150,6 @@ public TypeMappingDescriptor<T> AutoMap<TDocument>(IPropertyVisitor visitor = nu
156150
/// <inheritdoc/>
157151
public TypeMappingDescriptor<T> Dynamic(bool dynamic = true) => Assign(a => a.Dynamic = dynamic);
158152

159-
/// <inheritdoc/>
160-
public TypeMappingDescriptor<T> IncludeInAll(bool include = true) => Assign(a => a.IncludeInAll = include);
161-
162153
/// <inheritdoc/>
163154
public TypeMappingDescriptor<T> Parent(TypeName parentType) => Assign(a => a.ParentField = new ParentField { Type = parentType });
164155

src/Nest/Mapping/Types/Complex/Object/ObjectAttribute.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@ protected ObjectAttribute(Type type) : base(type) { }
1414

1515
Union<bool, DynamicMapping> IObjectProperty.Dynamic { get; set; }
1616
bool? IObjectProperty.Enabled { get; set; }
17-
bool? IObjectProperty.IncludeInAll { get; set; }
1817
IProperties IObjectProperty.Properties { get; set; }
1918

2019
public bool Enabled { get { return Self.Enabled.GetValueOrDefault(); } set { Self.Enabled = value; } }
21-
public bool IncludeInAll { get { return Self.IncludeInAll.GetValueOrDefault(); } set { Self.IncludeInAll = value; } }
22-
2320
}
2421
}

0 commit comments

Comments
 (0)