|
@@ -25,8 +25,6 @@ import org.elasticsearch.index.fielddata.IndexFieldData;
|
|
|
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
|
|
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
|
|
|
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
|
|
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
|
|
|
import org.elasticsearch.index.fielddata.NumericDoubleValues;
|
|
import org.elasticsearch.index.fielddata.NumericDoubleValues;
|
|
|
-import org.elasticsearch.index.fielddata.ScriptDocValues.Doubles;
|
|
|
|
|
-import org.elasticsearch.index.fielddata.ScriptDocValues.DoublesSupplier;
|
|
|
|
|
import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
|
|
import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
|
|
|
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
|
|
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
|
|
|
import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData;
|
|
import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData;
|
|
@@ -40,8 +38,8 @@ import org.elasticsearch.index.mapper.TextSearchInfo;
|
|
|
import org.elasticsearch.index.mapper.TimeSeriesParams;
|
|
import org.elasticsearch.index.mapper.TimeSeriesParams;
|
|
|
import org.elasticsearch.index.mapper.ValueFetcher;
|
|
import org.elasticsearch.index.mapper.ValueFetcher;
|
|
|
import org.elasticsearch.index.query.SearchExecutionContext;
|
|
import org.elasticsearch.index.query.SearchExecutionContext;
|
|
|
-import org.elasticsearch.script.field.DelegateDocValuesField;
|
|
|
|
|
import org.elasticsearch.script.field.DocValuesField;
|
|
import org.elasticsearch.script.field.DocValuesField;
|
|
|
|
|
+import org.elasticsearch.script.field.ScaledFloatDocValuesField;
|
|
|
import org.elasticsearch.script.field.ToScriptField;
|
|
import org.elasticsearch.script.field.ToScriptField;
|
|
|
import org.elasticsearch.search.DocValueFormat;
|
|
import org.elasticsearch.search.DocValueFormat;
|
|
|
import org.elasticsearch.search.aggregations.support.ValuesSourceType;
|
|
import org.elasticsearch.search.aggregations.support.ValuesSourceType;
|
|
@@ -267,11 +265,7 @@ public class ScaledFloatFieldMapper extends FieldMapper {
|
|
|
IndexNumericFieldData.NumericType.LONG,
|
|
IndexNumericFieldData.NumericType.LONG,
|
|
|
(dv, n) -> { throw new UnsupportedOperationException(); }
|
|
(dv, n) -> { throw new UnsupportedOperationException(); }
|
|
|
).build(cache, breakerService);
|
|
).build(cache, breakerService);
|
|
|
- return new ScaledFloatIndexFieldData(
|
|
|
|
|
- scaledValues,
|
|
|
|
|
- scalingFactor,
|
|
|
|
|
- (dv, n) -> new DelegateDocValuesField(new Doubles(new DoublesSupplier(dv)), n)
|
|
|
|
|
- );
|
|
|
|
|
|
|
+ return new ScaledFloatIndexFieldData(scaledValues, scalingFactor, ScaledFloatDocValuesField::new);
|
|
|
};
|
|
};
|
|
|
}
|
|
}
|
|
|
|
|
|