From 8ac81a3447d0292b5546bba3cf6016ed4ea2374c Mon Sep 17 00:00:00 2001
From: Julie Tibshirani <julie.tibshirani@elastic.co>
Date: Thu, 30 Jul 2020 13:53:59 -0700
Subject: [PATCH] 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.
---
 .../index/mapper/ScaledFloatFieldMapper.java           |  5 -----
 .../elasticsearch/index/fielddata/IndexFieldData.java  |  5 -----
 .../index/fielddata/IndexHistogramFieldData.java       |  4 ----
 .../ordinals/GlobalOrdinalsIndexFieldData.java         |  6 ------
 .../index/fielddata/plain/AbstractIndexFieldData.java  |  5 -----
 .../plain/AbstractLatLonPointIndexFieldData.java       |  5 -----
 .../index/fielddata/plain/BinaryIndexFieldData.java    |  4 ----
 .../fielddata/plain/BytesBinaryIndexFieldData.java     |  5 -----
 .../index/fielddata/plain/ConstantIndexFieldData.java  |  4 ----
 .../fielddata/plain/SortedNumericIndexFieldData.java   |  5 -----
 .../plain/SortedSetOrdinalsIndexFieldData.java         |  5 -----
 .../fielddata/plain/StringBinaryIndexFieldData.java    |  9 ++-------
 .../org/elasticsearch/index/mapper/IdFieldMapper.java  |  6 ------
 .../fielddata/NoOrdinalsStringFieldDataTests.java      |  5 -----
 .../index/query/functionscore/FunctionScoreTests.java  | 10 ----------
 .../xpack/flattened/mapper/FlatObjectFieldMapper.java  |  5 -----
 .../fielddata/AbstractLatLonShapeIndexFieldData.java   |  5 -----
 .../xpack/vectors/query/VectorIndexFieldData.java      |  5 -----
 18 files changed, 2 insertions(+), 96 deletions(-)

diff --git a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java
index c8946de34a2..e45ab1c4d9b 100644
--- a/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java
+++ b/modules/mapper-extras/src/main/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapper.java
@@ -541,11 +541,6 @@ public class ScaledFloatFieldMapper extends FieldMapper {
             return true;
         }
 
-        @Override
-        public void clear() {
-            scaledFieldData.clear();
-        }
-
         @Override
         public NumericType getNumericType() {
             /*
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java
index f3bdb999767..92532e3e9d7 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/IndexFieldData.java
@@ -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...)
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/IndexHistogramFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/IndexHistogramFieldData.java
index 9850c749305..18a19be17b8 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/IndexHistogramFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/IndexHistogramFieldData.java
@@ -44,8 +44,4 @@ public abstract class IndexHistogramFieldData implements IndexFieldData<LeafHist
         return valuesSourceType;
     }
 
-    @Override
-    public final void clear() {
-        // can't do
-    }
 }
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java
index 028b123e47e..f4965719496 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java
@@ -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;
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java
index 488f977f945..0e0ceee211e 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractIndexFieldData.java
@@ -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) {
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointIndexFieldData.java
index 9aa2cc3325c..81f75df206e 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointIndexFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLatLonPointIndexFieldData.java
@@ -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) {
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryIndexFieldData.java
index c56653b8979..8dd58316ffe 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryIndexFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryIndexFieldData.java
@@ -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) {
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryIndexFieldData.java
index c9f516cffdc..093498b8bfd 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryIndexFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryIndexFieldData.java
@@ -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");
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java
index 403394c38e6..764f22a0510 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java
@@ -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;
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericIndexFieldData.java
index 84df5be537f..a5597d366bb 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericIndexFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericIndexFieldData.java
@@ -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;
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetOrdinalsIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetOrdinalsIndexFieldData.java
index 92d90a9cbcf..cbdd7143001 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetOrdinalsIndexFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetOrdinalsIndexFieldData.java
@@ -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);
diff --git a/server/src/main/java/org/elasticsearch/index/fielddata/plain/StringBinaryIndexFieldData.java b/server/src/main/java/org/elasticsearch/index/fielddata/plain/StringBinaryIndexFieldData.java
index 44962054b97..8ba00cfa9be 100644
--- a/server/src/main/java/org/elasticsearch/index/fielddata/plain/StringBinaryIndexFieldData.java
+++ b/server/src/main/java/org/elasticsearch/index/fielddata/plain/StringBinaryIndexFieldData.java
@@ -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) {
diff --git a/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java b/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java
index efd0783994c..8914b86a18e 100644
--- a/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java
+++ b/server/src/main/java/org/elasticsearch/index/mapper/IdFieldMapper.java
@@ -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();
-                        }
-
                     };
                 }
             };
diff --git a/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java b/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
index b5dc76a1b43..99ef863e37e 100644
--- a/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
+++ b/server/src/test/java/org/elasticsearch/index/fielddata/NoOrdinalsStringFieldDataTests.java
@@ -69,11 +69,6 @@ public class NoOrdinalsStringFieldDataTests extends PagedBytesStringFieldDataTes
                 throw new UnsupportedOperationException();
             }
 
-            @Override
-            public void clear() {
-                in.clear();
-            }
-
         };
     }
 
diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java
index de1145e89fa..e86bee0b987 100644
--- a/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java
+++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/FunctionScoreTests.java
@@ -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());
diff --git a/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java b/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java
index bd793d71028..3c0f728be7b 100644
--- a/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java
+++ b/x-pack/plugin/mapper-flattened/src/main/java/org/elasticsearch/xpack/flattened/mapper/FlatObjectFieldMapper.java
@@ -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);
diff --git a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/AbstractLatLonShapeIndexFieldData.java b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/AbstractLatLonShapeIndexFieldData.java
index f3183dca875..3a59dd1181c 100644
--- a/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/AbstractLatLonShapeIndexFieldData.java
+++ b/x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/AbstractLatLonShapeIndexFieldData.java
@@ -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) {
diff --git a/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/query/VectorIndexFieldData.java b/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/query/VectorIndexFieldData.java
index 478c87a131b..63b68da5f5c 100644
--- a/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/query/VectorIndexFieldData.java
+++ b/x-pack/plugin/vectors/src/main/java/org/elasticsearch/xpack/vectors/query/VectorIndexFieldData.java
@@ -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");