diff --git a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSource.java b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSource.java index 85f59c69bc319..a411fd331df34 100644 --- a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSource.java +++ b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/ArrayValuesSource.java @@ -9,7 +9,7 @@ package org.elasticsearch.aggregations.metric; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.index.fielddata.NumericDoubleValues; +import org.apache.lucene.search.DoubleValues; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.support.ValuesSource; @@ -34,7 +34,7 @@ public NumericArrayValuesSource(Map valuesSources, } } - public NumericDoubleValues getField(final int ordinal, LeafReaderContext ctx) throws IOException { + public DoubleValues getField(final int ordinal, LeafReaderContext ctx) throws IOException { if (ordinal > names.length) { throw new IndexOutOfBoundsException("ValuesSource array index " + ordinal + " out of bounds"); } diff --git a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsAggregator.java b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsAggregator.java index f79f5e2feb902..2ab03c95fe054 100644 --- a/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsAggregator.java +++ b/modules/aggregations/src/main/java/org/elasticsearch/aggregations/metric/MatrixStatsAggregator.java @@ -8,10 +8,10 @@ */ package org.elasticsearch.aggregations.metric; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.ScoreMode; import org.elasticsearch.common.util.ObjectArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.AggregationExecutionContext; import org.elasticsearch.search.aggregations.Aggregator; @@ -62,7 +62,7 @@ public LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx, if (valuesSources == null) { return LeafBucketCollector.NO_OP_COLLECTOR; } - final NumericDoubleValues[] values = new NumericDoubleValues[valuesSources.fieldNames().length]; + final DoubleValues[] values = new DoubleValues[valuesSources.fieldNames().length]; for (int i = 0; i < values.length; ++i) { values[i] = valuesSources.getField(i, aggCtx.getLeafReaderContext()); } @@ -93,7 +93,7 @@ public void collect(int doc, long bucket) throws IOException { private boolean includeDocument(int doc) throws IOException { // loop over fields for (int i = 0; i < fieldVals.length; ++i) { - final NumericDoubleValues doubleValues = values[i]; + final DoubleValues doubleValues = values[i]; if (doubleValues.advanceExact(doc)) { final double value = doubleValues.doubleValue(); if (value == Double.NEGATIVE_INFINITY) { diff --git a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/DateMethodValueSource.java b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/DateMethodValueSource.java index 9b20bf1bfdd34..8e21ee788abb4 100644 --- a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/DateMethodValueSource.java +++ b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/DateMethodValueSource.java @@ -13,7 +13,6 @@ import org.apache.lucene.search.DoubleValues; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.search.MultiValueMode; import java.io.IOException; @@ -41,7 +40,7 @@ class DateMethodValueSource extends FieldDataValueSource { public DoubleValues getValues(LeafReaderContext leaf, DoubleValues scores) { LeafNumericFieldData leafData = (LeafNumericFieldData) fieldData.load(leaf); final Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ROOT); - NumericDoubleValues docValues = multiValueMode.select(leafData.getDoubleValues()); + DoubleValues docValues = multiValueMode.select(leafData.getDoubleValues()); return new DoubleValues() { @Override public double doubleValue() throws IOException { diff --git a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/DateObjectValueSource.java b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/DateObjectValueSource.java index 340c08fc489b0..014c50e678eac 100644 --- a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/DateObjectValueSource.java +++ b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/DateObjectValueSource.java @@ -13,7 +13,6 @@ import org.apache.lucene.search.DoubleValues; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.search.MultiValueMode; import java.io.IOException; @@ -46,7 +45,7 @@ class DateObjectValueSource extends FieldDataValueSource { @Override public DoubleValues getValues(LeafReaderContext leaf, DoubleValues scores) { LeafNumericFieldData leafData = (LeafNumericFieldData) fieldData.load(leaf); - NumericDoubleValues docValues = multiValueMode.select(leafData.getDoubleValues()); + DoubleValues docValues = multiValueMode.select(leafData.getDoubleValues()); return new DoubleValues() { @Override public double doubleValue() throws IOException { diff --git a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java index a59fed4d9f873..e0766fc85f60e 100644 --- a/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java +++ b/modules/lang-expression/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java @@ -14,7 +14,6 @@ import org.apache.lucene.search.DoubleValues; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.search.MultiValueMode; import java.io.IOException; @@ -54,7 +53,7 @@ public int hashCode() { @Override public DoubleValues getValues(LeafReaderContext leaf, DoubleValues scores) { LeafNumericFieldData leafData = (LeafNumericFieldData) fieldData.load(leaf); - NumericDoubleValues docValues = multiValueMode.select(leafData.getDoubleValues()); + DoubleValues docValues = multiValueMode.select(leafData.getDoubleValues()); return new DoubleValues() { @Override public double doubleValue() throws IOException { diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java index 40fd851b98793..d46761cbaa5b5 100644 --- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java +++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java @@ -10,6 +10,7 @@ package org.elasticsearch.index.mapper.extras; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.LongValues; import org.apache.lucene.search.Query; import org.elasticsearch.common.Explicit; @@ -25,7 +26,6 @@ import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.IndexNumericFieldData; import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericLongValues; import org.elasticsearch.index.fielddata.SourceValueFetcherSortedDoubleIndexFieldData; @@ -836,7 +836,7 @@ public SortedNumericDoubleValues getDoubleValues() { final SortedNumericLongValues values = scaledFieldData.getLongValues(); final LongValues singleValues = SortedNumericLongValues.unwrapSingleton(values); if (singleValues != null) { - return FieldData.singleton(new NumericDoubleValues() { + return FieldData.singleton(new DoubleValues() { @Override public boolean advanceExact(int doc) throws IOException { return singleValues.advanceExact(doc); diff --git a/server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java b/server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java index d9fb1dfa6fb31..59b77fa2e9ee7 100644 --- a/server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java +++ b/server/src/main/java/org/elasticsearch/common/geo/GeoUtils.java @@ -10,6 +10,7 @@ package org.elasticsearch.common.geo; import org.apache.lucene.geo.GeoEncodingUtils; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.util.SloppyMath; import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.common.unit.DistanceUnit; @@ -18,7 +19,6 @@ import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.GeoPointValues; import org.elasticsearch.index.fielddata.MultiGeoPointValues; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.fielddata.SortingNumericDoubleValues; import org.elasticsearch.xcontent.NamedXContentRegistry; @@ -525,7 +525,7 @@ public static SortedNumericDoubleValues distanceValues( ) { final GeoPointValues singleValues = FieldData.unwrapSingleton(geoPointValues); if (singleValues != null && fromPoints.length == 1) { - return FieldData.singleton(new NumericDoubleValues() { + return FieldData.singleton(new DoubleValues() { @Override public boolean advanceExact(int doc) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/FieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/FieldData.java index 0b32b683ebadd..61549b29fc1d0 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/FieldData.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/FieldData.java @@ -15,6 +15,7 @@ import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.index.SortedSetDocValues; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.LongValues; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; @@ -37,29 +38,11 @@ public static SortedBinaryDocValues emptySortedBinary() { return singleton(DocValues.emptyBinary()); } - /** - * Return a {@link NumericDoubleValues} that doesn't contain any value. - */ - public static NumericDoubleValues emptyNumericDouble() { - return new NumericDoubleValues() { - @Override - public boolean advanceExact(int doc) { - return false; - } - - @Override - public double doubleValue() { - throw new UnsupportedOperationException(); - } - - }; - } - /** * Return a {@link SortedNumericDoubleValues} that doesn't contain any value. */ public static SortedNumericDoubleValues emptySortedNumericDoubles() { - return singleton(emptyNumericDouble()); + return singleton(DoubleValues.EMPTY); } /** @@ -132,7 +115,7 @@ public boolean advanceExact(int doc) throws IOException { * {@link org.apache.lucene.util.NumericUtils#doubleToSortableLong(double)}. */ public static SortedNumericLongValues toSortableLongBits(SortedNumericDoubleValues values) { - final NumericDoubleValues singleton = unwrapSingleton(values); + final DoubleValues singleton = unwrapSingleton(values); if (singleton != null) { final LongValues longBits; if (singleton instanceof SortableLongBitsToNumericDoubleValues) { @@ -158,7 +141,7 @@ public static SortedNumericLongValues toSortableLongBits(SortedNumericDoubleValu public static SortedNumericDoubleValues sortableLongBitsToDoubles(SortedNumericLongValues values) { final LongValues singleton = SortedNumericLongValues.unwrapSingleton(values); if (singleton != null) { - final NumericDoubleValues doubles; + final DoubleValues doubles; if (singleton instanceof SortableLongBitsNumericDocValues) { doubles = ((SortableLongBitsNumericDocValues) singleton).getDoubleValues(); } else { @@ -190,7 +173,7 @@ public static SortedNumericDoubleValues castToDouble(final SortedNumericLongValu * Wrap the provided {@link SortedNumericDoubleValues} instance to cast all values to longs. */ public static SortedNumericLongValues castToLong(final SortedNumericDoubleValues values) { - final NumericDoubleValues singleton = unwrapSingleton(values); + final DoubleValues singleton = unwrapSingleton(values); if (singleton != null) { return SortedNumericLongValues.singleton(new LongCastedValues(singleton)); } else { @@ -199,9 +182,9 @@ public static SortedNumericLongValues castToLong(final SortedNumericDoubleValues } /** - * Returns a multi-valued view over the provided {@link NumericDoubleValues}. + * Returns a multi-valued view over the provided {@link DoubleValues}. */ - public static SortedNumericDoubleValues singleton(NumericDoubleValues values) { + public static SortedNumericDoubleValues singleton(DoubleValues values) { return new SingletonSortedNumericDoubleValues(values); } @@ -210,7 +193,7 @@ public static SortedNumericDoubleValues singleton(NumericDoubleValues values) { * if it was previously wrapped with {@link DocValues#singleton(NumericDocValues)}, * or null. */ - public static NumericDoubleValues unwrapSingleton(SortedNumericDoubleValues values) { + public static DoubleValues unwrapSingleton(SortedNumericDoubleValues values) { if (values instanceof SingletonSortedNumericDoubleValues) { return ((SingletonSortedNumericDoubleValues) values).getNumericDoubleValues(); } @@ -297,7 +280,7 @@ public CharSequence get() throws IOException { */ public static SortedBinaryDocValues toString(final SortedNumericDoubleValues values) { { - final NumericDoubleValues singleton = FieldData.unwrapSingleton(values); + final DoubleValues singleton = FieldData.unwrapSingleton(values); if (singleton != null) { return FieldData.singleton(toString(singleton)); } @@ -322,7 +305,7 @@ public void get(List list) throws IOException { * typically used for scripts or for the `map` execution mode of terms aggs. * NOTE: this is very slow! */ - public static BinaryDocValues toString(final NumericDoubleValues values) { + public static BinaryDocValues toString(final DoubleValues values) { return toString(new ToStringValue() { @Override public boolean advanceExact(int doc) throws IOException { @@ -505,7 +488,7 @@ private interface ToStringValue { } - private static class DoubleCastedValues extends NumericDoubleValues { + private static class DoubleCastedValues extends DoubleValues { private final LongValues values; @@ -552,9 +535,9 @@ public int docValueCount() { private static class LongCastedValues extends LongValues { - private final NumericDoubleValues values; + private final DoubleValues values; - LongCastedValues(NumericDoubleValues values) { + LongCastedValues(DoubleValues values) { this.values = values; } @@ -636,11 +619,11 @@ public long longValue() { } /** - * Return a {@link NumericDoubleValues} instance that has a value for every + * Return a {@link DoubleValues} instance that has a value for every * document, returns the same value as {@code values} if there is a value * for the current document and {@code missing} otherwise. */ - public static DenseDoubleValues replaceMissing(NumericDoubleValues values, double missing) { + public static DenseDoubleValues replaceMissing(DoubleValues values, double missing) { return new DenseDoubleValues() { private double value; diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java deleted file mode 100644 index 8feb233324b12..0000000000000 --- a/server/src/main/java/org/elasticsearch/index/fielddata/NumericDoubleValues.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -package org.elasticsearch.index.fielddata; - -import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.search.DoubleValues; - -import java.io.IOException; - -/** - * A per-document numeric value. - */ -public abstract class NumericDoubleValues extends DoubleValues { - - /** Sole constructor. (For invocation by subclass - * constructors, typically implicit.) */ - protected NumericDoubleValues() {} - - // TODO: this interaction with sort comparators is really ugly... - /** Returns numeric docvalues view of raw double bits */ - public NumericDocValues getRawDoubleValues() { - return new AbstractNumericDocValues() { - private int docID = -1; - - @Override - public boolean advanceExact(int target) throws IOException { - docID = target; - return NumericDoubleValues.this.advanceExact(target); - } - - @Override - public long longValue() throws IOException { - return Double.doubleToRawLongBits(NumericDoubleValues.this.doubleValue()); - } - - @Override - public int docID() { - return docID; - } - }; - } - - // yes... this is doing what the previous code was doing... - /** Returns numeric docvalues view of raw float bits */ - public NumericDocValues getRawFloatValues() { - return new AbstractNumericDocValues() { - private int docID = -1; - - @Override - public boolean advanceExact(int target) throws IOException { - docID = target; - return NumericDoubleValues.this.advanceExact(target); - } - - @Override - public long longValue() throws IOException { - return Float.floatToRawIntBits((float) NumericDoubleValues.this.doubleValue()); - } - - @Override - public int docID() { - return docID; - } - }; - } -} diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java index 078d74c9f2404..ad83e4b705f0a 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/SingletonSortedNumericDoubleValues.java @@ -9,6 +9,8 @@ package org.elasticsearch.index.fielddata; +import org.apache.lucene.search.DoubleValues; + import java.io.IOException; /** @@ -18,14 +20,14 @@ * that works for single or multi-valued types. */ final class SingletonSortedNumericDoubleValues extends SortedNumericDoubleValues { - private final NumericDoubleValues in; + private final DoubleValues in; - SingletonSortedNumericDoubleValues(NumericDoubleValues in) { + SingletonSortedNumericDoubleValues(DoubleValues in) { this.in = in; } - /** Return the wrapped {@link NumericDoubleValues} */ - public NumericDoubleValues getNumericDoubleValues() { + /** Return the wrapped {@link DoubleValues} */ + public DoubleValues getNumericDoubleValues() { return in; } diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java index 87e2e79ec12a4..2e2eeb6913d0b 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsNumericDocValues.java @@ -10,21 +10,22 @@ package org.elasticsearch.index.fielddata; import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.LongValues; import org.apache.lucene.util.NumericUtils; import java.io.IOException; /** - * {@link NumericDocValues} instance that wraps a {@link NumericDoubleValues} + * {@link NumericDocValues} instance that wraps a {@link DoubleValues} * and converts the doubles to sortable long bits using * {@link NumericUtils#doubleToSortableLong(double)}. */ final class SortableLongBitsNumericDocValues extends LongValues { - private final NumericDoubleValues values; + private final DoubleValues values; - SortableLongBitsNumericDocValues(NumericDoubleValues values) { + SortableLongBitsNumericDocValues(DoubleValues values) { this.values = values; } @@ -39,7 +40,7 @@ public boolean advanceExact(int target) throws IOException { } /** Return the wrapped values. */ - public NumericDoubleValues getDoubleValues() { + public DoubleValues getDoubleValues() { return values; } diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java index 8e210c1520b59..5ed4364656c07 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/SortableLongBitsToNumericDoubleValues.java @@ -10,17 +10,18 @@ package org.elasticsearch.index.fielddata; import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.LongValues; import org.apache.lucene.util.NumericUtils; import java.io.IOException; /** - * {@link NumericDoubleValues} instance that wraps a {@link NumericDocValues} + * {@link DoubleValues} instance that wraps a {@link NumericDocValues} * and converts the doubles to sortable long bits using * {@link NumericUtils#sortableLongToDouble(long)}. */ -final class SortableLongBitsToNumericDoubleValues extends NumericDoubleValues { +final class SortableLongBitsToNumericDoubleValues extends DoubleValues { private final LongValues values; diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedDoublesIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedDoublesIndexFieldData.java index 02edaaf821ccb..f47883add6573 100644 --- a/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedDoublesIndexFieldData.java +++ b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedDoublesIndexFieldData.java @@ -16,13 +16,13 @@ import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.index.SortedNumericDocValues; import org.apache.lucene.sandbox.document.HalfFloatPoint; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.util.NumericUtils; import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.IndexFieldDataCache; import org.elasticsearch.index.fielddata.IndexNumericFieldData; import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericLongValues; import org.elasticsearch.index.mapper.IndexType; @@ -183,7 +183,7 @@ public DocValuesScriptFieldFactory getScriptFieldFactory(String name) { /** * Wraps a NumericDocValues and exposes a single 16-bit float per document. */ - static final class SingleHalfFloatValues extends NumericDoubleValues { + static final class SingleHalfFloatValues extends DoubleValues { final NumericDocValues in; SingleHalfFloatValues(NumericDocValues in) { @@ -276,7 +276,7 @@ public DocValuesScriptFieldFactory getScriptFieldFactory(String name) { /** * Wraps a NumericDocValues and exposes a single 32-bit float per document. */ - static final class SingleFloatValues extends NumericDoubleValues { + static final class SingleFloatValues extends DoubleValues { final NumericDocValues in; SingleFloatValues(NumericDocValues in) { diff --git a/server/src/main/java/org/elasticsearch/search/MultiValueMode.java b/server/src/main/java/org/elasticsearch/search/MultiValueMode.java index 7b1dac29ae186..1acafa4869921 100644 --- a/server/src/main/java/org/elasticsearch/search/MultiValueMode.java +++ b/server/src/main/java/org/elasticsearch/search/MultiValueMode.java @@ -15,6 +15,7 @@ import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.index.SortedSetDocValues; import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.LongValues; import org.apache.lucene.util.BitSet; import org.apache.lucene.util.BytesRef; @@ -27,7 +28,6 @@ import org.elasticsearch.index.fielddata.DenseDoubleValues; import org.elasticsearch.index.fielddata.DenseLongValues; import org.elasticsearch.index.fielddata.FieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericLongValues; @@ -615,18 +615,18 @@ protected long pick( } /** - * Return a {@link NumericDoubleValues} instance that can be used to sort documents + * Return a {@link DoubleValues} instance that can be used to sort documents * with this mode and the provided values. When a document has no value, * missingValue is returned. * * Allowed Modes: SUM, AVG, MEDIAN, MIN, MAX */ - public NumericDoubleValues select(final SortedNumericDoubleValues values) { - final NumericDoubleValues singleton = FieldData.unwrapSingleton(values); + public DoubleValues select(final SortedNumericDoubleValues values) { + final DoubleValues singleton = FieldData.unwrapSingleton(values); if (singleton != null) { return singleton; } else { - return new NumericDoubleValues() { + return new DoubleValues() { private double value; @@ -652,7 +652,7 @@ protected double pick(SortedNumericDoubleValues values) throws IOException { } /** - * Return a {@link NumericDoubleValues} instance that can be used to sort root documents + * Return a {@link DoubleValues} instance that can be used to sort root documents * with this mode, the provided values and filters for root/inner documents. * * For every root document, the values of its inner documents will be aggregated. @@ -671,7 +671,7 @@ public DenseDoubleValues select( int maxChildren ) throws IOException { if (parentDocs == null || childDocs == null) { - return FieldData.replaceMissing(FieldData.emptyNumericDouble(), missingValue); + return FieldData.replaceMissing(DoubleValues.EMPTY, missingValue); } return new DenseDoubleValues() { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DoubleValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DoubleValuesSource.java index 4b739ba7d007f..86e9ac7f7df51 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DoubleValuesSource.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/DoubleValuesSource.java @@ -11,6 +11,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.Query; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.BitArray; @@ -18,7 +19,6 @@ import org.elasticsearch.core.CheckedFunction; import org.elasticsearch.core.Releasables; import org.elasticsearch.index.fielddata.FieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.mapper.MappedFieldType; import org.elasticsearch.search.DocValueFormat; @@ -157,7 +157,7 @@ Double toComparable(int slot) { @Override LeafBucketCollector getLeafCollector(LeafReaderContext context, LeafBucketCollector next) throws IOException { final SortedNumericDoubleValues dvs = docValuesFunc.apply(context); - final NumericDoubleValues singleton = FieldData.unwrapSingleton(dvs); + final DoubleValues singleton = FieldData.unwrapSingleton(dvs); return singleton != null ? getLeafCollector(singleton, next) : getLeafCollector(dvs, next); } @@ -184,7 +184,7 @@ public void collect(int doc, long bucket) throws IOException { }; } - private LeafBucketCollector getLeafCollector(NumericDoubleValues dvs, LeafBucketCollector next) { + private LeafBucketCollector getLeafCollector(DoubleValues dvs, LeafBucketCollector next) { return new LeafBucketCollector() { @Override public void collect(int doc, long bucket) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java index 50c8609224909..de4c307b44230 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/HistogramValuesSource.java @@ -10,7 +10,7 @@ package org.elasticsearch.search.aggregations.bucket.composite; import org.apache.lucene.index.LeafReaderContext; -import org.elasticsearch.index.fielddata.NumericDoubleValues; +import org.apache.lucene.search.DoubleValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericLongValues; @@ -39,7 +39,7 @@ public boolean isFloatingPoint() { @Override public SortedNumericDoubleValues doubleValues(LeafReaderContext context) throws IOException { final SortedNumericDoubleValues values = vs.doubleValues(context); - final NumericDoubleValues singleton = org.elasticsearch.index.fielddata.FieldData.unwrapSingleton(values); + final DoubleValues singleton = org.elasticsearch.index.fielddata.FieldData.unwrapSingleton(values); if (singleton != null) { return org.elasticsearch.index.fielddata.FieldData.singleton(doubleSingleValues(singleton)); } else { @@ -66,8 +66,8 @@ public boolean advanceExact(int target) throws IOException { }; } - private NumericDoubleValues doubleSingleValues(NumericDoubleValues values) { - return new NumericDoubleValues() { + private DoubleValues doubleSingleValues(DoubleValues values) { + return new DoubleValues() { @Override public double doubleValue() throws IOException { return Math.floor(values.doubleValue() / interval) * interval; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregator.java index ade2d7d080fe6..4899bbf6a4539 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/NumericHistogramAggregator.java @@ -9,9 +9,9 @@ package org.elasticsearch.search.aggregations.bucket.histogram; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.ScoreMode; import org.elasticsearch.index.fielddata.FieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.aggregations.AggregationExecutionContext; import org.elasticsearch.search.aggregations.Aggregator; @@ -87,7 +87,7 @@ public LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx, } final SortedNumericDoubleValues values = valuesSource.doubleValues(aggCtx.getLeafReaderContext()); - final NumericDoubleValues singleton = FieldData.unwrapSingleton(values); + final DoubleValues singleton = FieldData.unwrapSingleton(values); return singleton != null ? getLeafCollector(singleton, sub) : getLeafCollector(values, sub); } @@ -111,7 +111,7 @@ public void collect(int doc, long owningBucketOrd) throws IOException { }; } - private LeafBucketCollector getLeafCollector(NumericDoubleValues values, LeafBucketCollector sub) { + private LeafBucketCollector getLeafCollector(DoubleValues values, LeafBucketCollector sub) { return new LeafBucketCollectorBase(sub, values) { @Override public void collect(int doc, long owningBucketOrd) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java index 86ec1666e2cea..2decb58367f94 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/VariableWidthHistogramAggregator.java @@ -9,6 +9,7 @@ package org.elasticsearch.search.aggregations.bucket.histogram; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.util.CollectionUtil; import org.apache.lucene.util.InPlaceMergeSorter; @@ -19,7 +20,6 @@ import org.elasticsearch.core.Releasable; import org.elasticsearch.core.Releasables; import org.elasticsearch.index.fielddata.FieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.AggregationExecutionContext; @@ -529,7 +529,7 @@ protected LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCt return LeafBucketCollector.NO_OP_COLLECTOR; } final SortedNumericDoubleValues values = valuesSource.doubleValues(aggCtx.getLeafReaderContext()); - final NumericDoubleValues singleton = FieldData.unwrapSingleton(values); + final DoubleValues singleton = FieldData.unwrapSingleton(values); return singleton != null ? getLeafCollector(singleton, sub) : getLeafCollector(values, sub); } @@ -553,7 +553,7 @@ public void collect(int doc, long bucket) throws IOException { }; } - private LeafBucketCollector getLeafCollector(NumericDoubleValues values, LeafBucketCollector sub) { + private LeafBucketCollector getLeafCollector(DoubleValues values, LeafBucketCollector sub) { return new LeafBucketCollectorBase(sub, values) { @Override public void collect(int doc, long bucket) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java index 6b8c3f7ae86e7..3f5e3d2c00df0 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/RangeAggregator.java @@ -8,6 +8,7 @@ */ package org.elasticsearch.search.aggregations.bucket.range; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.search.ScorerSupplier; import org.elasticsearch.common.io.stream.StreamInput; @@ -16,7 +17,6 @@ import org.elasticsearch.common.util.LongArray; import org.elasticsearch.core.CheckedFunction; import org.elasticsearch.index.fielddata.FieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.mapper.DateFieldMapper.DateFieldType; import org.elasticsearch.index.mapper.DateFieldMapper.Resolution; @@ -643,7 +643,7 @@ private abstract static class NumericRangeAggregator extends RangeAggregator { @Override public LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx, LeafBucketCollector sub) throws IOException { final SortedNumericDoubleValues values = ((ValuesSource.Numeric) this.valuesSource).doubleValues(aggCtx.getLeafReaderContext()); - final NumericDoubleValues singleton = FieldData.unwrapSingleton(values); + final DoubleValues singleton = FieldData.unwrapSingleton(values); if (singleton != null) { super.singletonRanges++; diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractHDRPercentilesAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractHDRPercentilesAggregator.java index 8b0617e116cc1..1bee35f20d100 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractHDRPercentilesAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractHDRPercentilesAggregator.java @@ -10,10 +10,10 @@ package org.elasticsearch.search.aggregations.metrics; import org.HdrHistogram.DoubleHistogram; +import org.apache.lucene.search.DoubleValues; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.ObjectArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.Aggregator; @@ -73,7 +73,7 @@ public void collect(int doc, long bucket) throws IOException { } @Override - protected LeafBucketCollector getLeafCollector(NumericDoubleValues values, LeafBucketCollector sub) { + protected LeafBucketCollector getLeafCollector(DoubleValues values, LeafBucketCollector sub) { return new LeafBucketCollectorBase(sub, values) { @Override public void collect(int doc, long bucket) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractTDigestPercentilesAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractTDigestPercentilesAggregator.java index d52f1ed495b43..f39395ceece8d 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractTDigestPercentilesAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AbstractTDigestPercentilesAggregator.java @@ -9,10 +9,10 @@ package org.elasticsearch.search.aggregations.metrics; +import org.apache.lucene.search.DoubleValues; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.ObjectArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.Aggregator; @@ -71,7 +71,7 @@ public void collect(int doc, long bucket) throws IOException { } @Override - protected LeafBucketCollector getLeafCollector(NumericDoubleValues values, final LeafBucketCollector sub) { + protected LeafBucketCollector getLeafCollector(DoubleValues values, final LeafBucketCollector sub) { return new LeafBucketCollectorBase(sub, values) { @Override public void collect(int doc, long bucket) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AvgAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AvgAggregator.java index f593f0d3923c5..59e8d8eda76f6 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AvgAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/AvgAggregator.java @@ -8,10 +8,10 @@ */ package org.elasticsearch.search.aggregations.metrics; +import org.apache.lucene.search.DoubleValues; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.LongArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.aggregations.Aggregator; import org.elasticsearch.search.aggregations.InternalAggregation; @@ -52,7 +52,7 @@ public void collect(int doc, long bucket) throws IOException { } @Override - protected LeafBucketCollector getLeafCollector(NumericDoubleValues values, final LeafBucketCollector sub) { + protected LeafBucketCollector getLeafCollector(DoubleValues values, final LeafBucketCollector sub) { return new LeafBucketCollectorBase(sub, values) { @Override public void collect(int doc, long bucket) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregator.java index 70651943d103b..aab4ab6abb987 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregator.java @@ -14,6 +14,7 @@ import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.SortedSetDocValues; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.LongValues; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.util.BytesRef; @@ -27,7 +28,6 @@ import org.elasticsearch.core.Releasable; import org.elasticsearch.core.Releasables; import org.elasticsearch.index.fielddata.FieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericLongValues; @@ -95,7 +95,7 @@ private Collector pickCollector(LeafReaderContext ctx) throws IOException { numericCollectorsUsed++; if (source.isFloatingPoint()) { SortedNumericDoubleValues values = source.doubleValues(ctx); - NumericDoubleValues singleton = FieldData.unwrapSingleton(values); + DoubleValues singleton = FieldData.unwrapSingleton(values); if (singleton != null) { return new DirectSingleValuesCollector(counts, MurmurHash3SingleValues.hash(singleton)); } else { @@ -485,7 +485,7 @@ private abstract static class MurmurHash3SingleValues { /** * Return a {@link MurmurHash3MultiValues} instance that computes hashes on the fly for each double value. */ - public static MurmurHash3SingleValues hash(NumericDoubleValues values) { + public static MurmurHash3SingleValues hash(DoubleValues values) { return new Double(values); } @@ -524,9 +524,9 @@ public long longValue() throws IOException { private static class Double extends MurmurHash3SingleValues { - private final NumericDoubleValues values; + private final DoubleValues values; - Double(NumericDoubleValues values) { + Double(DoubleValues values) { this.values = values; } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregator.java index 5328dad7eedd8..20cbc907f6dc2 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregator.java @@ -8,11 +8,11 @@ */ package org.elasticsearch.search.aggregations.metrics; +import org.apache.lucene.search.DoubleValues; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.DoubleArray; import org.elasticsearch.common.util.LongArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.Aggregator; @@ -104,7 +104,7 @@ public void collect(int doc, long bucket) throws IOException { } @Override - protected LeafBucketCollector getLeafCollector(NumericDoubleValues values, final LeafBucketCollector sub) { + protected LeafBucketCollector getLeafCollector(DoubleValues values, final LeafBucketCollector sub) { return new LeafBucketCollectorBase(sub, values) { @Override diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MaxAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MaxAggregator.java index 32eb7732ecdc0..58973b3468681 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MaxAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MaxAggregator.java @@ -10,11 +10,11 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.PointValues; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.util.Bits; import org.elasticsearch.common.util.DoubleArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; @@ -81,7 +81,7 @@ public LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx, } } final SortedNumericDoubleValues allValues = valuesSource.doubleValues(aggCtx.getLeafReaderContext()); - final NumericDoubleValues values = MultiValueMode.MAX.select(allValues); + final DoubleValues values = MultiValueMode.MAX.select(allValues); return new LeafBucketCollectorBase(sub, allValues) { @Override diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregator.java index e25d0443d0051..f5cdb757a0157 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MedianAbsoluteDeviationAggregator.java @@ -9,10 +9,10 @@ package org.elasticsearch.search.aggregations.metrics; +import org.apache.lucene.search.DoubleValues; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.ObjectArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.Aggregator; @@ -85,7 +85,7 @@ public void collect(int doc, long bucket) throws IOException { } @Override - protected LeafBucketCollector getLeafCollector(NumericDoubleValues values, LeafBucketCollector sub) { + protected LeafBucketCollector getLeafCollector(DoubleValues values, LeafBucketCollector sub) { return new LeafBucketCollectorBase(sub, values) { @Override public void collect(int doc, long bucket) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MinAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MinAggregator.java index 6487a3e2f389b..051dcf510a1db 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MinAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/MinAggregator.java @@ -11,11 +11,11 @@ import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.PointValues; import org.apache.lucene.search.CollectionTerminatedException; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.util.Bits; import org.elasticsearch.common.util.DoubleArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; @@ -81,7 +81,7 @@ public LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx, } } final SortedNumericDoubleValues allValues = valuesSource.doubleValues(aggCtx.getLeafReaderContext()); - final NumericDoubleValues values = MultiValueMode.MIN.select(allValues); + final DoubleValues values = MultiValueMode.MIN.select(allValues); return new LeafBucketCollectorBase(sub, allValues) { @Override public void collect(int doc, long bucket) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java index d59615630c706..7ed1bf3faafd4 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/NumericMetricsAggregator.java @@ -8,10 +8,10 @@ */ package org.elasticsearch.search.aggregations.metrics; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.ScoreMode; import org.elasticsearch.common.util.Comparators; import org.elasticsearch.index.fielddata.FieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.aggregations.AggregationExecutionContext; import org.elasticsearch.search.aggregations.Aggregator; @@ -75,13 +75,13 @@ public ScoreMode scoreMode() { public final LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx, final LeafBucketCollector sub) throws IOException { final SortedNumericDoubleValues values = valuesSource.doubleValues(aggCtx.getLeafReaderContext()); - final NumericDoubleValues singleton = FieldData.unwrapSingleton(values); + final DoubleValues singleton = FieldData.unwrapSingleton(values); return singleton != null ? getLeafCollector(singleton, sub) : getLeafCollector(values, sub); } protected abstract LeafBucketCollector getLeafCollector(SortedNumericDoubleValues values, LeafBucketCollector sub); - protected abstract LeafBucketCollector getLeafCollector(NumericDoubleValues values, LeafBucketCollector sub); + protected abstract LeafBucketCollector getLeafCollector(DoubleValues values, LeafBucketCollector sub); } public abstract static class MultiValue extends NumericMetricsAggregator { @@ -131,12 +131,12 @@ public ScoreMode scoreMode() { public final LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx, final LeafBucketCollector sub) throws IOException { final SortedNumericDoubleValues values = valuesSource.doubleValues(aggCtx.getLeafReaderContext()); - final NumericDoubleValues singleton = FieldData.unwrapSingleton(values); + final DoubleValues singleton = FieldData.unwrapSingleton(values); return singleton != null ? getLeafCollector(singleton, sub) : getLeafCollector(values, sub); } protected abstract LeafBucketCollector getLeafCollector(SortedNumericDoubleValues values, LeafBucketCollector sub); - protected abstract LeafBucketCollector getLeafCollector(NumericDoubleValues values, LeafBucketCollector sub); + protected abstract LeafBucketCollector getLeafCollector(DoubleValues values, LeafBucketCollector sub); } } diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/StatsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/StatsAggregator.java index a01d9cf61f8bc..4571dd1ae82c8 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/StatsAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/StatsAggregator.java @@ -8,11 +8,11 @@ */ package org.elasticsearch.search.aggregations.metrics; +import org.apache.lucene.search.DoubleValues; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.DoubleArray; import org.elasticsearch.common.util.LongArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.Aggregator; @@ -80,7 +80,7 @@ public void collect(int doc, long bucket) throws IOException { } @Override - public LeafBucketCollector getLeafCollector(NumericDoubleValues values, LeafBucketCollector sub) { + public LeafBucketCollector getLeafCollector(DoubleValues values, LeafBucketCollector sub) { return new LeafBucketCollectorBase(sub, values) { @Override public void collect(int doc, long bucket) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/SumAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/SumAggregator.java index 2d9b51b8f2d49..10af972c5e5d5 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/SumAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/SumAggregator.java @@ -8,10 +8,10 @@ */ package org.elasticsearch.search.aggregations.metrics; +import org.apache.lucene.search.DoubleValues; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.DoubleArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.aggregations.Aggregator; @@ -91,7 +91,7 @@ private static double addIfNonOrInf(double added, double value) { } @Override - protected LeafBucketCollector getLeafCollector(NumericDoubleValues values, final LeafBucketCollector sub) { + protected LeafBucketCollector getLeafCollector(DoubleValues values, final LeafBucketCollector sub) { return new LeafBucketCollectorBase(sub, values) { @Override public void collect(int doc, long bucket) throws IOException { diff --git a/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java index 106b483790fe3..df656bfa21e2c 100644 --- a/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java @@ -11,6 +11,7 @@ import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.Scorable; import org.apache.lucene.search.SortField; import org.apache.lucene.util.BytesRef; @@ -26,7 +27,6 @@ import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.IndexFieldData; import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.fielddata.fieldcomparator.BytesRefFieldComparatorSource; @@ -339,7 +339,7 @@ protected SortedNumericDoubleValues getValues(LeafReaderContext context) throws // we may see the same leaf context multiple times, and each time we need to refresh the doc values doc reader NumberSortScript leafScript = numberSortScriptFactory.newInstance(new DocValuesDocReader(searchLookup, context)); leafScripts.put(context.id(), leafScript); - final NumericDoubleValues values = new NumericDoubleValues() { + final DoubleValues values = new DoubleValues() { @Override public boolean advanceExact(int doc) { leafScript.setDocument(doc); diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java index 95ff725a13bd0..60f409c0d30f9 100644 --- a/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java +++ b/server/src/test/java/org/elasticsearch/index/fielddata/FieldDataTests.java @@ -44,7 +44,7 @@ public void testSortableLongBitsToDoubles() throws IOException { LongValues values = new DummyValues(valueBits); SortedNumericDoubleValues asMultiDoubles = FieldData.sortableLongBitsToDoubles(SortedNumericLongValues.singleton(values)); - NumericDoubleValues asDoubles = FieldData.unwrapSingleton(asMultiDoubles); + DoubleValues asDoubles = FieldData.unwrapSingleton(asMultiDoubles); assertNotNull(asDoubles); assertTrue(asDoubles.advanceExact(0)); assertEquals(value, asDoubles.doubleValue(), 0); @@ -81,7 +81,7 @@ public void testDoublesToSortableLongBits() throws IOException { final double value = randomDouble(); final long valueBits = NumericUtils.doubleToSortableLong(value); - NumericDoubleValues values = new NumericDoubleValues() { + DoubleValues values = new DoubleValues() { @Override public boolean advanceExact(int doc) throws IOException { return true; @@ -162,8 +162,8 @@ public void testReplaceMissingLongs() throws IOException { assertEquals(4L, replaced.longValue()); } - private static NumericDoubleValues asNumericDoubleValues(Double... values) { - return new NumericDoubleValues() { + private static DoubleValues asNumericDoubleValues(Double... values) { + return new DoubleValues() { int docID = -1; @@ -181,7 +181,7 @@ public double doubleValue() throws IOException { } public void testReplaceMissingDoubles() throws IOException { - final NumericDoubleValues values = asNumericDoubleValues(null, 1.3, 1.2, null, 1.5, null); + final DoubleValues values = asNumericDoubleValues(null, 1.3, 1.2, null, 1.5, null); final DoubleValues replaced = FieldData.replaceMissing(values, 1.4); assertTrue(replaced.advanceExact(0)); diff --git a/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java b/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java index b82e7b91f2551..94a933715006e 100644 --- a/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java +++ b/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java @@ -24,7 +24,6 @@ import org.elasticsearch.index.fielddata.AbstractSortedDocValues; import org.elasticsearch.index.fielddata.AbstractSortedSetDocValues; import org.elasticsearch.index.fielddata.FieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericLongValues; @@ -274,7 +273,7 @@ public void testSingleValuedDoubles() throws Exception { docsWithValue.set(i); } } - final Supplier multiValues = () -> FieldData.singleton(new NumericDoubleValues() { + final Supplier multiValues = () -> FieldData.singleton(new DoubleValues() { int docID; @Override @@ -337,7 +336,7 @@ public int docValueCount() { private void verifySortedNumericDouble(Supplier supplier, int maxDoc) throws IOException { for (MultiValueMode mode : MultiValueMode.values()) { SortedNumericDoubleValues values = supplier.get(); - final NumericDoubleValues selected = mode.select(values); + final DoubleValues selected = mode.select(values); for (int i = 0; i < maxDoc; ++i) { Double actual = null; if (selected.advanceExact(i)) { diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregator.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregator.java index ebcfeb0b40f74..534b9f9a28005 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregator.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/multiterms/MultiTermsAggregator.java @@ -9,6 +9,7 @@ import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.LongValues; import org.apache.lucene.search.ScoreMode; import org.apache.lucene.util.BytesRef; @@ -24,7 +25,6 @@ import org.elasticsearch.common.util.ObjectArrayPriorityQueue; import org.elasticsearch.core.Releasables; import org.elasticsearch.index.fielddata.FieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericLongValues; @@ -446,7 +446,7 @@ static class DoubleTermValuesSource implements TermValuesSource { @Override public TermValues getValues(LeafReaderContext ctx) throws IOException { final SortedNumericDoubleValues values = source.doubleValues(ctx); - final NumericDoubleValues singleton = FieldData.unwrapSingleton(values); + final DoubleValues singleton = FieldData.unwrapSingleton(values); return singleton != null ? getValues(singleton) : getValues(values); } @@ -470,7 +470,7 @@ public TermValues getValues(SortedNumericDoubleValues values) { }; } - public TermValues getValues(NumericDoubleValues values) { + public TermValues getValues(DoubleValues values) { return doc -> { if (values.advanceExact(doc)) { return List.of(values.doubleValue()); diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/TimeSeriesRateAggregator.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/TimeSeriesRateAggregator.java index f153a397f9f58..2940dca69212d 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/TimeSeriesRateAggregator.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/rate/TimeSeriesRateAggregator.java @@ -7,11 +7,11 @@ package org.elasticsearch.xpack.analytics.rate; +import org.apache.lucene.search.DoubleValues; import org.elasticsearch.common.Rounding; import org.elasticsearch.common.util.DoubleArray; import org.elasticsearch.common.util.LongArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.AggregationExecutionContext; @@ -107,7 +107,7 @@ private double checkForResets(double latestValue) { @Override protected LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx, LeafBucketCollector sub) throws IOException { - NumericDoubleValues leafValues = MultiValueMode.MAX.select(valuesSource.doubleValues(aggCtx.getLeafReaderContext())); + DoubleValues leafValues = MultiValueMode.MAX.select(valuesSource.doubleValues(aggCtx.getLeafReaderContext())); return new LeafBucketCollectorBase(sub, null) { @Override public void collect(int doc, long bucket) throws IOException { diff --git a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregator.java b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregator.java index e30266ab58131..349dcdf141965 100644 --- a/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregator.java +++ b/x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/topmetrics/TopMetricsAggregator.java @@ -9,6 +9,7 @@ import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.SortedSetDocValues; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.LongValues; import org.apache.lucene.search.Scorable; import org.apache.lucene.search.ScoreMode; @@ -20,7 +21,6 @@ import org.elasticsearch.common.util.ObjectArray; import org.elasticsearch.core.Releasable; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; import org.elasticsearch.search.aggregations.AggregationExecutionContext; @@ -313,7 +313,7 @@ public void swap(long lhs, long rhs) { @Override public Loader loader(LeafReaderContext ctx) throws IOException { // TODO allow configuration of value mode - NumericDoubleValues metricValues = MultiValueMode.AVG.select(valuesSource.doubleValues(ctx)); + DoubleValues metricValues = MultiValueMode.AVG.select(valuesSource.doubleValues(ctx)); return (index, doc) -> { if (index >= values.size()) { values = bigArrays.grow(values, index + 1); diff --git a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/aggregations/metrics/AggregateMetricBackedMaxAggregator.java b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/aggregations/metrics/AggregateMetricBackedMaxAggregator.java index a007f334a69e2..36635033ce32b 100644 --- a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/aggregations/metrics/AggregateMetricBackedMaxAggregator.java +++ b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/aggregations/metrics/AggregateMetricBackedMaxAggregator.java @@ -6,11 +6,11 @@ */ package org.elasticsearch.xpack.aggregatemetric.aggregations.metrics; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.ScoreMode; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.DoubleArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; @@ -59,7 +59,7 @@ public ScoreMode scoreMode() { public LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx, final LeafBucketCollector sub) throws IOException { final BigArrays bigArrays = bigArrays(); final SortedNumericDoubleValues allValues = valuesSource.getAggregateMetricValues(aggCtx.getLeafReaderContext(), Metric.max); - final NumericDoubleValues values = MultiValueMode.MAX.select(allValues); + final DoubleValues values = MultiValueMode.MAX.select(allValues); return new LeafBucketCollectorBase(sub, allValues) { @Override diff --git a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/aggregations/metrics/AggregateMetricBackedMinAggregator.java b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/aggregations/metrics/AggregateMetricBackedMinAggregator.java index 3b024c512aa82..095d6a00a2098 100644 --- a/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/aggregations/metrics/AggregateMetricBackedMinAggregator.java +++ b/x-pack/plugin/mapper-aggregate-metric/src/main/java/org/elasticsearch/xpack/aggregatemetric/aggregations/metrics/AggregateMetricBackedMinAggregator.java @@ -6,11 +6,11 @@ */ package org.elasticsearch.xpack.aggregatemetric.aggregations.metrics; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.ScoreMode; import org.elasticsearch.common.util.BigArrays; import org.elasticsearch.common.util.DoubleArray; import org.elasticsearch.core.Releasables; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.search.DocValueFormat; import org.elasticsearch.search.MultiValueMode; @@ -59,7 +59,7 @@ public ScoreMode scoreMode() { public LeafBucketCollector getLeafCollector(AggregationExecutionContext aggCtx, final LeafBucketCollector sub) throws IOException { final BigArrays bigArrays = bigArrays(); final SortedNumericDoubleValues allValues = valuesSource.getAggregateMetricValues(aggCtx.getLeafReaderContext(), Metric.min); - final NumericDoubleValues values = MultiValueMode.MIN.select(allValues); + final DoubleValues values = MultiValueMode.MIN.select(allValues); return new LeafBucketCollectorBase(sub, allValues) { @Override diff --git a/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongLeafFieldData.java b/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongLeafFieldData.java index 472106a5fdfb8..25ef2db8ca9fb 100644 --- a/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongLeafFieldData.java +++ b/x-pack/plugin/mapper-unsigned-long/src/main/java/org/elasticsearch/xpack/unsignedlong/UnsignedLongLeafFieldData.java @@ -7,11 +7,11 @@ package org.elasticsearch.xpack.unsignedlong; +import org.apache.lucene.search.DoubleValues; import org.apache.lucene.search.LongValues; import org.elasticsearch.index.fielddata.FieldData; import org.elasticsearch.index.fielddata.FormattedDocValues; import org.elasticsearch.index.fielddata.LeafNumericFieldData; -import org.elasticsearch.index.fielddata.NumericDoubleValues; import org.elasticsearch.index.fielddata.SortedBinaryDocValues; import org.elasticsearch.index.fielddata.SortedNumericDoubleValues; import org.elasticsearch.index.fielddata.SortedNumericLongValues; @@ -43,7 +43,7 @@ public SortedNumericDoubleValues getDoubleValues() { final SortedNumericLongValues values = signedLongFD.getLongValues(); final LongValues singleValues = SortedNumericLongValues.unwrapSingleton(values); if (singleValues != null) { - return FieldData.singleton(new NumericDoubleValues() { + return FieldData.singleton(new DoubleValues() { @Override public boolean advanceExact(int doc) throws IOException { return singleValues.advanceExact(doc);