Skip to content

Commit 3e607d9

Browse files
romseygeekromseygeek
authored
Rename AtomicFieldData to LeafFieldData (#53554)
This conforms with lucene's LeafReader naming convention, and matches other per-segment structures in elasticsearch.
1 parent 68a698f commit 3e607d9

File tree

76 files changed

+307
-307
lines changed

Some content is hidden

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

76 files changed

+307
-307
lines changed

‎modules/lang-expression/src/main/java/org/elasticsearch/script/expression/CountMethodValueSource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.lucene.queries.function.FunctionValues;
2828
import org.apache.lucene.queries.function.ValueSource;
2929
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
30-
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
30+
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
3131
import org.elasticsearch.index.fielddata.IndexFieldData;
3232
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
3333

@@ -46,7 +46,7 @@ final class CountMethodValueSource extends ValueSource {
4646
@Override
4747
@SuppressWarnings("rawtypes") // ValueSource uses a rawtype
4848
public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException {
49-
AtomicNumericFieldData leafData = (AtomicNumericFieldData) fieldData.load(leaf);
49+
LeafNumericFieldData leafData = (LeafNumericFieldData) fieldData.load(leaf);
5050
final SortedNumericDoubleValues values = leafData.getDoubleValues();
5151

5252
return new DoubleDocValues(this) {

‎modules/lang-expression/src/main/java/org/elasticsearch/script/expression/DateMethodValueSource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.lucene.index.LeafReaderContext;
3030
import org.apache.lucene.queries.function.FunctionValues;
3131
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
32-
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
32+
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
3333
import org.elasticsearch.index.fielddata.IndexFieldData;
3434
import org.elasticsearch.index.fielddata.NumericDoubleValues;
3535
import org.elasticsearch.search.MultiValueMode;
@@ -52,7 +52,7 @@ class DateMethodValueSource extends FieldDataValueSource {
5252
@Override
5353
@SuppressWarnings("rawtypes") // ValueSource uses a rawtype
5454
public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException {
55-
AtomicNumericFieldData leafData = (AtomicNumericFieldData) fieldData.load(leaf);
55+
LeafNumericFieldData leafData = (LeafNumericFieldData) fieldData.load(leaf);
5656
final Calendar calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ROOT);
5757
NumericDoubleValues docValues = multiValueMode.select(leafData.getDoubleValues());
5858
return new DoubleDocValues(this) {

‎modules/lang-expression/src/main/java/org/elasticsearch/script/expression/DateObjectValueSource.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.lucene.index.LeafReaderContext;
2828
import org.apache.lucene.queries.function.FunctionValues;
2929
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
30-
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
30+
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
3131
import org.elasticsearch.index.fielddata.IndexFieldData;
3232
import org.elasticsearch.index.fielddata.NumericDoubleValues;
3333
import org.elasticsearch.search.MultiValueMode;
@@ -41,7 +41,7 @@ class DateObjectValueSource extends FieldDataValueSource {
4141
final String methodName;
4242
final ToIntFunction<ReadableDateTime> function;
4343

44-
DateObjectValueSource(IndexFieldData<?> indexFieldData, MultiValueMode multiValueMode,
44+
DateObjectValueSource(IndexFieldData<?> indexFieldData, MultiValueMode multiValueMode,
4545
String methodName, ToIntFunction<ReadableDateTime> function) {
4646
super(indexFieldData, multiValueMode);
4747

@@ -54,7 +54,7 @@ class DateObjectValueSource extends FieldDataValueSource {
5454
@Override
5555
@SuppressWarnings("rawtypes") // ValueSource uses a rawtype
5656
public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException {
57-
AtomicNumericFieldData leafData = (AtomicNumericFieldData) fieldData.load(leaf);
57+
LeafNumericFieldData leafData = (LeafNumericFieldData) fieldData.load(leaf);
5858
MutableDateTime joda = new MutableDateTime(0, DateTimeZone.UTC);
5959
NumericDoubleValues docValues = multiValueMode.select(leafData.getDoubleValues());
6060
return new DoubleDocValues(this) {

‎modules/lang-expression/src/main/java/org/elasticsearch/script/expression/EmptyMemberValueSource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.lucene.queries.function.FunctionValues;
2424
import org.apache.lucene.queries.function.ValueSource;
2525
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
26-
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
26+
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
2727
import org.elasticsearch.index.fielddata.IndexFieldData;
2828
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
2929

@@ -46,7 +46,7 @@ final class EmptyMemberValueSource extends ValueSource {
4646
@Override
4747
@SuppressWarnings("rawtypes") // ValueSource uses a rawtype
4848
public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException {
49-
AtomicNumericFieldData leafData = (AtomicNumericFieldData) fieldData.load(leaf);
49+
LeafNumericFieldData leafData = (LeafNumericFieldData) fieldData.load(leaf);
5050
final SortedNumericDoubleValues values = leafData.getDoubleValues();
5151
return new DoubleDocValues(this) {
5252
@Override

‎modules/lang-expression/src/main/java/org/elasticsearch/script/expression/FieldDataValueSource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.lucene.queries.function.FunctionValues;
2828
import org.apache.lucene.queries.function.ValueSource;
2929
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
30-
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
30+
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
3131
import org.elasticsearch.index.fielddata.IndexFieldData;
3232
import org.elasticsearch.index.fielddata.NumericDoubleValues;
3333
import org.elasticsearch.search.MultiValueMode;
@@ -67,7 +67,7 @@ public int hashCode() {
6767
@Override
6868
@SuppressWarnings("rawtypes") // ValueSource uses a rawtype
6969
public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException {
70-
AtomicNumericFieldData leafData = (AtomicNumericFieldData) fieldData.load(leaf);
70+
LeafNumericFieldData leafData = (LeafNumericFieldData) fieldData.load(leaf);
7171
NumericDoubleValues docValues = multiValueMode.select(leafData.getDoubleValues());
7272
return new DoubleDocValues(this) {
7373
@Override

‎modules/lang-expression/src/main/java/org/elasticsearch/script/expression/GeoEmptyValueSource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.lucene.queries.function.FunctionValues;
2828
import org.apache.lucene.queries.function.ValueSource;
2929
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
30-
import org.elasticsearch.index.fielddata.AtomicGeoPointFieldData;
30+
import org.elasticsearch.index.fielddata.LeafGeoPointFieldData;
3131
import org.elasticsearch.index.fielddata.IndexFieldData;
3232
import org.elasticsearch.index.fielddata.MultiGeoPointValues;
3333

@@ -44,7 +44,7 @@ final class GeoEmptyValueSource extends ValueSource {
4444
@Override
4545
@SuppressWarnings("rawtypes") // ValueSource uses a rawtype
4646
public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException {
47-
AtomicGeoPointFieldData leafData = (AtomicGeoPointFieldData) fieldData.load(leaf);
47+
LeafGeoPointFieldData leafData = (LeafGeoPointFieldData) fieldData.load(leaf);
4848
final MultiGeoPointValues values = leafData.getGeoPointValues();
4949
return new DoubleDocValues(this) {
5050
@Override

‎modules/lang-expression/src/main/java/org/elasticsearch/script/expression/GeoLatitudeValueSource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.lucene.queries.function.FunctionValues;
2828
import org.apache.lucene.queries.function.ValueSource;
2929
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
30-
import org.elasticsearch.index.fielddata.AtomicGeoPointFieldData;
30+
import org.elasticsearch.index.fielddata.LeafGeoPointFieldData;
3131
import org.elasticsearch.index.fielddata.IndexFieldData;
3232
import org.elasticsearch.index.fielddata.MultiGeoPointValues;
3333

@@ -44,7 +44,7 @@ final class GeoLatitudeValueSource extends ValueSource {
4444
@Override
4545
@SuppressWarnings("rawtypes") // ValueSource uses a rawtype
4646
public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException {
47-
AtomicGeoPointFieldData leafData = (AtomicGeoPointFieldData) fieldData.load(leaf);
47+
LeafGeoPointFieldData leafData = (LeafGeoPointFieldData) fieldData.load(leaf);
4848
final MultiGeoPointValues values = leafData.getGeoPointValues();
4949
return new DoubleDocValues(this) {
5050
@Override

‎modules/lang-expression/src/main/java/org/elasticsearch/script/expression/GeoLongitudeValueSource.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.apache.lucene.queries.function.FunctionValues;
2828
import org.apache.lucene.queries.function.ValueSource;
2929
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
30-
import org.elasticsearch.index.fielddata.AtomicGeoPointFieldData;
30+
import org.elasticsearch.index.fielddata.LeafGeoPointFieldData;
3131
import org.elasticsearch.index.fielddata.IndexFieldData;
3232
import org.elasticsearch.index.fielddata.MultiGeoPointValues;
3333

@@ -44,7 +44,7 @@ final class GeoLongitudeValueSource extends ValueSource {
4444
@Override
4545
@SuppressWarnings("rawtypes") // ValueSource uses a rawtype
4646
public FunctionValues getValues(Map context, LeafReaderContext leaf) throws IOException {
47-
AtomicGeoPointFieldData leafData = (AtomicGeoPointFieldData) fieldData.load(leaf);
47+
LeafGeoPointFieldData leafData = (LeafGeoPointFieldData) fieldData.load(leaf);
4848
final MultiGeoPointValues values = leafData.getGeoPointValues();
4949
return new DoubleDocValues(this) {
5050
@Override

‎modules/lang-expression/src/test/java/org/elasticsearch/script/expression/ExpressionFieldScriptTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.elasticsearch.script.expression;
2121

22-
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
22+
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
2323
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
2424
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
2525
import org.elasticsearch.index.mapper.MapperService;
@@ -56,7 +56,7 @@ public void setUp() throws Exception {
5656
when(doubleValues.advanceExact(anyInt())).thenReturn(true);
5757
when(doubleValues.nextValue()).thenReturn(2.718);
5858

59-
AtomicNumericFieldData atomicFieldData = mock(AtomicNumericFieldData.class);
59+
LeafNumericFieldData atomicFieldData = mock(LeafNumericFieldData.class);
6060
when(atomicFieldData.getDoubleValues()).thenReturn(doubleValues);
6161

6262
IndexNumericFieldData fieldData = mock(IndexNumericFieldData.class);

‎modules/lang-expression/src/test/java/org/elasticsearch/script/expression/ExpressionNumberSortScriptTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.elasticsearch.script.expression;
2121

22-
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
22+
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
2323
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
2424
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
2525
import org.elasticsearch.index.mapper.MapperService;
@@ -56,7 +56,7 @@ public void setUp() throws Exception {
5656
when(doubleValues.advanceExact(anyInt())).thenReturn(true);
5757
when(doubleValues.nextValue()).thenReturn(2.718);
5858

59-
AtomicNumericFieldData atomicFieldData = mock(AtomicNumericFieldData.class);
59+
LeafNumericFieldData atomicFieldData = mock(LeafNumericFieldData.class);
6060
when(atomicFieldData.getDoubleValues()).thenReturn(doubleValues);
6161

6262
IndexNumericFieldData fieldData = mock(IndexNumericFieldData.class);

‎modules/lang-expression/src/test/java/org/elasticsearch/script/expression/ExpressionTermsSetQueryTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.elasticsearch.script.expression;
2121

22-
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
22+
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
2323
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
2424
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
2525
import org.elasticsearch.index.mapper.MapperService;
@@ -56,7 +56,7 @@ public void setUp() throws Exception {
5656
when(doubleValues.advanceExact(anyInt())).thenReturn(true);
5757
when(doubleValues.nextValue()).thenReturn(2.718);
5858

59-
AtomicNumericFieldData atomicFieldData = mock(AtomicNumericFieldData.class);
59+
LeafNumericFieldData atomicFieldData = mock(LeafNumericFieldData.class);
6060
when(atomicFieldData.getDoubleValues()).thenReturn(doubleValues);
6161

6262
IndexNumericFieldData fieldData = mock(IndexNumericFieldData.class);

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.elasticsearch.common.xcontent.support.XContentMapValues;
4444
import org.elasticsearch.index.Index;
4545
import org.elasticsearch.index.IndexSettings;
46-
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
46+
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
4747
import org.elasticsearch.index.fielddata.FieldData;
4848
import org.elasticsearch.index.fielddata.IndexFieldData;
4949
import org.elasticsearch.index.fielddata.IndexFieldData.XFieldComparatorSource.Nested;
@@ -517,12 +517,12 @@ public String getFieldName() {
517517
}
518518

519519
@Override
520-
public AtomicNumericFieldData load(LeafReaderContext context) {
520+
public LeafNumericFieldData load(LeafReaderContext context) {
521521
return new ScaledFloatLeafFieldData(scaledFieldData.load(context), scalingFactor);
522522
}
523523

524524
@Override
525-
public AtomicNumericFieldData loadDirect(LeafReaderContext context) throws Exception {
525+
public LeafNumericFieldData loadDirect(LeafReaderContext context) throws Exception {
526526
return new ScaledFloatLeafFieldData(scaledFieldData.loadDirect(context), scalingFactor);
527527
}
528528

@@ -559,12 +559,12 @@ public NumericType getNumericType() {
559559

560560
}
561561

562-
private static class ScaledFloatLeafFieldData implements AtomicNumericFieldData {
562+
private static class ScaledFloatLeafFieldData implements LeafNumericFieldData {
563563

564-
private final AtomicNumericFieldData scaledFieldData;
564+
private final LeafNumericFieldData scaledFieldData;
565565
private final double scalingFactorInverse;
566566

567-
ScaledFloatLeafFieldData(AtomicNumericFieldData scaledFieldData, double scalingFactor) {
567+
ScaledFloatLeafFieldData(LeafNumericFieldData scaledFieldData, double scalingFactor) {
568568
this.scaledFieldData = scaledFieldData;
569569
this.scalingFactorInverse = 1d / scalingFactor;
570570
}

‎modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldTypeTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.elasticsearch.cluster.metadata.IndexMetaData;
3535
import org.elasticsearch.common.settings.Settings;
3636
import org.elasticsearch.index.IndexSettings;
37-
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
37+
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
3838
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
3939
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
4040
import org.junit.Before;
@@ -193,7 +193,7 @@ public void testFieldData() throws IOException {
193193
IndexNumericFieldData fielddata = (IndexNumericFieldData) ft.fielddataBuilder("index")
194194
.build(indexSettings, ft, null, null, null);
195195
assertEquals(fielddata.getNumericType(), IndexNumericFieldData.NumericType.DOUBLE);
196-
AtomicNumericFieldData leafFieldData = fielddata.load(reader.leaves().get(0));
196+
LeafNumericFieldData leafFieldData = fielddata.load(reader.leaves().get(0));
197197
SortedNumericDoubleValues values = leafFieldData.getDoubleValues();
198198
assertTrue(values.advanceExact(0));
199199
assertEquals(1, values.docValueCount());

‎plugins/examples/rescore/src/main/java/org/elasticsearch/example/rescore/ExampleRescoreBuilder.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
3232
import org.elasticsearch.common.xcontent.XContentBuilder;
3333
import org.elasticsearch.common.xcontent.XContentParser;
34-
import org.elasticsearch.index.fielddata.AtomicFieldData;
35-
import org.elasticsearch.index.fielddata.AtomicNumericFieldData;
34+
import org.elasticsearch.index.fielddata.LeafFieldData;
35+
import org.elasticsearch.index.fielddata.LeafNumericFieldData;
3636
import org.elasticsearch.index.fielddata.IndexFieldData;
3737
import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
3838
import org.elasticsearch.index.query.QueryRewriteContext;
@@ -170,7 +170,7 @@ public TopDocs rescore(TopDocs topDocs, IndexSearcher searcher, RescoreContext r
170170
* them in (reader, field, docId) order because that is the
171171
* order they are on disk.
172172
*/
173-
ScoreDoc[] sortedByDocId = new ScoreDoc[topDocs.scoreDocs.length];
173+
ScoreDoc[] sortedByDocId = new ScoreDoc[topDocs.scoreDocs.length];
174174
System.arraycopy(topDocs.scoreDocs, 0, sortedByDocId, 0, topDocs.scoreDocs.length);
175175
Arrays.sort(sortedByDocId, (a, b) -> a.doc - b.doc); // Safe because doc ids >= 0
176176
Iterator<LeafReaderContext> leaves = searcher.getIndexReader().leaves().iterator();
@@ -183,11 +183,11 @@ public TopDocs rescore(TopDocs topDocs, IndexSearcher searcher, RescoreContext r
183183
leaf = leaves.next();
184184
endDoc = leaf.docBase + leaf.reader().maxDoc();
185185
} while (topDocs.scoreDocs[i].doc >= endDoc);
186-
AtomicFieldData fd = context.factorField.load(leaf);
187-
if (false == (fd instanceof AtomicNumericFieldData)) {
186+
LeafFieldData fd = context.factorField.load(leaf);
187+
if (false == (fd instanceof LeafNumericFieldData)) {
188188
throw new IllegalArgumentException("[" + context.factorField.getFieldName() + "] is not a number");
189189
}
190-
data = ((AtomicNumericFieldData) fd).getDoubleValues();
190+
data = ((LeafNumericFieldData) fd).getDoubleValues();
191191
}
192192
if (false == data.advanceExact(topDocs.scoreDocs[i].doc - leaf.docBase)) {
193193
throw new IllegalArgumentException("document [" + topDocs.scoreDocs[i].doc

‎server/src/main/java/org/elasticsearch/common/lucene/search/function/RandomScoreFunction.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.lucene.index.LeafReaderContext;
2424
import org.apache.lucene.search.Explanation;
2525
import org.apache.lucene.util.StringHelper;
26-
import org.elasticsearch.index.fielddata.AtomicFieldData;
26+
import org.elasticsearch.index.fielddata.LeafFieldData;
2727
import org.elasticsearch.index.fielddata.IndexFieldData;
2828
import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
2929

@@ -57,7 +57,7 @@ public RandomScoreFunction(int seed, int salt, IndexFieldData<?> uidFieldData) {
5757
public LeafScoreFunction getLeafScoreFunction(LeafReaderContext ctx) {
5858
final SortedBinaryDocValues values;
5959
if (fieldData != null) {
60-
AtomicFieldData leafData = fieldData.load(ctx);
60+
LeafFieldData leafData = fieldData.load(ctx);
6161
values = leafData.getBytesValues();
6262
if (values == null) throw new NullPointerException("failed to get fielddata");
6363
} else {

‎server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
* Thread-safe utility class that allows to get per-segment values via the
5555
* {@link #load(LeafReaderContext)} method.
5656
*/
57-
public interface IndexFieldData<FD extends AtomicFieldData> extends IndexComponent {
57+
public interface IndexFieldData<FD extends LeafFieldData> extends IndexComponent {
5858

5959
/**
6060
* The field name.
@@ -251,7 +251,7 @@ IndexFieldData<?> build(IndexSettings indexSettings, MappedFieldType fieldType,
251251
CircuitBreakerService breakerService, MapperService mapperService);
252252
}
253253

254-
interface Global<FD extends AtomicFieldData> extends IndexFieldData<FD> {
254+
interface Global<FD extends LeafFieldData> extends IndexFieldData<FD> {
255255

256256
IndexFieldData<FD> loadGlobal(DirectoryReader indexReader);
257257

0 commit comments

Comments
 (0)