honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Julie Tibshirani 2020-07-30 13:53:59 -07:00
parent 0022d316bb
commit 8ac81a3447
18 changed files with 2 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -541,11 +541,6 @@ public class ScaledFloatFieldMapper extends FieldMapper {
return true;
}
@Override
public void clear() {
scaledFieldData.clear();
}
@Override
public NumericType getNumericType() {
/*

5
server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java
View File

@ -86,11 +86,6 @@ public interface IndexFieldData<FD extends LeafFieldData> {
BucketedSort newBucketedSort(BigArrays bigArrays, @Nullable Object missingValue, MultiValueMode sortMode,
Nested nested, SortOrder sortOrder, DocValueFormat format, int bucketSize, BucketedSort.ExtraData extra);
/**
* Clears any resources associated with this field data.
*/
void clear();
// we need this extended source we we have custom comparators to reuse our field data
// in this case, we need to reduce type that will be used when search results are reduced
// on another node (we don't have the custom source them...)

4
server/src/main/java/org/elasticsearch/index/fielddata/IndexHistogramFieldData.java
View File

@ -44,8 +44,4 @@ public abstract class IndexHistogramFieldData implements IndexFieldData<LeafHist
return valuesSourceType;
}
@Override
public final void clear() {
// can't do
}
}

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

@ -117,9 +117,6 @@ public final class GlobalOrdinalsIndexFieldData implements IndexOrdinalsFieldDat
throw new IllegalArgumentException("only supported on numeric fields");
}
@Override
public void clear() {}
@Override
public long ramBytesUsed() {
return memorySizeInBytes;
@ -211,9 +208,6 @@ public final class GlobalOrdinalsIndexFieldData implements IndexOrdinalsFieldDat
throw new IllegalArgumentException("only supported on numeric fields");
}
@Override
public void clear() {}
@Override
public long ramBytesUsed() {
return memorySizeInBytes;

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

@ -58,11 +58,6 @@ public abstract class AbstractIndexFieldData<FD extends LeafFieldData> implement
return valuesSourceType;
}
@Override
public void clear() {
cache.clear(fieldName);
}
@Override
public FD load(LeafReaderContext context) {
if (context.reader().getFieldInfos().fieldInfo(fieldName) == null) {

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

@ -59,11 +59,6 @@ public abstract class AbstractLatLonPointIndexFieldData implements IndexGeoPoint
return valuesSourceType;
}
@Override
public final void clear() {
// can't do
}
@Override
public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, XFieldComparatorSource.Nested nested,
boolean reverse) {

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

@ -69,10 +69,6 @@ public class BinaryIndexFieldData implements IndexFieldData<BinaryDVLeafFieldDat
return valuesSourceType;
}
@Override
public final void clear() {
// can't do
}
@Override
public BinaryDVLeafFieldData load(LeafReaderContext context) {

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

@ -57,11 +57,6 @@ public class BytesBinaryIndexFieldData implements IndexFieldData<BytesBinaryDVLe
return valuesSourceType;
}
@Override
public final void clear() {
// can't do
}
@Override
public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested, boolean reverse) {
throw new IllegalArgumentException("can't sort on binary field");

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

@ -146,10 +146,6 @@ public class ConstantIndexFieldData extends AbstractIndexOrdinalsFieldData {
atomicFieldData = new ConstantLeafFieldData(value);
}
@Override
public void clear() {
}
@Override
public final LeafOrdinalsFieldData load(LeafReaderContext context) {
return atomicFieldData;

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

@ -92,11 +92,6 @@ public class SortedNumericIndexFieldData extends IndexNumericFieldData {
return valuesSourceType;
}
@Override
public final void clear() {
// can't do
}
@Override
protected boolean sortRequiresCustomComparator() {
return numericType == NumericType.HALF_FLOAT;

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

@ -109,11 +109,6 @@ public class SortedSetOrdinalsIndexFieldData implements IndexOrdinalsFieldData {
return valuesSourceType;
}
@Override
public final void clear() {
// can't do
}
@Override
public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested, boolean reverse) {
XFieldComparatorSource source = new BytesRefFieldComparatorSource(this, missingValue, sortMode, nested);

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

@ -54,18 +54,13 @@ public class StringBinaryIndexFieldData implements IndexFieldData<StringBinaryDV
return valuesSourceType;
}
@Override
public final void clear() {
// can't do
}
@Override
public SortField sortField(Object missingValue, MultiValueMode sortMode, Nested nested, boolean reverse) {
XFieldComparatorSource source = new BytesRefFieldComparatorSource(this, missingValue,
sortMode, nested);
return new SortField(getFieldName(), source, reverse);
}
@Override
public StringBinaryDVLeafFieldData load(LeafReaderContext context) {
try {
@ -73,7 +68,7 @@ public class StringBinaryIndexFieldData implements IndexFieldData<StringBinaryDV
} catch (IOException e) {
throw new IllegalStateException("Cannot load doc values", e);
}
}
}
@Override
public BucketedSort newBucketedSort(BigArrays bigArrays, Object missingValue, MultiValueMode sortMode, Nested nested,
SortOrder sortOrder, DocValueFormat format, int bucketSize, BucketedSort.ExtraData extra) {

6
server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java
View File

@ -209,12 +209,6 @@ public class IdFieldMapper extends MetadataFieldMapper {
Nested nested, SortOrder sortOrder, DocValueFormat format, int bucketSize, BucketedSort.ExtraData extra) {
throw new UnsupportedOperationException("can't sort on the [" + CONTENT_TYPE + "] field");
}
@Override
public void clear() {
fieldData.clear();
}
};
}
};

5
server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
View File

@ -69,11 +69,6 @@ public class NoOrdinalsStringFieldDataTests extends PagedBytesStringFieldDataTes
throw new UnsupportedOperationException();
}
@Override
public void clear() {
in.clear();
}
};
}

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

@ -159,11 +159,6 @@ public class FunctionScoreTests extends ESTestCase {
SortOrder sortOrder, DocValueFormat format, int bucketSize, BucketedSort.ExtraData extra) {
throw new UnsupportedOperationException(UNSUPPORTED);
}
@Override
public void clear() {
throw new UnsupportedOperationException(UNSUPPORTED);
}
}
/**
@ -249,11 +244,6 @@ public class FunctionScoreTests extends ESTestCase {
protected boolean sortRequiresCustomComparator() {
return false;
}
@Override
public void clear() {
throw new UnsupportedOperationException(UNSUPPORTED);
}
}
private static final ScoreFunction RANDOM_SCORE_FUNCTION = new RandomScoreFunction(0, 0, new IndexFieldDataStub());

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

@ -374,11 +374,6 @@ public final class FlatObjectFieldMapper extends DynamicKeyFieldMapper {
throw new IllegalArgumentException("only supported on numeric fields");
}
@Override
public void clear() {
delegate.clear();
}
@Override
public LeafOrdinalsFieldData load(LeafReaderContext context) {
LeafOrdinalsFieldData fieldData = delegate.load(context);

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

@ -42,11 +42,6 @@ public abstract class AbstractLatLonShapeIndexFieldData implements IndexGeoShape
return valuesSourceType;
}
@Override
public final void clear() {
// can't do
}
@Override
public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, XFieldComparatorSource.Nested nested,
boolean reverse) {

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

@ -45,11 +45,6 @@ public class VectorIndexFieldData implements IndexFieldData<VectorDVLeafFieldDat
return valuesSourceType;
}
@Override
public final void clear() {
// can't do
}
@Override
public SortField sortField(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested, boolean reverse) {
throw new IllegalArgumentException("can't sort on the vector field");