Misc dead code cleanup o.e.e.search (elastic#102617)

Misc obvious cleanup of unused methods and unused parameters.
timgrein · Nov 30, 2023 · 0977883 · 0977883
1 parent 682fca9
commit 0977883
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 84 deletions.
diff --git a/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java b/server/src/main/java/org/elasticsearch/action/search/QueryPhaseResultConsumer.java
@@ -300,11 +300,10 @@ void sortBuffer() {
             }
         }
 
-        synchronized long addWithoutBreaking(long size) {
+        synchronized void addWithoutBreaking(long size) {
             circuitBreaker.addWithoutBreaking(size);
             circuitBreakerBytes += size;
             maxAggsCurrentBufferSize = Math.max(maxAggsCurrentBufferSize, circuitBreakerBytes);
-            return circuitBreakerBytes;
         }
 
         synchronized long addEstimateAndMaybeBreak(long estimatedSize) {

diff --git a/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/server/src/main/java/org/elasticsearch/action/search/SearchRequest.java
@@ -541,13 +541,6 @@ public void setCcsMinimizeRoundtrips(boolean ccsMinimizeRoundtrips) {
         this.ccsMinimizeRoundtrips = ccsMinimizeRoundtrips;
     }
 
-    /**
-     * Returns the default value of {@link #ccsMinimizeRoundtrips} of a search request
-     */
-    public static boolean defaultCcsMinimizeRoundtrips(SearchRequest request) {
-        return request.minCompatibleShardNode == null;
-    }
-
     /**
      * A comma separated list of routing values to control the shards the search will be executed on.
      */

diff --git a/.../java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java b/.../java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorSource.java
@@ -65,7 +65,7 @@ private NumericDoubleValues getNumericDocValues(LeafReaderContext context, doubl
             final BitSet rootDocs = nested.rootDocs(context);
             final DocIdSetIterator innerDocs = nested.innerDocs(context);
             final int maxChildren = nested.getNestedSort() != null ? nested.getNestedSort().getMaxChildren() : Integer.MAX_VALUE;
-            return sortMode.select(values, missingValue, rootDocs, innerDocs, context.reader().maxDoc(), maxChildren);
+            return sortMode.select(values, missingValue, rootDocs, innerDocs, maxChildren);
         }
     }
 

diff --git a/...n/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java b/...n/java/org/elasticsearch/index/fielddata/fieldcomparator/FloatValuesComparatorSource.java
@@ -60,7 +60,7 @@ private NumericDoubleValues getNumericDocValues(LeafReaderContext context, float
             final BitSet rootDocs = nested.rootDocs(context);
             final DocIdSetIterator innerDocs = nested.innerDocs(context);
             final int maxChildren = nested.getNestedSort() != null ? nested.getNestedSort().getMaxChildren() : Integer.MAX_VALUE;
-            return sortMode.select(values, missingValue, rootDocs, innerDocs, context.reader().maxDoc(), maxChildren);
+            return sortMode.select(values, missingValue, rootDocs, innerDocs, maxChildren);
         }
     }
 

diff --git a/server/src/main/java/org/elasticsearch/search/MultiValueMode.java b/server/src/main/java/org/elasticsearch/search/MultiValueMode.java
@@ -681,7 +681,6 @@ public NumericDoubleValues select(
         final double missingValue,
         final BitSet parentDocs,
         final DocIdSetIterator childDocs,
-        int maxDoc,
         int maxChildren
     ) throws IOException {
         if (parentDocs == null || childDocs == null) {

diff --git a/...ava/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java b/...ava/org/elasticsearch/search/aggregations/bucket/range/GeoDistanceAggregationBuilder.java
@@ -117,11 +117,7 @@ private static String key(String key, Double from, Double to) {
             if (key != null) {
                 return key;
             }
-            StringBuilder sb = new StringBuilder();
-            sb.append((from == null || from == 0) ? "*" : from);
-            sb.append("-");
-            sb.append((to == null || Double.isInfinite(to)) ? "*" : to);
-            return sb.toString();
+            return ((from == null || from == 0) ? "*" : from) + "-" + ((to == null || Double.isInfinite(to)) ? "*" : to);
         }
     }
 

diff --git a/...src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java b/...src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalBinaryRange.java
@@ -63,10 +63,7 @@ public Bucket(
         }
 
         private static String generateKey(BytesRef from, BytesRef to, DocValueFormat format) {
-            StringBuilder builder = new StringBuilder().append(from == null ? "*" : format.format(from))
-                .append("-")
-                .append(to == null ? "*" : format.format(to));
-            return builder.toString();
+            return (from == null ? "*" : format.format(from)) + "-" + (to == null ? "*" : format.format(to));
         }
 
         private static Bucket createFromStream(StreamInput in, DocValueFormat format, boolean keyed) throws IOException {

diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/InternalRange.java
@@ -144,10 +144,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         }
 
         private static String generateKey(double from, double to, DocValueFormat format) {
-            StringBuilder builder = new StringBuilder().append(Double.isInfinite(from) ? "*" : format.format(from))
-                .append("-")
-                .append(Double.isInfinite(to) ? "*" : format.format(to));
-            return builder.toString();
+            return (Double.isInfinite(from) ? "*" : format.format(from)) + "-" + (Double.isInfinite(to) ? "*" : format.format(to));
         }
 
         @Override

diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/range/ParsedRange.java
@@ -41,7 +41,7 @@ protected static void declareParsedRangeFields(
         final CheckedFunction<XContentParser, ParsedBucket, IOException> bucketParser,
         final CheckedFunction<XContentParser, ParsedBucket, IOException> keyedBucketParser
     ) {
-        declareMultiBucketAggregationFields(objectParser, bucketParser::apply, keyedBucketParser::apply);
+        declareMultiBucketAggregationFields(objectParser, bucketParser, keyedBucketParser);
     }
 
     private static final ObjectParser<ParsedRange, Void> PARSER = new ObjectParser<>(

diff --git a/...main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedRareTerms.java b/...main/java/org/elasticsearch/search/aggregations/bucket/terms/InternalMappedRareTerms.java
@@ -34,7 +34,6 @@ public abstract class InternalMappedRareTerms<A extends InternalRareTerms<A, B>,
 
     protected DocValueFormat format;
     protected List<B> buckets;
-    protected Map<String, B> bucketMap;
 
     final SetBackedScalingCuckooFilter filter;
 

diff --git a/.../src/main/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregator.java b/.../src/main/java/org/elasticsearch/search/aggregations/metrics/ExtendedStatsAggregator.java
@@ -140,20 +140,11 @@ public boolean hasMetric(String name) {
     public double metric(String name, long owningBucketOrd) {
         if (owningBucketOrd >= counts.size()) {
             return switch (InternalExtendedStats.Metrics.resolve(name)) {
-                case count -> 0;
-                case sum -> 0;
+                case count, sum_of_squares, sum -> 0;
                 case min -> Double.POSITIVE_INFINITY;
                 case max -> Double.NEGATIVE_INFINITY;
-                case avg -> Double.NaN;
-                case sum_of_squares -> 0;
-                case variance -> Double.NaN;
-                case variance_population -> Double.NaN;
-                case variance_sampling -> Double.NaN;
-                case std_deviation -> Double.NaN;
-                case std_deviation_population -> Double.NaN;
-                case std_deviation_sampling -> Double.NaN;
-                case std_upper -> Double.NaN;
-                case std_lower -> Double.NaN;
+                case avg, variance, variance_population, variance_sampling, std_deviation, std_deviation_population, std_deviation_sampling,
+                    std_upper, std_lower -> Double.NaN;
                 default -> throw new IllegalArgumentException("Unknown value [" + name + "] in common stats aggregation");
             };
         }
@@ -167,9 +158,7 @@ public double metric(String name, long owningBucketOrd) {
             case variance -> variance(owningBucketOrd);
             case variance_population -> variancePopulation(owningBucketOrd);
             case variance_sampling -> varianceSampling(owningBucketOrd);
-            case std_deviation -> Math.sqrt(variance(owningBucketOrd));
-            case std_deviation_population -> Math.sqrt(variance(owningBucketOrd));
-            case std_deviation_sampling -> Math.sqrt(varianceSampling(owningBucketOrd));
+            case std_deviation, std_deviation_population, std_deviation_sampling -> Math.sqrt(variance(owningBucketOrd));
             case std_upper -> (sums.get(owningBucketOrd) / counts.get(owningBucketOrd)) + (Math.sqrt(variance(owningBucketOrd))
                 * this.sigma);
             case std_lower -> (sums.get(owningBucketOrd) / counts.get(owningBucketOrd)) - (Math.sqrt(variance(owningBucketOrd))

diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/StatsAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/StatsAggregator.java
@@ -112,8 +112,7 @@ public boolean hasMetric(String name) {
     public double metric(String name, long owningBucketOrd) {
         if (owningBucketOrd >= counts.size()) {
             return switch (InternalStats.Metrics.resolve(name)) {
-                case count -> 0;
-                case sum -> 0;
+                case count, sum -> 0;
                 case min -> Double.POSITIVE_INFINITY;
                 case max -> Double.NEGATIVE_INFINITY;
                 case avg -> Double.NaN;

diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceConfig.java
@@ -182,7 +182,6 @@ private static ValuesSourceConfig internalResolve(
             aggregationScript,
             scriptValueType,
             missing,
-            timeZone,
             docValueFormat,
             context::nowInMillis
         );
@@ -258,14 +257,14 @@ private static DocValueFormat resolveFormat(
     public static ValuesSourceConfig resolveFieldOnly(MappedFieldType fieldType, AggregationContext context) {
         FieldContext fieldContext = context.buildFieldContext(fieldType);
         ValuesSourceType vstype = fieldContext.indexFieldData().getValuesSourceType();
-        return new ValuesSourceConfig(vstype, fieldContext, false, null, null, null, null, null, context::nowInMillis);
+        return new ValuesSourceConfig(vstype, fieldContext, false, null, null, null, null, context::nowInMillis);
     }
 
     /**
      * Convenience method for creating unmapped configs
      */
     public static ValuesSourceConfig resolveUnmapped(ValuesSourceType valuesSourceType, AggregationContext context) {
-        return new ValuesSourceConfig(valuesSourceType, null, true, null, null, null, null, null, context::nowInMillis);
+        return new ValuesSourceConfig(valuesSourceType, null, true, null, null, null, null, context::nowInMillis);
     }
 
     private final ValuesSourceType valuesSourceType;
@@ -275,7 +274,6 @@ public static ValuesSourceConfig resolveUnmapped(ValuesSourceType valuesSourceTy
     private final boolean unmapped;
     private final DocValueFormat format;
     private final Object missing;
-    private final ZoneId timeZone;
     private final ValuesSource valuesSource;
 
     @SuppressWarnings("this-escape")
@@ -286,7 +284,6 @@ public ValuesSourceConfig(
         AggregationScript.LeafFactory script,
         ValueType scriptValueType,
         Object missing,
-        ZoneId timeZone,
         DocValueFormat format,
         LongSupplier nowInMillis
     ) {
@@ -299,7 +296,6 @@ public ValuesSourceConfig(
         this.script = script;
         this.scriptValueType = scriptValueType;
         this.missing = missing;
-        this.timeZone = timeZone;
         this.format = format == null ? DocValueFormat.RAW : format;
 
         if (valid() == false) {
@@ -383,10 +379,6 @@ public Object missing() {
         return this.missing;
     }
 
-    public ZoneId timezone() {
-        return this.timeZone;
-    }
-
     public DocValueFormat format() {
         return format;
     }

diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceRegistry.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSourceRegistry.java
@@ -53,9 +53,6 @@ public int hashCode() {
         }
     }
 
-    @SuppressWarnings("rawtypes")
-    public static final RegistryKey UNREGISTERED_KEY = new RegistryKey<>("unregistered", RegistryKey.class);
-
     public static class Builder {
         private final AggregationUsageService.Builder usageServiceBuilder;
         private final Map<RegistryKey<?>, List<Map.Entry<ValuesSourceType, ?>>> aggregatorRegistry = new HashMap<>();

diff --git a/server/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java b/server/src/main/java/org/elasticsearch/search/searchafter/SearchAfterBuilder.java
@@ -152,24 +152,18 @@ static Object convertValueFromSortField(Object value, SortField sortField, DocVa
     private static Object convertValueFromSortType(String fieldName, SortField.Type sortType, Object value, DocValueFormat format) {
         try {
             switch (sortType) {
-                case DOC:
+                case DOC, INT:
                     if (value instanceof Number) {
                         return ((Number) value).intValue();
                     }
                     return Integer.parseInt(value.toString());
 
-                case SCORE:
+                case SCORE, FLOAT:
                     if (value instanceof Number) {
                         return ((Number) value).floatValue();
                     }
                     return Float.parseFloat(value.toString());
 
-                case INT:
-                    if (value instanceof Number) {
-                        return ((Number) value).intValue();
-                    }
-                    return Integer.parseInt(value.toString());
-
                 case DOUBLE:
                     if (value instanceof Number) {
                         return ((Number) value).doubleValue();
@@ -187,12 +181,6 @@ private static Object convertValueFromSortType(String fieldName, SortField.Type
                         () -> { throw new IllegalStateException("now() is not allowed in [search_after] key"); }
                     );
 
-                case FLOAT:
-                    if (value instanceof Number) {
-                        return ((Number) value).floatValue();
-                    }
-                    return Float.parseFloat(value.toString());
-
                 case STRING_VAL:
                 case STRING:
                     if (value instanceof BytesRef bytesRef) {

diff --git a/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java b/server/src/main/java/org/elasticsearch/search/sort/GeoDistanceSortBuilder.java
@@ -651,14 +651,7 @@ private NumericDoubleValues getNumericDoubleValues(LeafReaderContext context) th
                     final BitSet rootDocs = nested.rootDocs(context);
                     final DocIdSetIterator innerDocs = nested.innerDocs(context);
                     final int maxChildren = nested.getNestedSort() != null ? nested.getNestedSort().getMaxChildren() : Integer.MAX_VALUE;
-                    return localSortMode.select(
-                        distanceValues,
-                        Double.POSITIVE_INFINITY,
-                        rootDocs,
-                        innerDocs,
-                        context.reader().maxDoc(),
-                        maxChildren
-                    );
+                    return localSortMode.select(distanceValues, Double.POSITIVE_INFINITY, rootDocs, innerDocs, maxChildren);
                 }
             }
 

diff --git a/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java b/server/src/test/java/org/elasticsearch/search/MultiValueModeTests.java
@@ -423,7 +423,6 @@ private void verifySortedNumericDouble(
                     missingValue,
                     rootDocs,
                     new BitSetIterator(innerDocs, 0L),
-                    maxDoc,
                     maxChildren
                 );
                 int prevRoot = -1;

diff --git a/...nalytics/src/main/java/org/elasticsearch/xpack/analytics/rate/RateAggregationBuilder.java b/...nalytics/src/main/java/org/elasticsearch/xpack/analytics/rate/RateAggregationBuilder.java
@@ -196,7 +196,6 @@ protected ValuesSourceConfig resolveConfig(AggregationContext context) {
                 null,
                 null,
                 1.0,
-                null,
                 DocValueFormat.RAW,
                 context::nowInMillis
             );

diff --git a/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/SpatialPluginTests.java b/x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/SpatialPluginTests.java
@@ -175,7 +175,7 @@ private <T> void checkLicenseNotRequired(
             ValuesSourceRegistry registry = registryBuilder.build();
             T aggregator = registry.getAggregator(
                 registryKey,
-                new ValuesSourceConfig(sourceType, null, true, null, null, null, null, null, null)
+                new ValuesSourceConfig(sourceType, null, true, null, null, null, null, null)
             );
             NullPointerException exception = expectThrows(NullPointerException.class, () -> builder.accept(aggregator));
             assertThat(
@@ -203,7 +203,7 @@ private <T> void checkLicenseRequired(
             ValuesSourceRegistry registry = registryBuilder.build();
             T aggregator = registry.getAggregator(
                 registryKey,
-                new ValuesSourceConfig(sourceType, null, true, null, null, null, null, null, null)
+                new ValuesSourceConfig(sourceType, null, true, null, null, null, null, null)
             );
             if (License.OperationMode.TRIAL != operationMode
                 && License.OperationMode.compare(operationMode, License.OperationMode.GOLD) < 0) {
@@ -229,7 +229,7 @@ private <T> void checkLicenseRequired(
 
     private static class TestValuesSourceConfig extends ValuesSourceConfig {
         private TestValuesSourceConfig(ValuesSourceType sourceType) {
-            super(sourceType, null, true, null, null, null, null, null, null);
+            super(sourceType, null, true, null, null, null, null, null);
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                     null,
                     null,
 .0,
-                    null,
                     DocValueFormat.RAW,
                     context::nowInMillis
                 );
@@ Expand Down @@