Skip to content

Commit 092061f

Browse files
committed
Update versions after backport of max_analyzed_offset
Since elastic#69016 is merged versions for serialisation/deserialisation and YAML tests are updated. Follows: elastic#67325
1 parent 9da3a6e commit 092061f

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

rest-api-spec/src/main/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ setup:
4141
"Unified highlighter on a field WITHOUT OFFSETS exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED":
4242

4343
- skip:
44-
version: " - 7.99.99"
45-
reason: max_analyzed_offset query param added in 8.0
44+
version: " - 7.11.99"
45+
reason: max_analyzed_offset query param added in 7.12.0
4646

4747
- do:
4848
search:
@@ -67,8 +67,8 @@ setup:
6767
"Plain highlighter on a field WITHOUT OFFSETS exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED":
6868

6969
- skip:
70-
version: " - 7.99.99"
71-
reason: max_analyzed_offset query param added in 8.0
70+
version: " - 7.11.99"
71+
reason: max_analyzed_offset query param added in 7.12.0
7272

7373
- do:
7474
search:
@@ -104,8 +104,8 @@ setup:
104104
"Plain highlighter on a field WITH OFFSETS exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED":
105105

106106
- skip:
107-
version: " - 7.99.99"
108-
reason: max_analyzed_offset query param added in 8.0
107+
version: " - 7.11.99"
108+
reason: max_analyzed_offset query param added in 7.12.0
109109

110110
- do:
111111
search:
@@ -118,8 +118,8 @@ setup:
118118
"Plain highlighter with max_analyzed_offset < 0 should FAIL":
119119

120120
- skip:
121-
version: " - 7.99.99"
122-
reason: max_analyzed_offset query param added in 8.0
121+
version: " - 7.11.99"
122+
reason: max_analyzed_offset query param added in 7.12.0
123123

124124
- do:
125125
catch: bad_request

server/src/main/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ protected AbstractHighlighterBuilder(StreamInput in) throws IOException {
159159
options(in.readMap());
160160
}
161161
requireFieldMatch(in.readOptionalBoolean());
162-
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
162+
if (in.getVersion().onOrAfter(Version.V_7_12_0)) {
163163
maxAnalyzedOffset(in.readOptionalInt());
164164
}
165165
}
@@ -203,7 +203,7 @@ public final void writeTo(StreamOutput out) throws IOException {
203203
out.writeMap(options);
204204
}
205205
out.writeOptionalBoolean(requireFieldMatch);
206-
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
206+
if (out.getVersion().onOrAfter(Version.V_7_12_0)) {
207207
out.writeOptionalInt(maxAnalyzedOffset);
208208
}
209209
doWriteTo(out);

0 commit comments

Comments
 (0)