parent
10e0e59561
commit
529622d4f4
|
@ -0,0 +1,307 @@
|
||||||
|
/*
|
||||||
|
* 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.apache.lucene.document.NumericDocValuesField;
|
||||||
|
import org.apache.lucene.document.SortedNumericDocValuesField;
|
||||||
|
import org.apache.lucene.document.SortedSetDocValuesField;
|
||||||
|
import org.apache.lucene.index.DirectoryReader;
|
||||||
|
import org.apache.lucene.index.IndexReader;
|
||||||
|
import org.apache.lucene.index.RandomIndexWriter;
|
||||||
|
import org.apache.lucene.search.IndexSearcher;
|
||||||
|
import org.apache.lucene.search.MatchAllDocsQuery;
|
||||||
|
import org.apache.lucene.search.Query;
|
||||||
|
import org.apache.lucene.store.Directory;
|
||||||
|
import org.apache.lucene.util.BytesRef;
|
||||||
|
import org.elasticsearch.ElasticsearchParseException;
|
||||||
|
import org.elasticsearch.common.CheckedConsumer;
|
||||||
|
import org.elasticsearch.index.mapper.DateFieldMapper;
|
||||||
|
import org.elasticsearch.index.mapper.KeywordFieldMapper;
|
||||||
|
import org.elasticsearch.index.mapper.MappedFieldType;
|
||||||
|
import org.elasticsearch.index.mapper.NumberFieldMapper;
|
||||||
|
import org.elasticsearch.search.aggregations.AggregatorTestCase;
|
||||||
|
import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.time.ZoneOffset;
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
|
import static java.util.Collections.singleton;
|
||||||
|
|
||||||
|
public class DateRangeAggregatorTests extends AggregatorTestCase {
|
||||||
|
|
||||||
|
private String NUMBER_FIELD_NAME = "number";
|
||||||
|
private String UNMAPPED_FIELD_NAME = "field_not_appearing_in_this_index";
|
||||||
|
private String DATE_FIELD_NAME = "date";
|
||||||
|
|
||||||
|
private long milli1 = ZonedDateTime.of(2015, 11, 13, 16, 14, 34, 0, ZoneOffset.UTC).toInstant().toEpochMilli();
|
||||||
|
private long milli2 = ZonedDateTime.of(2016, 11, 13, 16, 14, 34, 0, ZoneOffset.UTC).toInstant().toEpochMilli();
|
||||||
|
|
||||||
|
public void testNoMatchingField() throws IOException {
|
||||||
|
testBothResolutions(new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField("bogus_field_name", 7)));
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField("bogus_field_name", 2)));
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField("bogus_field_name", 3)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(2, ranges.size());
|
||||||
|
assertEquals(0, ranges.get(0).getDocCount());
|
||||||
|
assertEquals(0, ranges.get(1).getDocCount());
|
||||||
|
assertFalse(AggregationInspectionHelper.hasValue(range));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testMatchesSortedNumericDocValues() throws IOException {
|
||||||
|
testBothResolutions(new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(DATE_FIELD_NAME, milli1)));
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(DATE_FIELD_NAME, milli2)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(2, ranges.size());
|
||||||
|
assertEquals(1, ranges.get(0).getDocCount());
|
||||||
|
assertEquals(0, ranges.get(1).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testMatchesNumericDocValues() throws IOException {
|
||||||
|
testBothResolutions(new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(DATE_FIELD_NAME, milli1)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(DATE_FIELD_NAME, milli2)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(2, ranges.size());
|
||||||
|
assertEquals(1, ranges.get(0).getDocCount());
|
||||||
|
assertEquals(0, ranges.get(1).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testMissingDateStringWithDateField() throws IOException {
|
||||||
|
DateFieldMapper.Builder builder = new DateFieldMapper.Builder(DATE_FIELD_NAME)
|
||||||
|
.withResolution(DateFieldMapper.Resolution.MILLISECONDS);
|
||||||
|
DateFieldMapper.DateFieldType fieldType = builder.fieldType();
|
||||||
|
fieldType.setHasDocValues(true);
|
||||||
|
fieldType.setName(DATE_FIELD_NAME);
|
||||||
|
|
||||||
|
DateRangeAggregationBuilder aggregationBuilder = new DateRangeAggregationBuilder("date_range")
|
||||||
|
.field(DATE_FIELD_NAME)
|
||||||
|
.missing("2015-11-13T16:14:34")
|
||||||
|
.addRange("2015-11-13", "2015-11-14");
|
||||||
|
|
||||||
|
testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(DATE_FIELD_NAME, milli1)));
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(DATE_FIELD_NAME, milli2)));
|
||||||
|
// Missing will apply to this document
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(1, ranges.size());
|
||||||
|
assertEquals(2, ranges.get(0).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
}, fieldType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testNumberFieldDateRanges() throws IOException {
|
||||||
|
DateRangeAggregationBuilder aggregationBuilder = new DateRangeAggregationBuilder("date_range")
|
||||||
|
.field(NUMBER_FIELD_NAME)
|
||||||
|
.addRange("2015-11-13", "2015-11-14");
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
expectThrows(NumberFormatException.class,
|
||||||
|
() -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> fail("Should have thrown exception"), fieldType));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testNumberFieldNumberRanges() throws IOException {
|
||||||
|
DateRangeAggregationBuilder aggregationBuilder = new DateRangeAggregationBuilder("date_range")
|
||||||
|
.field(NUMBER_FIELD_NAME)
|
||||||
|
.addRange(0, 5);
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(1, ranges.size());
|
||||||
|
assertEquals(1, ranges.get(0).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
}, fieldType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testMissingDateStringWithNumberField() throws IOException {
|
||||||
|
DateRangeAggregationBuilder aggregationBuilder = new DateRangeAggregationBuilder("date_range")
|
||||||
|
.field(NUMBER_FIELD_NAME)
|
||||||
|
.addRange("2015-11-13", "2015-11-14")
|
||||||
|
.missing("1979-01-01T00:00:00");
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
expectThrows(NumberFormatException.class,
|
||||||
|
() -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> fail("Should have thrown exception"), fieldType));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testUnmappedWithMissingNumber() throws IOException {
|
||||||
|
DateRangeAggregationBuilder aggregationBuilder = new DateRangeAggregationBuilder("date_range")
|
||||||
|
.field("does_not_exist")
|
||||||
|
.addRange("2015-11-13", "2015-11-14")
|
||||||
|
.missing(1447438575000L); // 2015-11-13 6:16:15
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(1, ranges.size());
|
||||||
|
assertEquals(2, ranges.get(0).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
}, fieldType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testUnmappedWithMissingDate() throws IOException {
|
||||||
|
DateRangeAggregationBuilder aggregationBuilder = new DateRangeAggregationBuilder("date_range")
|
||||||
|
.field("does_not_exist")
|
||||||
|
.addRange("2015-11-13", "2015-11-14")
|
||||||
|
.missing("2015-11-13T10:11:12");
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(1, ranges.size());
|
||||||
|
assertEquals(2, ranges.get(0).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
}, fieldType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testKeywordField() {
|
||||||
|
DateRangeAggregationBuilder aggregationBuilder = new DateRangeAggregationBuilder("date_range")
|
||||||
|
.field("not_a_number")
|
||||||
|
.addRange("2015-11-13", "2015-11-14");
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType();
|
||||||
|
fieldType.setName("not_a_number");
|
||||||
|
fieldType.setHasDocValues(true);
|
||||||
|
|
||||||
|
IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
|
||||||
|
() -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new SortedSetDocValuesField("string", new BytesRef("foo"))));
|
||||||
|
}, range -> fail("Should have thrown exception"), fieldType));
|
||||||
|
// I believe this error is coming from improperly parsing the range, not the field.
|
||||||
|
assertEquals("For input string: \"2015-11-13\"", e.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testBadMissingField() {
|
||||||
|
DateRangeAggregationBuilder aggregationBuilder = new DateRangeAggregationBuilder("date_range")
|
||||||
|
.field(NUMBER_FIELD_NAME)
|
||||||
|
.addRange("2020-01-01T00:00:00", "2020-01-02T00:00:00")
|
||||||
|
.missing("bogus");
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
expectThrows(NumberFormatException.class,
|
||||||
|
() -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> fail("Should have thrown exception"), fieldType));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testUnmappedWithBadMissingField() {
|
||||||
|
DateRangeAggregationBuilder aggregationBuilder = new DateRangeAggregationBuilder("date_range")
|
||||||
|
.field("does_not_exist")
|
||||||
|
.addRange("2020-01-01T00:00:00", "2020-01-02T00:00:00")
|
||||||
|
.missing("bogus");
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
expectThrows(ElasticsearchParseException.class,
|
||||||
|
() -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> fail("Should have thrown exception"), fieldType));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void testBothResolutions(Query query,
|
||||||
|
CheckedConsumer<RandomIndexWriter, IOException> buildIndex,
|
||||||
|
Consumer<InternalRange<? extends InternalRange.Bucket, ? extends InternalRange>> verify)
|
||||||
|
throws IOException {
|
||||||
|
testCase(query, buildIndex, verify, DateFieldMapper.Resolution.MILLISECONDS);
|
||||||
|
testCase(query, buildIndex, verify, DateFieldMapper.Resolution.NANOSECONDS);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void testCase(Query query,
|
||||||
|
CheckedConsumer<RandomIndexWriter, IOException> buildIndex,
|
||||||
|
Consumer<InternalRange<? extends InternalRange.Bucket, ? extends InternalRange>> verify,
|
||||||
|
DateFieldMapper.Resolution resolution) throws IOException {
|
||||||
|
DateFieldMapper.Builder builder = new DateFieldMapper.Builder(DATE_FIELD_NAME)
|
||||||
|
.withResolution(resolution);
|
||||||
|
DateFieldMapper.DateFieldType fieldType = builder.fieldType();
|
||||||
|
fieldType.setHasDocValues(true);
|
||||||
|
fieldType.setName(DATE_FIELD_NAME);
|
||||||
|
DateRangeAggregationBuilder aggregationBuilder = new DateRangeAggregationBuilder("test_range_agg");
|
||||||
|
aggregationBuilder.field(DATE_FIELD_NAME);
|
||||||
|
aggregationBuilder.addRange("2015-01-01", "2015-12-31");
|
||||||
|
aggregationBuilder.addRange("2019-01-01", "2019-12-31");
|
||||||
|
testCase(aggregationBuilder, query, buildIndex, verify, fieldType);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void testCase(DateRangeAggregationBuilder aggregationBuilder,
|
||||||
|
Query query,
|
||||||
|
CheckedConsumer<RandomIndexWriter, IOException> buildIndex,
|
||||||
|
Consumer<InternalRange<? extends InternalRange.Bucket, ? extends InternalRange>> verify,
|
||||||
|
MappedFieldType fieldType) throws IOException {
|
||||||
|
try (Directory directory = newDirectory()) {
|
||||||
|
RandomIndexWriter indexWriter = new RandomIndexWriter(random(), directory);
|
||||||
|
buildIndex.accept(indexWriter);
|
||||||
|
indexWriter.close();
|
||||||
|
|
||||||
|
try (IndexReader indexReader = DirectoryReader.open(directory)) {
|
||||||
|
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
|
||||||
|
|
||||||
|
InternalRange<? extends InternalRange.Bucket, ? extends InternalRange> agg = searchAndReduce(indexSearcher,
|
||||||
|
query, aggregationBuilder, fieldType);
|
||||||
|
verify.accept(agg);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,308 @@
|
||||||
|
/*
|
||||||
|
* 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.apache.lucene.document.NumericDocValuesField;
|
||||||
|
import org.apache.lucene.document.SortedNumericDocValuesField;
|
||||||
|
import org.apache.lucene.document.SortedSetDocValuesField;
|
||||||
|
import org.apache.lucene.index.DirectoryReader;
|
||||||
|
import org.apache.lucene.index.IndexReader;
|
||||||
|
import org.apache.lucene.index.RandomIndexWriter;
|
||||||
|
import org.apache.lucene.search.IndexSearcher;
|
||||||
|
import org.apache.lucene.search.MatchAllDocsQuery;
|
||||||
|
import org.apache.lucene.search.Query;
|
||||||
|
import org.apache.lucene.store.Directory;
|
||||||
|
import org.apache.lucene.util.BytesRef;
|
||||||
|
import org.elasticsearch.common.CheckedConsumer;
|
||||||
|
import org.elasticsearch.index.mapper.DateFieldMapper;
|
||||||
|
import org.elasticsearch.index.mapper.KeywordFieldMapper;
|
||||||
|
import org.elasticsearch.index.mapper.MappedFieldType;
|
||||||
|
import org.elasticsearch.index.mapper.NumberFieldMapper;
|
||||||
|
import org.elasticsearch.search.aggregations.AggregatorTestCase;
|
||||||
|
import org.elasticsearch.search.aggregations.support.AggregationInspectionHelper;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.time.ZoneOffset;
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
|
import static java.util.Collections.singleton;
|
||||||
|
|
||||||
|
public class RangeAggregatorTests extends AggregatorTestCase {
|
||||||
|
|
||||||
|
private String NUMBER_FIELD_NAME = "number";
|
||||||
|
private String DATE_FIELD_NAME = "date";
|
||||||
|
|
||||||
|
public void testNoMatchingField() throws IOException {
|
||||||
|
testCase(new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField("bogus_field_name", 7)));
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField("bogus_field_name", 2)));
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField("bogus_field_name", 3)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(2, ranges.size());
|
||||||
|
assertEquals(0, ranges.get(0).getDocCount());
|
||||||
|
assertEquals(0, ranges.get(1).getDocCount());
|
||||||
|
assertFalse(AggregationInspectionHelper.hasValue(range));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testMatchesSortedNumericDocValues() throws IOException {
|
||||||
|
testCase(new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(NUMBER_FIELD_NAME, 2)));
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(NUMBER_FIELD_NAME, 3)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(2, ranges.size());
|
||||||
|
assertEquals(2, ranges.get(0).getDocCount());
|
||||||
|
assertEquals(0, ranges.get(1).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testMatchesNumericDocValues() throws IOException {
|
||||||
|
testCase(new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 2)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 3)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(2, ranges.size());
|
||||||
|
assertEquals(2, ranges.get(0).getDocCount());
|
||||||
|
assertEquals(0, ranges.get(1).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testDateFieldMillisecondResolution() throws IOException {
|
||||||
|
DateFieldMapper.Builder builder = new DateFieldMapper.Builder(DATE_FIELD_NAME)
|
||||||
|
.withResolution(DateFieldMapper.Resolution.MILLISECONDS);
|
||||||
|
DateFieldMapper.DateFieldType fieldType = builder.fieldType();
|
||||||
|
fieldType.setHasDocValues(true);
|
||||||
|
fieldType.setName(DATE_FIELD_NAME);
|
||||||
|
|
||||||
|
long milli1 = ZonedDateTime.of(2015, 11, 13, 16, 14, 34, 0, ZoneOffset.UTC).toInstant().toEpochMilli();
|
||||||
|
long milli2 = ZonedDateTime.of(2016, 11, 13, 16, 14, 34, 0, ZoneOffset.UTC).toInstant().toEpochMilli();
|
||||||
|
|
||||||
|
RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("range")
|
||||||
|
.field(DATE_FIELD_NAME)
|
||||||
|
.addRange(milli1 - 1, milli1 + 1);
|
||||||
|
|
||||||
|
testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(DATE_FIELD_NAME, milli1)));
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(DATE_FIELD_NAME, milli2)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(1, ranges.size());
|
||||||
|
assertEquals(1, ranges.get(0).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
}, fieldType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testDateFieldNanosecondResolution() throws IOException {
|
||||||
|
DateFieldMapper.Builder builder = new DateFieldMapper.Builder(DATE_FIELD_NAME)
|
||||||
|
.withResolution(DateFieldMapper.Resolution.NANOSECONDS);
|
||||||
|
DateFieldMapper.DateFieldType fieldType = builder.fieldType();
|
||||||
|
fieldType.setHasDocValues(true);
|
||||||
|
fieldType.setName(DATE_FIELD_NAME);
|
||||||
|
|
||||||
|
// These values should work because aggs scale nanosecond up to millisecond always.
|
||||||
|
long milli1 = ZonedDateTime.of(2015, 11, 13, 16, 14, 34, 0, ZoneOffset.UTC).toInstant().toEpochMilli();
|
||||||
|
long milli2 = ZonedDateTime.of(2016, 11, 13, 16, 14, 34, 0, ZoneOffset.UTC).toInstant().toEpochMilli();
|
||||||
|
|
||||||
|
RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("range")
|
||||||
|
.field(DATE_FIELD_NAME)
|
||||||
|
.addRange(milli1 - 1, milli1 + 1);
|
||||||
|
|
||||||
|
testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(DATE_FIELD_NAME, milli1)));
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(DATE_FIELD_NAME, milli2)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(1, ranges.size());
|
||||||
|
assertEquals(1, ranges.get(0).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
}, fieldType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testMissingDateWithDateField() throws IOException {
|
||||||
|
DateFieldMapper.Builder builder = new DateFieldMapper.Builder(DATE_FIELD_NAME)
|
||||||
|
.withResolution(DateFieldMapper.Resolution.NANOSECONDS);
|
||||||
|
DateFieldMapper.DateFieldType fieldType = builder.fieldType();
|
||||||
|
fieldType.setHasDocValues(true);
|
||||||
|
fieldType.setName(DATE_FIELD_NAME);
|
||||||
|
|
||||||
|
// These values should work because aggs scale nanosecond up to millisecond always.
|
||||||
|
long milli1 = ZonedDateTime.of(2015, 11, 13, 16, 14, 34, 0, ZoneOffset.UTC).toInstant().toEpochMilli();
|
||||||
|
long milli2 = ZonedDateTime.of(2016, 11, 13, 16, 14, 34, 0, ZoneOffset.UTC).toInstant().toEpochMilli();
|
||||||
|
|
||||||
|
RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("range")
|
||||||
|
.field(DATE_FIELD_NAME)
|
||||||
|
.missing("2015-11-13T16:14:34")
|
||||||
|
.addRange(milli1 - 1, milli1 + 1);
|
||||||
|
|
||||||
|
testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(DATE_FIELD_NAME, milli1)));
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(DATE_FIELD_NAME, milli2)));
|
||||||
|
// Missing will apply to this document
|
||||||
|
iw.addDocument(singleton(new SortedNumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(1, ranges.size());
|
||||||
|
assertEquals(2, ranges.get(0).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
}, fieldType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testMissingDateWithNumberField() throws IOException {
|
||||||
|
RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("range")
|
||||||
|
.field(NUMBER_FIELD_NAME)
|
||||||
|
.addRange(-2d, 5d)
|
||||||
|
.missing("1979-01-01T00:00:00");
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
expectThrows(NumberFormatException.class,
|
||||||
|
() -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> fail("Should have thrown exception"), fieldType));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testUnmappedWithMissingNumber() throws IOException {
|
||||||
|
RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("range")
|
||||||
|
.field("does_not_exist")
|
||||||
|
.addRange(-2d, 5d)
|
||||||
|
.missing(0L);
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> {
|
||||||
|
List<? extends InternalRange.Bucket> ranges = range.getBuckets();
|
||||||
|
assertEquals(1, ranges.size());
|
||||||
|
assertEquals(2, ranges.get(0).getDocCount());
|
||||||
|
assertTrue(AggregationInspectionHelper.hasValue(range));
|
||||||
|
}, fieldType);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testUnmappedWithMissingDate() throws IOException {
|
||||||
|
RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("range")
|
||||||
|
.field("does_not_exist")
|
||||||
|
.addRange(-2d, 5d)
|
||||||
|
.missing("2020-02-13T10:11:12");
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
expectThrows(NumberFormatException.class,
|
||||||
|
() -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> fail("Should have thrown exception"), fieldType));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testUnsupportedType() {
|
||||||
|
RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("range")
|
||||||
|
.field("not_a_number")
|
||||||
|
.addRange(-2d, 5d);
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType();
|
||||||
|
fieldType.setName("not_a_number");
|
||||||
|
fieldType.setHasDocValues(true);
|
||||||
|
|
||||||
|
IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
|
||||||
|
() -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new SortedSetDocValuesField("string", new BytesRef("foo"))));
|
||||||
|
}, range -> fail("Should have thrown exception"), fieldType));
|
||||||
|
assertEquals(e.getMessage(), "Expected numeric type on field [not_a_number], but got [keyword]");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testBadMissingField() {
|
||||||
|
RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("range")
|
||||||
|
.field(NUMBER_FIELD_NAME)
|
||||||
|
.addRange(-2d, 5d)
|
||||||
|
.missing("bogus");
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
expectThrows(NumberFormatException.class,
|
||||||
|
() -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> fail("Should have thrown exception"), fieldType));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testUnmappedWithBadMissingField() {
|
||||||
|
RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("range")
|
||||||
|
.field("does_not_exist")
|
||||||
|
.addRange(-2d, 5d)
|
||||||
|
.missing("bogus");
|
||||||
|
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
|
||||||
|
expectThrows(NumberFormatException.class,
|
||||||
|
() -> testCase(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 7)));
|
||||||
|
iw.addDocument(singleton(new NumericDocValuesField(NUMBER_FIELD_NAME, 1)));
|
||||||
|
}, range -> fail("Should have thrown exception"), fieldType));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void testCase(Query query,
|
||||||
|
CheckedConsumer<RandomIndexWriter, IOException> buildIndex,
|
||||||
|
Consumer<InternalRange<? extends InternalRange.Bucket, ? extends InternalRange>> verify) throws IOException {
|
||||||
|
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType(NumberFieldMapper.NumberType.INTEGER);
|
||||||
|
fieldType.setName(NUMBER_FIELD_NAME);
|
||||||
|
RangeAggregationBuilder aggregationBuilder = new RangeAggregationBuilder("test_range_agg");
|
||||||
|
aggregationBuilder.field(NUMBER_FIELD_NAME);
|
||||||
|
aggregationBuilder.addRange(0d, 5d);
|
||||||
|
aggregationBuilder.addRange(10d, 20d);
|
||||||
|
testCase(aggregationBuilder, query, buildIndex, verify, fieldType);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void testCase(RangeAggregationBuilder aggregationBuilder,
|
||||||
|
Query query,
|
||||||
|
CheckedConsumer<RandomIndexWriter, IOException> buildIndex,
|
||||||
|
Consumer<InternalRange<? extends InternalRange.Bucket, ? extends InternalRange>> verify,
|
||||||
|
MappedFieldType fieldType) throws IOException {
|
||||||
|
try (Directory directory = newDirectory()) {
|
||||||
|
RandomIndexWriter indexWriter = new RandomIndexWriter(random(), directory);
|
||||||
|
buildIndex.accept(indexWriter);
|
||||||
|
indexWriter.close();
|
||||||
|
|
||||||
|
try (IndexReader indexReader = DirectoryReader.open(directory)) {
|
||||||
|
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
|
||||||
|
|
||||||
|
InternalRange<? extends InternalRange.Bucket, ? extends InternalRange> agg = searchAndReduce(indexSearcher,
|
||||||
|
query, aggregationBuilder, fieldType);
|
||||||
|
verify.accept(agg);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue