From fc22350208a73b356fdb2a9cdd2e9aa5ddc7b748 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Fri, 18 Feb 2022 10:15:11 -0800 Subject: [PATCH] Update #2103 BWC Versions (#2173) Change BWC checks to 1.3 since #2103 was backported. Signed-off-by: Matt Weber --- .../test/search/230_interval_query.yml | 68 +++++++++---------- .../index/query/IntervalsSourceProvider.java | 8 +-- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml index 0742e76a8c5..f951fb2cc4c 100644 --- a/rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml +++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml @@ -32,8 +32,8 @@ setup: --- "Test ordered matching with via mode": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -80,8 +80,8 @@ setup: --- "Test explicit unordered matching via mode": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -115,7 +115,7 @@ setup: --- "Test unordered with overlap in match": - skip: - version: " - 1.99.99" + version: " - 1.2.99" reason: "Implemented in 2.0" - do: search: @@ -132,7 +132,7 @@ setup: --- "Test unordered with no overlap in match": - skip: - version: " - 1.99.99" + version: " - 1.2.99" reason: "Implemented in 2.0" - do: search: @@ -149,8 +149,8 @@ setup: --- "Test phrase matching": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -181,8 +181,8 @@ setup: --- "Test ordered max_gaps matching": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -199,8 +199,8 @@ setup: --- "Test ordered combination with disjunction via mode": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -250,8 +250,8 @@ setup: --- "Test ordered combination with max_gaps": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -272,8 +272,8 @@ setup: --- "Test ordered combination": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -293,8 +293,8 @@ setup: --- "Test unordered combination via mode": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -338,7 +338,7 @@ setup: --- "Test unordered combination with overlap": - skip: - version: " - 1.99.99" + version: " - 1.2.99" reason: "Implemented in 2.0" - do: search: @@ -361,7 +361,7 @@ setup: --- "Test unordered combination no overlap": - skip: - version: " - 1.99.99" + version: " - 1.2.99" reason: "Implemented in 2.0" - do: search: @@ -384,7 +384,7 @@ setup: --- "Test nested unordered combination with overlap": - skip: - version: " - 1.99.99" + version: " - 1.2.99" reason: "Implemented in 2.0" - do: search: @@ -409,7 +409,7 @@ setup: --- "Test nested unordered combination no overlap": - skip: - version: " - 1.99.99" + version: " - 1.2.99" reason: "Implemented in 2.0" - do: search: @@ -434,8 +434,8 @@ setup: --- "Test block combination": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -457,8 +457,8 @@ setup: --- "Test containing": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -483,8 +483,8 @@ setup: --- "Test not containing": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -508,8 +508,8 @@ setup: --- "Test contained_by": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -554,8 +554,8 @@ setup: --- "Test not_overlapping": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test @@ -584,8 +584,8 @@ setup: --- "Test overlapping": - skip: - version: " - 1.99.99" - reason: "mode introduced in 2.0" + version: " - 1.2.99" + reason: "mode introduced in 1.3" - do: search: index: test diff --git a/server/src/main/java/org/opensearch/index/query/IntervalsSourceProvider.java b/server/src/main/java/org/opensearch/index/query/IntervalsSourceProvider.java index 322c2551cd0..b610883e777 100644 --- a/server/src/main/java/org/opensearch/index/query/IntervalsSourceProvider.java +++ b/server/src/main/java/org/opensearch/index/query/IntervalsSourceProvider.java @@ -147,7 +147,7 @@ public abstract class IntervalsSourceProvider implements NamedWriteable, ToXCont public Match(StreamInput in) throws IOException { this.query = in.readString(); this.maxGaps = in.readVInt(); - if (in.getVersion().onOrAfter(Version.V_2_0_0)) { + if (in.getVersion().onOrAfter(Version.V_1_3_0)) { this.mode = IntervalMode.readFromStream(in); } else { if (in.readBoolean()) { @@ -219,7 +219,7 @@ public abstract class IntervalsSourceProvider implements NamedWriteable, ToXCont public void writeTo(StreamOutput out) throws IOException { out.writeString(query); out.writeVInt(maxGaps); - if (out.getVersion().onOrAfter(Version.V_2_0_0)) { + if (out.getVersion().onOrAfter(Version.V_1_3_0)) { mode.writeTo(out); } else { out.writeBoolean(mode == IntervalMode.ORDERED); @@ -431,7 +431,7 @@ public abstract class IntervalsSourceProvider implements NamedWriteable, ToXCont } public Combine(StreamInput in) throws IOException { - if (in.getVersion().onOrAfter(Version.V_2_0_0)) { + if (in.getVersion().onOrAfter(Version.V_1_3_0)) { this.mode = IntervalMode.readFromStream(in); } else { this.mode = in.readBoolean() ? IntervalMode.ORDERED : IntervalMode.UNORDERED; @@ -484,7 +484,7 @@ public abstract class IntervalsSourceProvider implements NamedWriteable, ToXCont @Override public void writeTo(StreamOutput out) throws IOException { - if (out.getVersion().onOrAfter(Version.V_2_0_0)) { + if (out.getVersion().onOrAfter(Version.V_1_3_0)) { mode.writeTo(out); } else { out.writeBoolean(mode == IntervalMode.ORDERED);