Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update versions after backport of max_analyzed_offset #69029

Merged
merged 1 commit into from
Feb 16, 2021
Merged

Update versions after backport of max_analyzed_offset #69029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ...pi-spec/src/main/resources/rest-api-spec/test/search.highlight/30_max_analyzed_offset.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ setup:
"Unified highlighter on a field WITHOUT OFFSETS exceeding index.highlight.max_analyzed_offset with max_analyzed_offset=20 should SUCCEED":

- skip:
version: " - 7.99.99"
reason: max_analyzed_offset query param added in 8.0
version: " - 7.11.99"
reason: max_analyzed_offset query param added in 7.12.0

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

- skip:
version: " - 7.99.99"
reason: max_analyzed_offset query param added in 8.0
version: " - 7.11.99"
reason: max_analyzed_offset query param added in 7.12.0

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

- skip:
version: " - 7.99.99"
reason: max_analyzed_offset query param added in 8.0
version: " - 7.11.99"
reason: max_analyzed_offset query param added in 7.12.0

- do:
search:
Expand All @@ -118,8 +118,8 @@ setup:
"Plain highlighter with max_analyzed_offset < 0 should FAIL":

- skip:
version: " - 7.99.99"
reason: max_analyzed_offset query param added in 8.0
version: " - 7.11.99"
reason: max_analyzed_offset query param added in 7.12.0

- do:
catch: bad_request
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/org/elasticsearch/search/fetch/subphase/highlight/AbstractHighlighterBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ protected AbstractHighlighterBuilder(StreamInput in) throws IOException {
options(in.readMap());
}
requireFieldMatch(in.readOptionalBoolean());
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
if (in.getVersion().onOrAfter(Version.V_7_12_0)) {
maxAnalyzedOffset(in.readOptionalInt());
}
}
Expand Down Expand Up @@ -203,7 +203,7 @@ public final void writeTo(StreamOutput out) throws IOException {
out.writeMap(options);
}
out.writeOptionalBoolean(requireFieldMatch);
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
if (out.getVersion().onOrAfter(Version.V_7_12_0)) {
out.writeOptionalInt(maxAnalyzedOffset);
}
doWriteTo(out);
Expand Down