Skip to content

Commit ef86723

Browse files
authored
ESQL: Move doc values BlockLoader impls (#137063)
We have a bunch of these as inner classes. Some of them are inner classes of the field types they support - which is fine and good. But a bunch of the shared ones were inner classes of `BlockDocValuesReader` which made the class like a billion lines long. And it made it harder to find the source code of the shared ones because they weren't in alphabetical order. This moves these block loaders to top level classes. And lets our IDE put them in alphabetical order for us. Which is nice because we'll be adding a bunch more of them as we move further on #137002.
1 parent ad5d545 commit ef86723

File tree

45 files changed

+1524
-1361
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1524
-1361
lines changed

modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.elasticsearch.index.fielddata.SourceValueFetcherSortedDoubleIndexFieldData;
3232
import org.elasticsearch.index.fielddata.plain.LeafDoubleFieldData;
3333
import org.elasticsearch.index.fielddata.plain.SortedNumericIndexFieldData;
34-
import org.elasticsearch.index.mapper.BlockDocValuesReader;
3534
import org.elasticsearch.index.mapper.BlockLoader;
3635
import org.elasticsearch.index.mapper.BlockSourceReader;
3736
import org.elasticsearch.index.mapper.CompositeSyntheticFieldLoader;
@@ -51,6 +50,7 @@
5150
import org.elasticsearch.index.mapper.TextSearchInfo;
5251
import org.elasticsearch.index.mapper.TimeSeriesParams;
5352
import org.elasticsearch.index.mapper.ValueFetcher;
53+
import org.elasticsearch.index.mapper.blockloader.docvalues.DoublesBlockLoader;
5454
import org.elasticsearch.index.query.SearchExecutionContext;
5555
import org.elasticsearch.script.field.DocValuesScriptFieldFactory;
5656
import org.elasticsearch.script.field.ScaledFloatDocValuesField;
@@ -382,7 +382,7 @@ public BlockLoader blockLoader(BlockLoaderContext blContext) {
382382
return BlockLoader.CONSTANT_NULLS;
383383
}
384384
if (hasDocValues() && (blContext.fieldExtractPreference() != FieldExtractPreference.STORED || isSyntheticSource)) {
385-
return new BlockDocValuesReader.DoublesBlockLoader(name(), l -> l / scalingFactor);
385+
return new DoublesBlockLoader(name(), l -> l / scalingFactor);
386386
}
387387
// Multi fields don't have fallback synthetic source.
388388
if (isSyntheticSource && blContext.parentField(name()) == null) {

server/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,4 +499,5 @@
499499
exports org.elasticsearch.index.codec.vectors.cluster to org.elasticsearch.test.knn;
500500
exports org.elasticsearch.index.codec.vectors.es93 to org.elasticsearch.test.knn;
501501
exports org.elasticsearch.search.crossproject;
502+
exports org.elasticsearch.index.mapper.blockloader.docvalues;
502503
}

server/src/main/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesProducer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
import org.elasticsearch.core.Assertions;
4747
import org.elasticsearch.core.IOUtils;
4848
import org.elasticsearch.index.codec.tsdb.TSDBDocValuesEncoder;
49-
import org.elasticsearch.index.mapper.BlockDocValuesReader;
5049
import org.elasticsearch.index.mapper.BlockLoader;
50+
import org.elasticsearch.index.mapper.blockloader.docvalues.BlockDocValuesReader;
5151

5252
import java.io.IOException;
5353

server/src/main/java/org/elasticsearch/index/mapper/AbstractShapeGeometryFieldMapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.apache.lucene.index.LeafReaderContext;
1313
import org.elasticsearch.common.Explicit;
1414
import org.elasticsearch.common.geo.Orientation;
15+
import org.elasticsearch.index.mapper.blockloader.docvalues.BlockDocValuesReader;
1516
import org.elasticsearch.lucene.spatial.Extent;
1617
import org.elasticsearch.lucene.spatial.GeometryDocValueReader;
1718

0 commit comments

Comments
 (0)