honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update #2103 BWC Versions (#2173) 

Change BWC checks to 1.3 since #2103 was backported.

Signed-off-by: Matt Weber <matt@mattweber.org>
This commit is contained in:
Matt Weber 2022-02-18 10:15:11 -08:00 committed by GitHub
parent 0e95bb9dff
commit fc22350208
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
rest-api-spec/src/main/resources/rest-api-spec/test/search/230_interval_query.yml
View File

@ -32,8 +32,8 @@ setup:
--- ---
"Test ordered matching with via mode": "Test ordered matching with via mode":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -80,8 +80,8 @@ setup:
--- ---
"Test explicit unordered matching via mode": "Test explicit unordered matching via mode":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -115,7 +115,7 @@ setup:
--- ---
"Test unordered with overlap in match": "Test unordered with overlap in match":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "Implemented in 2.0" reason: "Implemented in 2.0"
- do: - do:
search: search:
@ -132,7 +132,7 @@ setup:
--- ---
"Test unordered with no overlap in match": "Test unordered with no overlap in match":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "Implemented in 2.0" reason: "Implemented in 2.0"
- do: - do:
search: search:
@ -149,8 +149,8 @@ setup:
--- ---
"Test phrase matching": "Test phrase matching":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -181,8 +181,8 @@ setup:
--- ---
"Test ordered max_gaps matching": "Test ordered max_gaps matching":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -199,8 +199,8 @@ setup:
--- ---
"Test ordered combination with disjunction via mode": "Test ordered combination with disjunction via mode":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -250,8 +250,8 @@ setup:
--- ---
"Test ordered combination with max_gaps": "Test ordered combination with max_gaps":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -272,8 +272,8 @@ setup:
--- ---
"Test ordered combination": "Test ordered combination":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -293,8 +293,8 @@ setup:
--- ---
"Test unordered combination via mode": "Test unordered combination via mode":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -338,7 +338,7 @@ setup:
--- ---
"Test unordered combination with overlap": "Test unordered combination with overlap":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "Implemented in 2.0" reason: "Implemented in 2.0"
- do: - do:
search: search:
@ -361,7 +361,7 @@ setup:
--- ---
"Test unordered combination no overlap": "Test unordered combination no overlap":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "Implemented in 2.0" reason: "Implemented in 2.0"
- do: - do:
search: search:
@ -384,7 +384,7 @@ setup:
--- ---
"Test nested unordered combination with overlap": "Test nested unordered combination with overlap":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "Implemented in 2.0" reason: "Implemented in 2.0"
- do: - do:
search: search:
@ -409,7 +409,7 @@ setup:
--- ---
"Test nested unordered combination no overlap": "Test nested unordered combination no overlap":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "Implemented in 2.0" reason: "Implemented in 2.0"
- do: - do:
search: search:
@ -434,8 +434,8 @@ setup:
--- ---
"Test block combination": "Test block combination":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -457,8 +457,8 @@ setup:
--- ---
"Test containing": "Test containing":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -483,8 +483,8 @@ setup:
--- ---
"Test not containing": "Test not containing":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -508,8 +508,8 @@ setup:
--- ---
"Test contained_by": "Test contained_by":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -554,8 +554,8 @@ setup:
--- ---
"Test not_overlapping": "Test not_overlapping":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test
@ -584,8 +584,8 @@ setup:
--- ---
"Test overlapping": "Test overlapping":
- skip: - skip:
version: " - 1.99.99" version: " - 1.2.99"
reason: "mode introduced in 2.0" reason: "mode introduced in 1.3"
- do: - do:
search: search:
index: test index: test

8
server/src/main/java/org/opensearch/index/query/IntervalsSourceProvider.java
View File

@ -147,7 +147,7 @@ public abstract class IntervalsSourceProvider implements NamedWriteable, ToXCont
public Match(StreamInput in) throws IOException { public Match(StreamInput in) throws IOException {
this.query = in.readString(); this.query = in.readString();
this.maxGaps = in.readVInt(); 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); this.mode = IntervalMode.readFromStream(in);
} else { } else {
if (in.readBoolean()) { if (in.readBoolean()) {
@ -219,7 +219,7 @@ public abstract class IntervalsSourceProvider implements NamedWriteable, ToXCont
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
out.writeString(query); out.writeString(query);
out.writeVInt(maxGaps); out.writeVInt(maxGaps);
if (out.getVersion().onOrAfter(Version.V_2_0_0)) { if (out.getVersion().onOrAfter(Version.V_1_3_0)) {
mode.writeTo(out); mode.writeTo(out);
} else { } else {
out.writeBoolean(mode == IntervalMode.ORDERED); out.writeBoolean(mode == IntervalMode.ORDERED);
@ -431,7 +431,7 @@ public abstract class IntervalsSourceProvider implements NamedWriteable, ToXCont
} }
public Combine(StreamInput in) throws IOException { 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); this.mode = IntervalMode.readFromStream(in);
} else { } else {
this.mode = in.readBoolean() ? IntervalMode.ORDERED : IntervalMode.UNORDERED; this.mode = in.readBoolean() ? IntervalMode.ORDERED : IntervalMode.UNORDERED;
@ -484,7 +484,7 @@ public abstract class IntervalsSourceProvider implements NamedWriteable, ToXCont
@Override @Override
public void writeTo(StreamOutput out) throws IOException { 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); mode.writeTo(out);
} else { } else {
out.writeBoolean(mode == IntervalMode.ORDERED); out.writeBoolean(mode == IntervalMode.ORDERED);