Add support for numeric range keys #56452
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.search.aggregations.bucket.range; | ||
|
|
||
| import org.elasticsearch.common.io.stream.Writeable.Reader; | ||
| import org.elasticsearch.common.xcontent.XContentParser; | ||
| import org.elasticsearch.common.xcontent.json.JsonXContent; | ||
| import org.elasticsearch.test.AbstractSerializingTestCase; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import static org.hamcrest.Matchers.equalTo; | ||
|
|
||
| public class RangeAggregationBuilderTests extends AbstractSerializingTestCase<RangeAggregationBuilder> { | ||
| @Override | ||
| protected RangeAggregationBuilder doParseInstance(XContentParser parser) throws IOException { | ||
| assertThat(parser.nextToken(), equalTo(XContentParser.Token.START_OBJECT)); | ||
| assertThat(parser.nextToken(), equalTo(XContentParser.Token.FIELD_NAME)); | ||
| String name = parser.currentName(); | ||
| assertThat(parser.nextToken(), equalTo(XContentParser.Token.START_OBJECT)); | ||
| assertThat(parser.nextToken(), equalTo(XContentParser.Token.FIELD_NAME)); | ||
| assertThat(parser.currentName(), equalTo("range")); | ||
| RangeAggregationBuilder parsed = RangeAggregationBuilder.PARSER.apply(parser, name); | ||
| assertThat(parser.nextToken(), equalTo(XContentParser.Token.END_OBJECT)); | ||
| assertThat(parser.nextToken(), equalTo(XContentParser.Token.END_OBJECT)); | ||
| return parsed; | ||
| } | ||
|
|
||
| @Override | ||
| protected Reader<RangeAggregationBuilder> instanceReader() { | ||
| return RangeAggregationBuilder::new; | ||
| } | ||
|
|
||
| @Override | ||
| protected RangeAggregationBuilder createTestInstance() { | ||
| RangeAggregationBuilder builder = new RangeAggregationBuilder(randomAlphaOfLength(5)); | ||
| builder.keyed(randomBoolean()); | ||
| builder.field(randomAlphaOfLength(4)); | ||
| int rangeCount = between(1, 10); | ||
| double r = 0; | ||
| for (int i = 0; i < rangeCount; i++) { | ||
| switch (between(0, 2)) { | ||
| case 0: | ||
| builder.addUnboundedFrom(randomAlphaOfLength(2), r); | ||
| break; | ||
| case 1: | ||
| builder.addUnboundedTo(randomAlphaOfLength(2), r); | ||
| break; | ||
| case 2: | ||
| double from = r; | ||
| r += randomDouble(); // less than 1 | ||
| double to = r; | ||
| builder.addRange(randomAlphaOfLength(2), from, to); | ||
| break; | ||
| default: | ||
| fail(); | ||
| } | ||
| r += randomDouble(); // less than 1 | ||
| } | ||
| return builder; | ||
| } | ||
|
|
||
| @Override | ||
| protected RangeAggregationBuilder mutateInstance(RangeAggregationBuilder builder) throws IOException { | ||
| String name = builder.getName(); | ||
| boolean keyed = builder.keyed(); | ||
| String field = builder.field(); | ||
| List<RangeAggregator.Range> ranges = builder.ranges(); | ||
| switch (between(0, 3)) { | ||
| case 0: | ||
| name += randomAlphaOfLength(1); | ||
| break; | ||
| case 1: | ||
| keyed = !keyed; | ||
| break; | ||
| case 2: | ||
| field += randomAlphaOfLength(1); | ||
| break; | ||
| case 3: | ||
| ranges = new ArrayList<>(ranges); | ||
| double from = ranges.get(ranges.size() - 1).from; | ||
| double to = from + randomDouble(); | ||
| ranges.add(new RangeAggregator.Range(randomAlphaOfLength(2), from, to)); | ||
| break; | ||
| default: | ||
| fail(); | ||
| } | ||
| RangeAggregationBuilder mutant = new RangeAggregationBuilder(name).keyed(keyed).field(field); | ||
| ranges.stream().forEach(mutant::addRange); | ||
| return mutant; | ||
| } | ||
|
|
||
| public void testNumericKeys() throws IOException { | ||
| RangeAggregationBuilder builder = doParseInstance(createParser(JsonXContent.jsonXContent, | ||
| "{\"test\":{\"range\":{\"field\":\"f\",\"ranges\":[{\"key\":1,\"to\":0}]}}}")); | ||
| assertThat(builder.getName(), equalTo("test")); | ||
| assertThat(builder.field(), equalTo("f")); | ||
| assertThat(builder.ranges, equalTo(List.of(new RangeAggregator.Range("1", null, 0d)))); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if we should add a guard here to throw an exception if
from/fromAsStrandto/toAsStrare both non-null/non-empty/not infinity? Looks like we previously were just assuming the user gave us the right combination... i'm assuming we use these preferentially later (e.g.toAsStrif non-null,tootherwise or something like that)Or if it turns out to be a big mess, at least a javadoc explaining the priority? Or make it package-private if possible? Not sure where else it's used though
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is used in a few places, yeah. I believe the best I can do is describe the priority. I'll do that.