Misc cleanup fieldata package (elastic#113331) (elastic#113342)

Just some obvious cleanup and deduplication.

Author: original-brownbear

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;
             }
         };