From 481d18d18101d7f66059bf4dc7b19520459c24d6 Mon Sep 17 00:00:00 2001 From: Russ Cam Date: Tue, 4 Feb 2020 17:04:06 +1000 Subject: [PATCH 1/2] Deprecate sort on ReindexOnServer Relates: #4341 Deprecate sorting in reindex elastic/elasticsearch#49458 (issue: elastic/elasticsearch#47567) Closes #4356 --- src/Nest/Document/Multiple/ReindexOnServer/ReindexSource.cs | 3 +++ .../Multiple/ReindexOnServer/ReindexOnServerApiTests.cs | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/src/Nest/Document/Multiple/ReindexOnServer/ReindexSource.cs b/src/Nest/Document/Multiple/ReindexOnServer/ReindexSource.cs index e456fd663d3..a8d619615b0 100644 --- a/src/Nest/Document/Multiple/ReindexOnServer/ReindexSource.cs +++ b/src/Nest/Document/Multiple/ReindexOnServer/ReindexSource.cs @@ -50,6 +50,7 @@ public interface IReindexSource /// in conjunction with /// [DataMember(Name ="sort")] + [Obsolete("Deprecated in 7.6.0. Instead consider using query filtering to find the desired subset of data.")] IList Sort { get; set; } /// @@ -78,6 +79,7 @@ public class ReindexSource : IReindexSource public ISlicedScroll Slice { get; set; } /// + [Obsolete("Deprecated in 7.6.0. Instead consider using query filtering to find the desired subset of data.")] public IList Sort { get; set; } /// @@ -100,6 +102,7 @@ public ReindexSourceDescriptor Query(Func, QueryC Assign(querySelector, (a, v) => a.Query = v?.Invoke(new QueryContainerDescriptor())); /// + [Obsolete("Deprecated in 7.6.0. Instead consider using query filtering to find the desired subset of data.")] public ReindexSourceDescriptor Sort(Func, IPromise>> selector) where T : class => Assign(selector, (a, v) => a.Sort = v?.Invoke(new SortDescriptor())?.Value); diff --git a/tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs b/tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs index ff52544ab40..3eae6e3387c 100644 --- a/tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs +++ b/tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs @@ -46,6 +46,8 @@ public ReindexOnServerApiTests(IntrusiveOperationCluster cluster, EndpointUsage protected override int ExpectStatusCode => 200; + // Sort is deprecated +#pragma warning disable 618 protected override Func Fluent => d => d .Source(s => s .Index(CallIsolatedValue) @@ -56,6 +58,7 @@ public ReindexOnServerApiTests(IntrusiveOperationCluster cluster, EndpointUsage .Query("bar") ) ) + .Sort(sort => sort .Ascending("id") ) @@ -69,6 +72,7 @@ public ReindexOnServerApiTests(IntrusiveOperationCluster cluster, EndpointUsage .Script(ss => ss.Source(PainlessScript)) .Conflicts(Conflicts.Proceed) .Refresh(); +#pragma warning restore 618 protected override HttpMethod HttpMethod => HttpMethod.POST; @@ -78,7 +82,9 @@ public ReindexOnServerApiTests(IntrusiveOperationCluster cluster, EndpointUsage { Index = CallIsolatedValue, Query = new MatchQuery { Field = Field(p => p.Flag), Query = "bar" }, +#pragma warning disable 618 Sort = new List { new FieldSort { Field = "id", Order = SortOrder.Ascending } }, +#pragma warning restore 618 Size = 100 }, Destination = new ReindexDestination From 68e3710b06d85b27dc93e281678385522b1dbc9e Mon Sep 17 00:00:00 2001 From: Russ Cam Date: Wed, 5 Feb 2020 13:24:14 +1000 Subject: [PATCH 2/2] Add pragmas for deprecated sort usage in tests --- .../Multiple/ReindexOnServer/ReindexOnServerSliceApiTests.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSliceApiTests.cs b/tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSliceApiTests.cs index 8ba75f12bdd..3a11719907b 100644 --- a/tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSliceApiTests.cs +++ b/tests/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerSliceApiTests.cs @@ -45,6 +45,7 @@ public ReindexOnServerSliceApiTests(IntrusiveOperationCluster cluster, EndpointU protected override int ExpectStatusCode => 200; +#pragma warning disable 618 protected override Func Fluent => d => d .Source(s => s .Index(CallIsolatedValue) @@ -69,6 +70,7 @@ public ReindexOnServerSliceApiTests(IntrusiveOperationCluster cluster, EndpointU ) .Conflicts(Conflicts.Proceed) .Refresh(); +#pragma warning restore 618 protected override HttpMethod HttpMethod => HttpMethod.POST; @@ -78,7 +80,9 @@ public ReindexOnServerSliceApiTests(IntrusiveOperationCluster cluster, EndpointU { Index = CallIsolatedValue, Query = new MatchAllQuery(), +#pragma warning disable 618 Sort = new List { new FieldSort { Field = "id", Order = SortOrder.Ascending } }, +#pragma warning restore 618 Size = 100, Slice = new SlicedScroll { Field = "id", Id = 0, Max = 2 } },