1
0
Эх сурвалжийг харах

Drop redundant Accountable.getChildResources overrides (#91036)

No need to override to return an empty list now, the default method on
the interface takes care of this.
Armin Braun 3 жил өмнө
parent
commit
fd6c20f964
21 өөрчлөгдсөн 1 нэмэгдсэн , 183 устгасан
  1. 0 9
      server/src/main/java/org/elasticsearch/common/util/AbstractArray.java
  2. 0 7
      server/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java
  3. 0 8
      server/src/main/java/org/elasticsearch/index/engine/VersionValue.java
  4. 0 8
      server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java
  5. 0 12
      server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java
  6. 1 6
      server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java
  7. 0 8
      server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractBinaryDVLeafFieldData.java
  8. 0 9
      server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLeafOrdinalsFieldData.java
  9. 0 8
      server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVLeafFieldData.java
  10. 0 9
      server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java
  11. 0 8
      server/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVLeafFieldData.java
  12. 0 8
      server/src/main/java/org/elasticsearch/index/fielddata/plain/LeafDoubleFieldData.java
  13. 0 18
      server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedDoublesIndexFieldData.java
  14. 0 8
      server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericIndexFieldData.java
  15. 0 8
      server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetBytesLeafFieldData.java
  16. 0 8
      server/src/main/java/org/elasticsearch/index/mapper/vectors/VectorDVLeafFieldData.java
  17. 0 8
      server/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java
  18. 0 9
      x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/LeafShapeFieldData.java
  19. 0 8
      x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/plain/CartesianPointDVLeafFieldData.java
  20. 0 8
      x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/plain/CartesianShapeDVAtomicShapeFieldData.java
  21. 0 8
      x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/plain/LatLonShapeDVAtomicShapeFieldData.java

+ 0 - 9
server/src/main/java/org/elasticsearch/common/util/AbstractArray.java

@@ -8,10 +8,6 @@
 
 package org.elasticsearch.common.util;
 
-import org.apache.lucene.util.Accountable;
-
-import java.util.Collection;
-import java.util.Collections;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 abstract class AbstractArray implements BigArray {
@@ -37,9 +33,4 @@ abstract class AbstractArray implements BigArray {
     }
 
     protected abstract void doClose();
-
-    @Override
-    public Collection<Accountable> getChildResources() {
-        return Collections.emptyList();
-    }
 }

+ 0 - 7
server/src/main/java/org/elasticsearch/index/engine/LiveVersionMap.java

@@ -17,7 +17,6 @@ import org.elasticsearch.common.util.concurrent.KeyedLock;
 import org.elasticsearch.core.Releasable;
 
 import java.io.IOException;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
@@ -434,12 +433,6 @@ final class LiveVersionMap implements ReferenceManager.RefreshListener, Accounta
         return maps.old.ramBytesUsed.get();
     }
 
-    @Override
-    public Collection<Accountable> getChildResources() {
-        // TODO: useful to break down RAM usage here?
-        return Collections.emptyList();
-    }
-
     /**
      * Returns the current internal versions as a point in time snapshot
      */

+ 0 - 8
server/src/main/java/org/elasticsearch/index/engine/VersionValue.java

@@ -13,9 +13,6 @@ import org.apache.lucene.util.RamUsageEstimator;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.index.translog.Translog;
 
-import java.util.Collection;
-import java.util.Collections;
-
 abstract class VersionValue implements Accountable {
 
     private static final long BASE_RAM_BYTES_USED = RamUsageEstimator.shallowSizeOfInstance(VersionValue.class);
@@ -43,11 +40,6 @@ abstract class VersionValue implements Accountable {
         return BASE_RAM_BYTES_USED;
     }
 
-    @Override
-    public Collection<Accountable> getChildResources() {
-        return Collections.emptyList();
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

+ 0 - 8
server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsBuilder.java

@@ -13,7 +13,6 @@ import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.OrdinalMap;
 import org.apache.lucene.index.SortedSetDocValues;
-import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.packed.PackedInts;
 import org.elasticsearch.common.breaker.CircuitBreaker;
 import org.elasticsearch.core.TimeValue;
@@ -24,8 +23,6 @@ import org.elasticsearch.indices.breaker.CircuitBreakerService;
 import org.elasticsearch.script.field.ToScriptFieldFactory;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -96,11 +93,6 @@ public enum GlobalOrdinalsBuilder {
                     return 0;
                 }
 
-                @Override
-                public Collection<Accountable> getChildResources() {
-                    return Collections.emptyList();
-                }
-
                 @Override
                 public void close() {}
             };

+ 0 - 12
server/src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java

@@ -30,7 +30,6 @@ import org.elasticsearch.search.sort.SortOrder;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Collection;
-import java.util.Collections;
 
 /**
  * Concrete implementation of {@link IndexOrdinalsFieldData} for global ordinals.
@@ -120,12 +119,6 @@ public final class GlobalOrdinalsIndexFieldData implements IndexOrdinalsFieldDat
         return memorySizeInBytes;
     }
 
-    @Override
-    public Collection<Accountable> getChildResources() {
-        // TODO: break down ram usage?
-        return Collections.emptyList();
-    }
-
     @Override
     public LeafOrdinalsFieldData load(LeafReaderContext context) {
         throw new IllegalStateException("load(LeafReaderContext) should not be called in this context");
@@ -219,11 +212,6 @@ public final class GlobalOrdinalsIndexFieldData implements IndexOrdinalsFieldDat
             return memorySizeInBytes;
         }
 
-        @Override
-        public Collection<Accountable> getChildResources() {
-            return Collections.emptyList();
-        }
-
         @Override
         public LeafOrdinalsFieldData load(LeafReaderContext context) {
             assert source.getReaderCacheHelper().getKey() == context.parent.reader().getReaderCacheHelper().getKey();

+ 1 - 6
server/src/main/java/org/elasticsearch/index/fielddata/ordinals/MultiOrdinals.java

@@ -20,9 +20,7 @@ import org.elasticsearch.index.fielddata.AbstractSortedDocValues;
 import org.elasticsearch.index.fielddata.AbstractSortedSetDocValues;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -88,10 +86,7 @@ public class MultiOrdinals extends Ordinals {
 
     @Override
     public Collection<Accountable> getChildResources() {
-        List<Accountable> resources = new ArrayList<>();
-        resources.add(Accountables.namedAccountable("offsets", endOffsets));
-        resources.add(Accountables.namedAccountable("ordinals", ords));
-        return Collections.unmodifiableCollection(resources);
+        return List.of(Accountables.namedAccountable("offsets", endOffsets), Accountables.namedAccountable("ordinals", ords));
     }
 
     @Override

+ 0 - 8
server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractBinaryDVLeafFieldData.java

@@ -9,15 +9,12 @@
 package org.elasticsearch.index.fielddata.plain;
 
 import org.apache.lucene.index.BinaryDocValues;
-import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.io.stream.ByteArrayStreamInput;
 import org.elasticsearch.index.fielddata.LeafFieldData;
 import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 
 abstract class AbstractBinaryDVLeafFieldData implements LeafFieldData {
     private final BinaryDocValues values;
@@ -32,11 +29,6 @@ abstract class AbstractBinaryDVLeafFieldData implements LeafFieldData {
         return 0; // not exposed by Lucene
     }
 
-    @Override
-    public Collection<Accountable> getChildResources() {
-        return Collections.emptyList();
-    }
-
     @Override
     public SortedBinaryDocValues getBytesValues() {
         return new SortedBinaryDocValues() {

+ 0 - 9
server/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractLeafOrdinalsFieldData.java

@@ -10,16 +10,12 @@ package org.elasticsearch.index.fielddata.plain;
 
 import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.SortedSetDocValues;
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.index.fielddata.FieldData;
 import org.elasticsearch.index.fielddata.LeafOrdinalsFieldData;
 import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
 import org.elasticsearch.script.field.DocValuesScriptFieldFactory;
 import org.elasticsearch.script.field.ToScriptFieldFactory;
 
-import java.util.Collection;
-import java.util.Collections;
-
 public abstract class AbstractLeafOrdinalsFieldData implements LeafOrdinalsFieldData {
 
     private final ToScriptFieldFactory<SortedSetDocValues> toScriptFieldFactory;
@@ -46,11 +42,6 @@ public abstract class AbstractLeafOrdinalsFieldData implements LeafOrdinalsField
                 return 0;
             }
 
-            @Override
-            public Collection<Accountable> getChildResources() {
-                return Collections.emptyList();
-            }
-
             @Override
             public void close() {}
 

+ 0 - 8
server/src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVLeafFieldData.java

@@ -11,7 +11,6 @@ package org.elasticsearch.index.fielddata.plain;
 import org.apache.lucene.index.BinaryDocValues;
 import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReader;
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.index.fielddata.FieldData;
 import org.elasticsearch.index.fielddata.LeafFieldData;
 import org.elasticsearch.index.fielddata.ScriptDocValues;
@@ -20,8 +19,6 @@ import org.elasticsearch.script.field.DelegateDocValuesField;
 import org.elasticsearch.script.field.DocValuesScriptFieldFactory;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 
 /** {@link LeafFieldData} impl on top of Lucene's binary doc values. */
 public class BinaryDVLeafFieldData implements LeafFieldData {
@@ -59,9 +56,4 @@ public class BinaryDVLeafFieldData implements LeafFieldData {
         return 0; // unknown
     }
 
-    @Override
-    public Collection<Accountable> getChildResources() {
-        return Collections.emptyList();
-    }
-
 }

+ 0 - 9
server/src/main/java/org/elasticsearch/index/fielddata/plain/ConstantIndexFieldData.java

@@ -14,7 +14,6 @@ import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SortedDocValues;
 import org.apache.lucene.index.SortedSetDocValues;
 import org.apache.lucene.search.SortField;
-import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.util.BigArrays;
 import org.elasticsearch.core.Nullable;
@@ -33,9 +32,6 @@ import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 import org.elasticsearch.search.sort.BucketedSort;
 import org.elasticsearch.search.sort.SortOrder;
 
-import java.util.Collection;
-import java.util.Collections;
-
 public class ConstantIndexFieldData extends AbstractIndexOrdinalsFieldData {
 
     public static class Builder implements IndexFieldData.Builder {
@@ -77,11 +73,6 @@ public class ConstantIndexFieldData extends AbstractIndexOrdinalsFieldData {
             return 0;
         }
 
-        @Override
-        public Collection<Accountable> getChildResources() {
-            return Collections.emptyList();
-        }
-
         @Override
         public SortedSetDocValues getOrdinalsValues() {
             if (value == null) {

+ 0 - 8
server/src/main/java/org/elasticsearch/index/fielddata/plain/LatLonPointDVLeafFieldData.java

@@ -10,13 +10,10 @@ package org.elasticsearch.index.fielddata.plain;
 import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.SortedNumericDocValues;
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.index.fielddata.MultiGeoPointValues;
 import org.elasticsearch.script.field.ToScriptFieldFactory;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 
 final class LatLonPointDVLeafFieldData extends LeafGeoPointFieldData {
     private final LeafReader reader;
@@ -33,11 +30,6 @@ final class LatLonPointDVLeafFieldData extends LeafGeoPointFieldData {
         return 0; // not exposed by lucene
     }
 
-    @Override
-    public Collection<Accountable> getChildResources() {
-        return Collections.emptyList();
-    }
-
     @Override
     public void close() {
         // noop

+ 0 - 8
server/src/main/java/org/elasticsearch/index/fielddata/plain/LeafDoubleFieldData.java

@@ -9,7 +9,6 @@
 package org.elasticsearch.index.fielddata.plain;
 
 import org.apache.lucene.index.SortedNumericDocValues;
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.index.fielddata.FieldData;
 import org.elasticsearch.index.fielddata.FormattedDocValues;
 import org.elasticsearch.index.fielddata.LeafNumericFieldData;
@@ -20,8 +19,6 @@ import org.elasticsearch.script.field.ToScriptFieldFactory;
 import org.elasticsearch.search.DocValueFormat;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 
 /**
  * Specialization of {@link LeafNumericFieldData} for floating-point numerics.
@@ -61,11 +58,6 @@ public abstract class LeafDoubleFieldData implements LeafNumericFieldData {
             public DocValuesScriptFieldFactory getScriptFieldFactory(String name) {
                 return toScriptFieldFactory.getScriptFieldFactory(getDoubleValues(), name);
             }
-
-            @Override
-            public Collection<Accountable> getChildResources() {
-                return Collections.emptyList();
-            }
         };
     }
 

+ 0 - 18
server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedDoublesIndexFieldData.java

@@ -15,7 +15,6 @@ import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.NumericDocValues;
 import org.apache.lucene.index.SortedNumericDocValues;
 import org.apache.lucene.sandbox.document.HalfFloatPoint;
-import org.apache.lucene.util.Accountable;
 import org.apache.lucene.util.NumericUtils;
 import org.elasticsearch.index.fielddata.FieldData;
 import org.elasticsearch.index.fielddata.IndexFieldData;
@@ -30,8 +29,6 @@ import org.elasticsearch.script.field.ToScriptFieldFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Objects;
 
 /**
@@ -156,11 +153,6 @@ public class SortedDoublesIndexFieldData extends IndexNumericFieldData {
             }
         }
 
-        @Override
-        public Collection<Accountable> getChildResources() {
-            return Collections.emptyList();
-        }
-
         @Override
         public DocValuesScriptFieldFactory getScriptFieldFactory(String name) {
             return toScriptFieldFactory.getScriptFieldFactory(getDoubleValues(), name);
@@ -255,11 +247,6 @@ public class SortedDoublesIndexFieldData extends IndexNumericFieldData {
             }
         }
 
-        @Override
-        public Collection<Accountable> getChildResources() {
-            return Collections.emptyList();
-        }
-
         @Override
         public DocValuesScriptFieldFactory getScriptFieldFactory(String name) {
             return toScriptFieldFactory.getScriptFieldFactory(getDoubleValues(), name);
@@ -352,11 +339,6 @@ public class SortedDoublesIndexFieldData extends IndexNumericFieldData {
             }
         }
 
-        @Override
-        public Collection<Accountable> getChildResources() {
-            return Collections.emptyList();
-        }
-
         @Override
         public DocValuesScriptFieldFactory getScriptFieldFactory(String name) {
             return toScriptFieldFactory.getScriptFieldFactory(getDoubleValues(), name);

+ 0 - 8
server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedNumericIndexFieldData.java

@@ -13,7 +13,6 @@ import org.apache.lucene.index.DocValuesType;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SortedNumericDocValues;
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.common.time.DateUtils;
 import org.elasticsearch.index.fielddata.FormattedDocValues;
 import org.elasticsearch.index.fielddata.IndexFieldData;
@@ -30,8 +29,6 @@ import org.elasticsearch.search.MultiValueMode;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Objects;
 
 /**
@@ -233,11 +230,6 @@ public class SortedNumericIndexFieldData extends IndexNumericFieldData {
             }
         }
 
-        @Override
-        public Collection<Accountable> getChildResources() {
-            return Collections.emptyList();
-        }
-
         @Override
         public DocValuesScriptFieldFactory getScriptFieldFactory(String name) {
             return toScriptFieldFactory.getScriptFieldFactory(getLongValues(), name);

+ 0 - 8
server/src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetBytesLeafFieldData.java

@@ -11,13 +11,10 @@ package org.elasticsearch.index.fielddata.plain;
 import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.SortedSetDocValues;
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.index.fielddata.LeafFieldData;
 import org.elasticsearch.script.field.ToScriptFieldFactory;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 
 /**
  * An {@link LeafFieldData} implementation that uses Lucene {@link SortedSetDocValues}.
@@ -50,9 +47,4 @@ public final class SortedSetBytesLeafFieldData extends AbstractLeafOrdinalsField
         return 0; // unknown
     }
 
-    @Override
-    public Collection<Accountable> getChildResources() {
-        return Collections.emptyList();
-    }
-
 }

+ 0 - 8
server/src/main/java/org/elasticsearch/index/mapper/vectors/VectorDVLeafFieldData.java

@@ -12,7 +12,6 @@ import org.apache.lucene.index.BinaryDocValues;
 import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.VectorValues;
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.Version;
 import org.elasticsearch.index.fielddata.LeafFieldData;
 import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
@@ -21,8 +20,6 @@ import org.elasticsearch.script.field.vectors.BinaryDenseVectorDocValuesField;
 import org.elasticsearch.script.field.vectors.KnnDenseVectorDocValuesField;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 
 final class VectorDVLeafFieldData implements LeafFieldData {
 
@@ -45,11 +42,6 @@ final class VectorDVLeafFieldData implements LeafFieldData {
         return 0; // not exposed by Lucene
     }
 
-    @Override
-    public Collection<Accountable> getChildResources() {
-        return Collections.emptyList();
-    }
-
     @Override
     public SortedBinaryDocValues getBytesValues() {
         throw new UnsupportedOperationException("String representation of doc values for vector fields is not supported");

+ 0 - 8
server/src/main/java/org/elasticsearch/indices/IndicesRequestCache.java

@@ -29,8 +29,6 @@ import org.elasticsearch.index.mapper.MappingLookup;
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Objects;
@@ -238,12 +236,6 @@ public final class IndicesRequestCache implements RemovalListener<IndicesRequest
             return BASE_RAM_BYTES_USED + entity.ramBytesUsed() + value.length();
         }
 
-        @Override
-        public Collection<Accountable> getChildResources() {
-            // TODO: more detailed ram usage?
-            return Collections.emptyList();
-        }
-
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;

+ 0 - 9
x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/LeafShapeFieldData.java

@@ -7,7 +7,6 @@
 
 package org.elasticsearch.xpack.spatial.index.fielddata;
 
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.common.geo.BoundingBox;
 import org.elasticsearch.common.geo.SpatialPoint;
 import org.elasticsearch.index.fielddata.LeafFieldData;
@@ -16,9 +15,6 @@ import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
 import org.elasticsearch.script.field.DocValuesScriptFieldFactory;
 import org.elasticsearch.script.field.ToScriptFieldFactory;
 
-import java.util.Collection;
-import java.util.Collections;
-
 /**
  * {@link LeafFieldData} specialization for geo-shapes and shapes.
  */
@@ -42,11 +38,6 @@ public abstract class LeafShapeFieldData<T extends ShapeValues<?>> implements Le
             return 0;
         }
 
-        @Override
-        public Collection<Accountable> getChildResources() {
-            return Collections.emptyList();
-        }
-
         @Override
         public void close() {}
 

+ 0 - 8
x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/plain/CartesianPointDVLeafFieldData.java

@@ -10,13 +10,10 @@ package org.elasticsearch.xpack.spatial.index.fielddata.plain;
 import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReader;
 import org.apache.lucene.index.SortedNumericDocValues;
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.script.field.ToScriptFieldFactory;
 import org.elasticsearch.xpack.spatial.search.aggregations.support.CartesianPointValuesSource;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 
 final class CartesianPointDVLeafFieldData extends LeafCartesianPointFieldData {
     private final LeafReader reader;
@@ -37,11 +34,6 @@ final class CartesianPointDVLeafFieldData extends LeafCartesianPointFieldData {
         return 0; // not exposed by lucene
     }
 
-    @Override
-    public Collection<Accountable> getChildResources() {
-        return Collections.emptyList();
-    }
-
     @Override
     public void close() {
         // noop

+ 0 - 8
x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/plain/CartesianShapeDVAtomicShapeFieldData.java

@@ -10,7 +10,6 @@ package org.elasticsearch.xpack.spatial.index.fielddata.plain;
 import org.apache.lucene.index.BinaryDocValues;
 import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReader;
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.script.field.ToScriptFieldFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 import org.elasticsearch.xpack.spatial.index.fielddata.CartesianShapeValues;
@@ -18,8 +17,6 @@ import org.elasticsearch.xpack.spatial.index.fielddata.LeafShapeFieldData;
 import org.elasticsearch.xpack.spatial.search.aggregations.support.CartesianShapeValuesSourceType;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 
 final class CartesianShapeDVAtomicShapeFieldData extends LeafShapeFieldData<CartesianShapeValues> {
     private final LeafReader reader;
@@ -40,11 +37,6 @@ final class CartesianShapeDVAtomicShapeFieldData extends LeafShapeFieldData<Cart
         return 0; // not exposed by lucene
     }
 
-    @Override
-    public Collection<Accountable> getChildResources() {
-        return Collections.emptyList();
-    }
-
     @Override
     public void close() {
         // noop

+ 0 - 8
x-pack/plugin/spatial/src/main/java/org/elasticsearch/xpack/spatial/index/fielddata/plain/LatLonShapeDVAtomicShapeFieldData.java

@@ -10,7 +10,6 @@ package org.elasticsearch.xpack.spatial.index.fielddata.plain;
 import org.apache.lucene.index.BinaryDocValues;
 import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.LeafReader;
-import org.apache.lucene.util.Accountable;
 import org.elasticsearch.script.field.ToScriptFieldFactory;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 import org.elasticsearch.xpack.spatial.index.fielddata.GeoShapeValues;
@@ -18,8 +17,6 @@ import org.elasticsearch.xpack.spatial.index.fielddata.LeafShapeFieldData;
 import org.elasticsearch.xpack.spatial.search.aggregations.support.GeoShapeValuesSourceType;
 
 import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
 
 final class LatLonShapeDVAtomicShapeFieldData extends LeafShapeFieldData<GeoShapeValues> {
     private final LeafReader reader;
@@ -36,11 +33,6 @@ final class LatLonShapeDVAtomicShapeFieldData extends LeafShapeFieldData<GeoShap
         return 0; // not exposed by lucene
     }
 
-    @Override
-    public Collection<Accountable> getChildResources() {
-        return Collections.emptyList();
-    }
-
     @Override
     public void close() {
         // noop