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

Move BWC version to 5.5 after backport 

Relates to #24517
This commit is contained in:
Jim Ferenczi 2017-05-26 14:57:07 +02:00
parent 9ef414fead
commit 47cf7825dd
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/org/elasticsearch/search/collapse/CollapseBuilder.java
View File

@ -20,15 +20,12 @@ package org.elasticsearch.search.collapse;
import org.apache.lucene.index.IndexOptions;
import org.elasticsearch.Version;
import org.elasticsearch.action.support.ToXContentToBytes;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.xcontent.AbstractObjectParser;
import org.elasticsearch.common.xcontent.ContextParser;
import org.elasticsearch.common.xcontent.ObjectParser;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.ToXContentObject;
@ -47,7 +44,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.function.BiConsumer;
/**
* A builder that enables field collapsing on search request.
@ -99,7 +95,7 @@ public class CollapseBuilder implements Writeable, ToXContentObject {
public CollapseBuilder(StreamInput in) throws IOException {
this.field = in.readString();
this.maxConcurrentGroupRequests = in.readVInt();
if (in.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
if (in.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
this.innerHits = in.readList(InnerHitBuilder::new);
} else {
InnerHitBuilder innerHitBuilder = in.readOptionalWriteable(InnerHitBuilder::new);
@ -115,17 +111,13 @@ public class CollapseBuilder implements Writeable, ToXContentObject {
public void writeTo(StreamOutput out) throws IOException {
out.writeString(field);
out.writeVInt(maxConcurrentGroupRequests);
if (out.getVersion().onOrAfter(Version.V_6_0_0_alpha1_UNRELEASED)) {
if (out.getVersion().onOrAfter(Version.V_5_5_0_UNRELEASED)) {
out.writeList(innerHits);
} else {
boolean hasInnerHit = innerHits.isEmpty() == false;
out.writeBoolean(hasInnerHit);
if (hasInnerHit) {
if (out.getVersion().before(Version.V_5_5_0_UNRELEASED)) {
innerHits.get(0).writeToCollapseBWC(out);
} else {
innerHits.get(0).writeTo(out);
}
innerHits.get(0).writeToCollapseBWC(out);
}
}
}

4
rest-api-spec/src/main/resources/rest-api-spec/test/search/110_field_collapsing.yml
View File

@ -270,8 +270,8 @@ setup:
"field collapsing and multiple inner_hits":
- skip:
version: " - 5.99.99"
reason: TODO version should be 5.4.99 after backport (#24517)
version: " - 5.4.99"
reason: Multiple inner_hits is a new feature added in 5.5
- do:
search: