honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-19 19:35:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

#26496: Set the correct bwc version after backport to 6.x

Browse Source
This commit is contained in:
Jim Ferenczi 2017-09-11 13:09:44 +02:00
parent 1adee8b5a8
commit c62b0192d0
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestion.java
View File

@ -89,8 +89,7 @@ public final class CompletionSuggestion extends Suggest.Suggestion<CompletionSug
@Override @Override
public void readFrom(StreamInput in) throws IOException { public void readFrom(StreamInput in) throws IOException {
super.readFrom(in); super.readFrom(in);
// TODO should be backported to 6.1.0 if (in.getVersion().onOrAfter(Version.V_6_1_0)) {
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
skipDuplicates = in.readBoolean(); skipDuplicates = in.readBoolean();
} }
} }
@ -98,8 +97,7 @@ public final class CompletionSuggestion extends Suggest.Suggestion<CompletionSug
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out); super.writeTo(out);
// TODO should be backported to 6.1.0 if (out.getVersion().onOrAfter(Version.V_6_1_0)) {
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
out.writeBoolean(skipDuplicates); out.writeBoolean(skipDuplicates);
} }
} }

6
core/src/main/java/org/elasticsearch/search/suggest/completion/CompletionSuggestionBuilder.java
View File

@ -128,8 +128,7 @@ public class CompletionSuggestionBuilder extends SuggestionBuilder<CompletionSug
fuzzyOptions = in.readOptionalWriteable(FuzzyOptions::new); fuzzyOptions = in.readOptionalWriteable(FuzzyOptions::new);
regexOptions = in.readOptionalWriteable(RegexOptions::new); regexOptions = in.readOptionalWriteable(RegexOptions::new);
contextBytes = in.readOptionalBytesReference(); contextBytes = in.readOptionalBytesReference();
// TODO should be backported to 6.1.0 if (in.getVersion().onOrAfter(Version.V_6_1_0)) {
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
skipDuplicates = in.readBoolean(); skipDuplicates = in.readBoolean();
} }
} }
@ -139,8 +138,7 @@ public class CompletionSuggestionBuilder extends SuggestionBuilder<CompletionSug
out.writeOptionalWriteable(fuzzyOptions); out.writeOptionalWriteable(fuzzyOptions);
out.writeOptionalWriteable(regexOptions); out.writeOptionalWriteable(regexOptions);
out.writeOptionalBytesReference(contextBytes); out.writeOptionalBytesReference(contextBytes);
// TODO should be backported to 6.1.0 if (out.getVersion().onOrAfter(Version.V_6_1_0)) {
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
out.writeBoolean(skipDuplicates); out.writeBoolean(skipDuplicates);
} }
} }

4
rest-api-spec/src/main/resources/rest-api-spec/test/suggest/20_completion.yml
View File

@ -295,8 +295,8 @@ setup:
--- ---
"Skip duplicates should work": "Skip duplicates should work":
- skip: - skip:
version: " - 6.99.99" version: " - 6.0.99"
reason: skip_duplicates was added in 7.0 (TODO should be backported to 6.1) reason: skip_duplicates was added in 6.1
- do: - do:
index: index:

4
rest-api-spec/src/main/resources/rest-api-spec/test/suggest/30_context.yml
View File

@ -281,8 +281,8 @@ setup:
--- ---
"Skip duplicates with contexts should work": "Skip duplicates with contexts should work":
- skip: - skip:
version: " - 6.99.99" version: " - 6.0.99"
reason: skip_duplicates was added in 7.0 (TODO should be backported to 6.1) reason: skip_duplicates was added in 6.1
- do: - do:
index: index: