Misc cleanup fieldata package (elastic#113331)

Just some obvious cleanup and deduplication.

server/src/main/java/org/elasticsearch/index/codec/tsdb/ES87TSDBDocValuesConsumer.java

@@ -533,7 +533,7 @@ public SortedNumericDocValues getSortedNumeric(FieldInfo field) throws IOExcepti
  int i, docValueCount;
 
  @Override
- public long nextValue() throws IOException {
+ public long nextValue() {
  return ords[i++];
  }
 
@@ -543,7 +543,7 @@ public int docValueCount() {
  }
 
  @Override
- public boolean advanceExact(int target) throws IOException {
+ public boolean advanceExact(int target) {
  throw new UnsupportedOperationException();
  }
 

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

@@ -10,13 +10,9 @@
 package org.elasticsearch.index.fielddata;
 
 import org.apache.lucene.index.BinaryDocValues;
-import org.apache.lucene.search.DocIdSetIterator;
-
-import java.io.IOException;
 
 /**
- * Base implementation that throws an {@link IOException} for the
- * {@link DocIdSetIterator} APIs. This impl is safe to use for sorting and
+ * Base implementation. This impl is safe to use for sorting and
  * aggregations, which only use {@link #advanceExact(int)} and
  * {@link #binaryValue()}.
  */
@@ -28,12 +24,12 @@ public int docID() {
  }
 
  @Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
  throw new UnsupportedOperationException();
  }
 
  @Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
  throw new UnsupportedOperationException();
  }
 

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

@@ -23,12 +23,12 @@
 public abstract class AbstractNumericDocValues extends NumericDocValues {
 
  @Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
  throw new UnsupportedOperationException();
  }
 
  @Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
  throw new UnsupportedOperationException();
  }
 

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

@@ -23,12 +23,12 @@
 public abstract class AbstractSortedDocValues extends SortedDocValues {
 
  @Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
  throw new UnsupportedOperationException();
  }
 
  @Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
  throw new UnsupportedOperationException();
  }
 

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

@@ -33,7 +33,7 @@ public int nextDoc() throws IOException {
  }
 
  @Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
  throw new UnsupportedOperationException();
  }
 

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

@@ -28,12 +28,12 @@ public int docID() {
  }
 
  @Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
  throw new UnsupportedOperationException();
  }
 
  @Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
  throw new UnsupportedOperationException();
  }
 

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

@@ -36,12 +36,12 @@ public int docID() {
  }
 
  @Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
  throw new UnsupportedOperationException();
  }
 
  @Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
  throw new UnsupportedOperationException();
  }
 

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

@@ -66,9 +66,5 @@ public long ramBytesUsed() {
  return 0;
  }
 
- @Override
- public void close() {
-
- }
  }
 }

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

@@ -43,7 +43,7 @@ public DoubleScriptFieldData build(IndexFieldDataCache cache, CircuitBreakerServ
  }
 
  private final String fieldName;
- DoubleFieldScript.LeafFactory leafFactory;
+ final DoubleFieldScript.LeafFactory leafFactory;
  private final ToScriptFieldFactory<SortedNumericDoubleValues> toScriptFieldFactory;
 
  private DoubleScriptFieldData(

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

@@ -42,12 +42,12 @@ public static SortedBinaryDocValues emptySortedBinary() {
  public static NumericDoubleValues emptyNumericDouble() {
  return new NumericDoubleValues() {
  @Override
- public boolean advanceExact(int doc) throws IOException {
+ public boolean advanceExact(int doc) {
  return false;
  }
 
  @Override
- public double doubleValue() throws IOException {
+ public double doubleValue() {
  throw new UnsupportedOperationException();
  }
 
@@ -243,14 +243,6 @@ public static BinaryDocValues unwrapSingleton(SortedBinaryDocValues values) {
  return null;
  }
 
- /**
- * Returns whether the provided values *might* be multi-valued. There is no
- * guarantee that this method will return {@code false} in the single-valued case.
- */
- public static boolean isMultiValued(SortedSetDocValues values) {
- return DocValues.unwrapSingleton(values) == null;
- }
-
  /**
  * Return a {@link String} representation of the provided values. That is
  * typically used for scripts or for the `map` execution mode of terms aggs.
@@ -634,7 +626,7 @@ public boolean advanceExact(int target) throws IOException {
  }
 
  @Override
- public long longValue() throws IOException {
+ public long longValue() {
  return value;
  }
  };
@@ -661,7 +653,7 @@ public boolean advanceExact(int target) throws IOException {
  }
 
  @Override
- public double doubleValue() throws IOException {
+ public double doubleValue() {
  return value;
  }
  };

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

@@ -67,6 +67,6 @@ public int docValueCount() {
  public long nextValue() {
  int lat = GeoEncodingUtils.encodeLatitude(script.lats()[cursor]);
  int lon = GeoEncodingUtils.encodeLongitude(script.lons()[cursor++]);
- return Long.valueOf((((long) lat) << 32) | (lon & 0xFFFFFFFFL));
+ return (((long) lat) << 32) | (lon & 0xFFFFFFFFL);
  }
 }

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

@@ -103,10 +103,6 @@ public long ramBytesUsed() {
  return 0;
  }
 
- @Override
- public void close() {
-
- }
  };
  }
 

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

@@ -20,7 +20,6 @@
 import org.elasticsearch.search.lookup.SearchLookup;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -90,7 +89,6 @@ public synchronized void clearField(final String fieldName) {
  * Returns fielddata for the provided field type, given the provided fully qualified index name, while also making
  * a {@link SearchLookup} supplier available that is required for runtime fields.
  */
- @SuppressWarnings("unchecked")
  public <IFD extends IndexFieldData<?>> IFD getForField(MappedFieldType fieldType, FieldDataContext fieldDataContext) {
  return getFromBuilder(fieldType, fieldType.fielddataBuilder(fieldDataContext));
  }
@@ -134,7 +132,7 @@ public void setListener(IndexFieldDataCache.Listener listener) {
  }
 
  @Override
- public void close() throws IOException {
+ public void close() {
  clear();
  }
 }

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

@@ -198,20 +198,16 @@ private XFieldComparatorSource comparatorSource(
  MultiValueMode sortMode,
  Nested nested
  ) {
- switch (targetNumericType) {
- case HALF_FLOAT:
- case FLOAT:
- return new FloatValuesComparatorSource(this, missingValue, sortMode, nested);
- case DOUBLE:
- return new DoubleValuesComparatorSource(this, missingValue, sortMode, nested);
- case DATE:
- return dateComparatorSource(missingValue, sortMode, nested);
- case DATE_NANOSECONDS:
- return dateNanosComparatorSource(missingValue, sortMode, nested);
- default:
+ return switch (targetNumericType) {
+ case HALF_FLOAT, FLOAT -> new FloatValuesComparatorSource(this, missingValue, sortMode, nested);
+ case DOUBLE -> new DoubleValuesComparatorSource(this, missingValue, sortMode, nested);
+ case DATE -> dateComparatorSource(missingValue, sortMode, nested);
+ case DATE_NANOSECONDS -> dateNanosComparatorSource(missingValue, sortMode, nested);
+ default -> {
  assert targetNumericType.isFloatingPoint() == false;
- return new LongValuesComparatorSource(this, missingValue, sortMode, nested, targetNumericType);
- }
+ yield new LongValuesComparatorSource(this, missingValue, sortMode, nested, targetNumericType);
+ }
+ };
  }
 
  protected XFieldComparatorSource dateComparatorSource(@Nullable Object missingValue, MultiValueMode sortMode, Nested nested) {

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

@@ -32,6 +32,9 @@ public interface LeafFieldData extends Accountable, Releasable {
  */
  SortedBinaryDocValues getBytesValues();
 
+ @Override
+ default void close() {}
+
  /**
  * Return a formatted representation of the values
  */

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

@@ -20,8 +20,6 @@
 import org.elasticsearch.search.aggregations.support.CoreValuesSourceType;
 import org.elasticsearch.search.aggregations.support.ValuesSourceType;
 
-import java.io.IOException;
-
 public final class LongScriptFieldData extends IndexNumericFieldData {
 
  public static class Builder implements IndexFieldData.Builder {
@@ -79,7 +77,7 @@ public LongScriptLeafFieldData load(LeafReaderContext context) {
  }
 
  @Override
- public LongScriptLeafFieldData loadDirect(LeafReaderContext context) throws IOException {
+ public LongScriptLeafFieldData loadDirect(LeafReaderContext context) {
  return new LongScriptLeafFieldData(new LongScriptDocValues(leafFactory.newInstance(context)), toScriptFieldFactory);
  }
 

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

@@ -45,7 +45,6 @@ public GeoPoint nextValue() throws IOException {
  /**
  * Returns a single-valued view of the {@link MultiPointValues} if possible, otherwise null.
  */
- @Override
  protected GeoPointValues getPointValues() {
  final NumericDocValues singleton = DocValues.unwrapSingleton(numericValues);
  return singleton != null ? new GeoPointValues(singleton) : null;

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

@@ -53,8 +53,4 @@ public int docValueCount() {
  */
  public abstract T nextValue() throws IOException;
 
- /**
- * Returns a single-valued view of the {@link MultiPointValues} if possible, otherwise null.
- */
- protected abstract PointValues<T> getPointValues();
 }

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

@@ -52,7 +52,7 @@ public RamAccountingTermsEnum(
  * Always accept the term.
  */
  @Override
- protected AcceptStatus accept(BytesRef term) throws IOException {
+ protected AcceptStatus accept(BytesRef term) {
  return AcceptStatus.YES;
  }
 

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

@@ -25,7 +25,7 @@ public abstract class SortingNumericDocValues extends SortedNumericDocValues {
  protected long[] values;
  protected int valuesCursor;
  private final Sorter sorter;
- private LongConsumer circuitBreakerConsumer;
+ private final LongConsumer circuitBreakerConsumer;
 
  protected SortingNumericDocValues() {
  this(l -> {});

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

@@ -132,11 +132,6 @@ public long ramBytesUsed() {
  return 0;
  }
 
- @Override
- public void close() {
-
- }
-
  @Override
  public SortedBinaryDocValues getBytesValues() {
  throw new IllegalArgumentException("not supported for source fallback");

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

@@ -61,7 +61,7 @@ protected SourceValueFetcherMultiGeoPointIndexFieldData(
  }
 
  @Override
- public SourceValueFetcherMultiGeoPointLeafFieldData loadDirect(LeafReaderContext context) throws Exception {
+ public SourceValueFetcherMultiGeoPointLeafFieldData loadDirect(LeafReaderContext context) {
  return new SourceValueFetcherMultiGeoPointLeafFieldData(toScriptFieldFactory, context, valueFetcher, sourceProvider);
  }
 

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

@@ -62,7 +62,7 @@ protected SourceValueFetcherSortedBinaryIndexFieldData(
  }
 
  @Override
- public SourceValueFetcherSortedBinaryLeafFieldData loadDirect(LeafReaderContext context) throws Exception {
+ public SourceValueFetcherSortedBinaryLeafFieldData loadDirect(LeafReaderContext context) {
  return new SourceValueFetcherSortedBinaryLeafFieldData(toScriptFieldFactory, context, valueFetcher, sourceProvider);
  }
 
@@ -127,7 +127,7 @@ public int docValueCount() {
  }
 
  @Override
- public BytesRef nextValue() throws IOException {
+ public BytesRef nextValue() {
  assert iterator.hasNext();
  return iterator.next();
  }

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

@@ -59,7 +59,7 @@ protected SourceValueFetcherSortedBooleanIndexFieldData(
  }
 
  @Override
- public SourceValueFetcherLeafFieldData<SortedNumericDocValues> loadDirect(LeafReaderContext context) throws Exception {
+ public SourceValueFetcherLeafFieldData<SortedNumericDocValues> loadDirect(LeafReaderContext context) {
  return new SourceValueFetcherSortedBooleanLeafFieldData(toScriptFieldFactory, context, valueFetcher, sourceProvider);
  }
 
@@ -129,7 +129,7 @@ public int docValueCount() {
  }
 
  @Override
- public long nextValue() throws IOException {
+ public long nextValue() {
  assert iteratorIndex < trueCount + falseCount;
  return iteratorIndex++ < falseCount ? 0L : 1L;
  }
@@ -140,12 +140,12 @@ public int docID() {
  }
 
  @Override
- public int nextDoc() throws IOException {
+ public int nextDoc() {
  throw new UnsupportedOperationException("not supported for source fallback");
  }
 
  @Override
- public int advance(int target) throws IOException {
+ public int advance(int target) {
  throw new UnsupportedOperationException("not supported for source fallback");
  }