Skip to content

Commit f3403fa

Browse files
authored
Remove IndexFieldData#clear since it is unused. (#60475)
This method was never called. It also seemed tricky that calling a method on `IndexFieldData` could clear the contents of a shared cache.
1 parent 0493ede commit f3403fa

File tree

18 files changed

+2
-96
lines changed

18 files changed

+2
-96
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -541,11 +541,6 @@ protected boolean sortRequiresCustomComparator() {
541541
return true;
542542
}
543543

544-
@Override
545-
public void clear() {
546-
scaledFieldData.clear();
547-
}
548-
549544
@Override
550545
public NumericType getNumericType() {
551546
/*

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,6 @@ public interface IndexFieldData<FD extends LeafFieldData> {
8686
BucketedSort newBucketedSort(BigArrays bigArrays, @Nullable Object missingValue, MultiValueMode sortMode,
8787
Nested nested, SortOrder sortOrder, DocValueFormat format, int bucketSize, BucketedSort.ExtraData extra);
8888

89-
/**
90-
* Clears any resources associated with this field data.
91-
*/
92-
void clear();
93-
9489
// we need this extended source we we have custom comparators to reuse our field data
9590
// in this case, we need to reduce type that will be used when search results are reduced
9691
// on another node (we don't have the custom source them...)

server/src/main/java/org/elasticsearch/index/fielddata/IndexHistogramFieldData.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,4 @@ public ValuesSourceType getValuesSourceType() {
4444
return valuesSourceType;
4545
}
4646

47-
@Override
48-
public final void clear() {
49-
// can't do
50-
}
5147
}

server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,6 @@ public BucketedSort newBucketedSort(BigArrays bigArrays, Object missingValue, Mu
117117
throw new IllegalArgumentException("only supported on numeric fields");
118118
}
119119

120-
@Override
121-
public void clear() {}
122-
123120
@Override
124121
public long ramBytesUsed() {
125122
return memorySizeInBytes;
@@ -211,9 +208,6 @@ public BucketedSort newBucketedSort(BigArrays bigArrays, Object missingValue, Mu
211208
throw new IllegalArgumentException("only supported on numeric fields");
212209
}
213210

214-
@Override
215-
public void clear() {}
216-
217211
@Override
218212
public long ramBytesUsed() {
219213
return memorySizeInBytes;

server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@ public ValuesSourceType getValuesSourceType() {
5858
return valuesSourceType;
5959
}
6060

61-
@Override
62-
public void clear() {
63-
cache.clear(fieldName);
64-
}
65-
6661
@Override
6762
public FD load(LeafReaderContext context) {
6863
if (context.reader().getFieldInfos().fieldInfo(fieldName) == null) {

server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointIndexFieldData.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ public ValuesSourceType getValuesSourceType() {
5959
return valuesSourceType;
6060
}
6161

62-
@Override
63-
public final void clear() {
64-
// can't do
65-
}
66-
6762
@Override
6863
public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, XFieldComparatorSource.Nested nested,
6964
boolean reverse) {

server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryIndexFieldData.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ public ValuesSourceType getValuesSourceType() {
6969
return valuesSourceType;
7070
}
7171

72-
@Override
73-
public final void clear() {
74-
// can't do
75-
}
7672

7773
@Override
7874
public BinaryDVLeafFieldData load(LeafReaderContext context) {

server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryIndexFieldData.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,6 @@ public ValuesSourceType getValuesSourceType() {
5757
return valuesSourceType;
5858
}
5959

60-
@Override
61-
public final void clear() {
62-
// can't do
63-
}
64-
6560
@Override
6661
public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested, boolean reverse) {
6762
throw new IllegalArgumentException("can't sort on binary field");

server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,6 @@ private ConstantIndexFieldData(String name, String value, ValuesSourceType value
146146
atomicFieldData = new ConstantLeafFieldData(value);
147147
}
148148

149-
@Override
150-
public void clear() {
151-
}
152-
153149
@Override
154150
public final LeafOrdinalsFieldData load(LeafReaderContext context) {
155151
return atomicFieldData;

server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericIndexFieldData.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,6 @@ public ValuesSourceType getValuesSourceType() {
9292
return valuesSourceType;
9393
}
9494

95-
@Override
96-
public final void clear() {
97-
// can't do
98-
}
99-
10095
@Override
10196
protected boolean sortRequiresCustomComparator() {
10297
return numericType == NumericType.HALF_FLOAT;

server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetOrdinalsIndexFieldData.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,6 @@ public ValuesSourceType getValuesSourceType() {
109109
return valuesSourceType;
110110
}
111111

112-
@Override
113-
public final void clear() {
114-
// can't do
115-
}
116-
117112
@Override
118113
public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested, boolean reverse) {
119114
XFieldComparatorSource source = new BytesRefFieldComparatorSource(this, missingValue, sortMode, nested);

server/src/main/java/org/elasticsearch/index/fielddata/plain/StringBinaryIndexFieldData.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,26 +54,21 @@ public ValuesSourceType getValuesSourceType() {
5454
return valuesSourceType;
5555
}
5656

57-
@Override
58-
public final void clear() {
59-
// can't do
60-
}
61-
6257
@Override
6358
public SortField sortField(Object missingValue, MultiValueMode sortMode, Nested nested, boolean reverse) {
6459
XFieldComparatorSource source = new BytesRefFieldComparatorSource(this, missingValue,
6560
sortMode, nested);
6661
return new SortField(getFieldName(), source, reverse);
6762
}
68-
63+
6964
@Override
7065
public StringBinaryDVLeafFieldData load(LeafReaderContext context) {
7166
try {
7267
return new StringBinaryDVLeafFieldData(DocValues.getBinary(context.reader(), fieldName));
7368
} catch (IOException e) {
7469
throw new IllegalStateException("Cannot load doc values", e);
7570
}
76-
}
71+
}
7772
@Override
7873
public BucketedSort newBucketedSort(BigArrays bigArrays, Object missingValue, MultiValueMode sortMode, Nested nested,
7974
SortOrder sortOrder, DocValueFormat format, int bucketSize, BucketedSort.ExtraData extra) {

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,6 @@ public BucketedSort newBucketedSort(BigArrays bigArrays, Object missingValue, Mu
209209
Nested nested, SortOrder sortOrder, DocValueFormat format, int bucketSize, BucketedSort.ExtraData extra) {
210210
throw new UnsupportedOperationException("can't sort on the [" + CONTENT_TYPE + "] field");
211211
}
212-
213-
@Override
214-
public void clear() {
215-
fieldData.clear();
216-
}
217-
218212
};
219213
}
220214
};

server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,6 @@ public BucketedSort newBucketedSort(BigArrays bigArrays, Object missingValue, Mu
6969
throw new UnsupportedOperationException();
7070
}
7171

72-
@Override
73-
public void clear() {
74-
in.clear();
75-
}
76-
7772
};
7873
}
7974

server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,6 @@ public BucketedSort newBucketedSort(BigArrays bigArrays, Object missingValue, Mu
159159
SortOrder sortOrder, DocValueFormat format, int bucketSize, BucketedSort.ExtraData extra) {
160160
throw new UnsupportedOperationException(UNSUPPORTED);
161161
}
162-
163-
@Override
164-
public void clear() {
165-
throw new UnsupportedOperationException(UNSUPPORTED);
166-
}
167162
}
168163

169164
/**
@@ -249,11 +244,6 @@ public LeafNumericFieldData loadDirect(LeafReaderContext context) throws Excepti
249244
protected boolean sortRequiresCustomComparator() {
250245
return false;
251246
}
252-
253-
@Override
254-
public void clear() {
255-
throw new UnsupportedOperationException(UNSUPPORTED);
256-
}
257247
}
258248

259249
private static final ScoreFunction RANDOM_SCORE_FUNCTION = new RandomScoreFunction(0, 0, new IndexFieldDataStub());

x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,6 @@ public BucketedSort newBucketedSort(BigArrays bigArrays, Object missingValue, Mu
374374
throw new IllegalArgumentException("only supported on numeric fields");
375375
}
376376

377-
@Override
378-
public void clear() {
379-
delegate.clear();
380-
}
381-
382377
@Override
383378
public LeafOrdinalsFieldData load(LeafReaderContext context) {
384379
LeafOrdinalsFieldData fieldData = delegate.load(context);

x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/AbstractLatLonShapeIndexFieldData.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ public ValuesSourceType getValuesSourceType() {
4242
return valuesSourceType;
4343
}
4444

45-
@Override
46-
public final void clear() {
47-
// can't do
48-
}
49-
5045
@Override
5146
public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, XFieldComparatorSource.Nested nested,
5247
boolean reverse) {

x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/query/VectorIndexFieldData.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ public ValuesSourceType getValuesSourceType() {
4343
return valuesSourceType;
4444
}
4545

46-
@Override
47-
public final void clear() {
48-
// can't do
49-
}
50-
5146
@Override
5247
public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested, boolean reverse) {
5348
throw new IllegalArgumentException("can't sort on the vector field");

0 commit comments

Comments
 (0)