github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-25 15:47:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update the version checks around ip_range bucket keys, now that the change was backported.

Browse source
This commit is contained in:
Julie Tibshirani 2018-05-24 08:55:14 -07:00
parent 3622486889
commit f55b09bae4
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/40_range.yml
View file

@ -213,8 +213,8 @@ setup:
--- ---
"IP Range Key Generation": "IP Range Key Generation":
- skip: - skip:
version: " - 6.99.99" version: " - 6.3.99"
reason: "Before 7.0.0, ip_range did not always generate bucket keys (see #21045)." reason: "Before 6.4.0, ip_range did not always generate bucket keys (see #21045)."
- do: - do:
search: search:

4
server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java
View file

@ -74,7 +74,7 @@ public final class InternalBinaryRange
} }
private static Bucket createFromStream(StreamInput in, DocValueFormat format, boolean keyed) throws IOException { private static Bucket createFromStream(StreamInput in, DocValueFormat format, boolean keyed) throws IOException {
String key = in.getVersion().onOrAfter(Version.V_7_0_0_alpha1) String key = in.getVersion().onOrAfter(Version.V_6_4_0)
? in.readString() ? in.readString()
: in.readOptionalString(); : in.readOptionalString();
@ -88,7 +88,7 @@ public final class InternalBinaryRange
@Override @Override
public void writeTo(StreamOutput out) throws IOException { public void writeTo(StreamOutput out) throws IOException {
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
out.writeString(key); out.writeString(key);
} else { } else {
out.writeOptionalString(key); out.writeOptionalString(key);