rounding errors

not-napoleon · Sep 27, 2023 · ccb08a0 · ccb08a0
1 parent ae42755
commit ccb08a0
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 17 deletions.
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/AggregationErrors.java b/server/src/main/java/org/elasticsearch/search/aggregations/AggregationErrors.java
@@ -60,6 +60,14 @@ public static RuntimeException rateWithoutDateHistogram(String name) {
         );
     }
 
+    /**
+     * This error indicates that the backing indices for a field have different, incompatible, types (e.g. IP and Keyword).  This
+     * causes a failure at reduce time, and is not retryable (and thus should be a 400 class error)
+     *
+     * @param aggregationName - The name of the aggregation
+     * @param position - optional, for multisource aggregations.  Indicates the position of the field causing the problem.
+     * @return - an appropriate exception
+     */
     public static RuntimeException reduceTypeMissmatch(String aggregationName, Optional<Integer> position) {
         String fieldString;
         if (position.isPresent()) {
@@ -85,10 +93,23 @@ public static RuntimeException unsupportedScriptValue(String actual) {
         return new IllegalArgumentException("Unsupported script value [" + actual + "], expected a number, date, or boolean");
     }
 
+    /**
+     * Indicates that a multivalued field was found where we only support a single valued field
+     * @return an appropriate exception
+     */
     public static RuntimeException unsupportedMultivalue() {
         return new IllegalArgumentException(
             "Encountered more than one value for a "
                 + "single document. Use a script to combine multiple values per doc into a single value."
         );
     }
+
+    /**
+     * Indicates an attempt to use date rounding on a non-date values source
+     * @param typeName - name of the type we're attempting to round
+     * @return an appropriate exception
+     */
+    public static RuntimeException unsupportedRounding(String typeName) {
+        return new IllegalArgumentException("can't round a [" + typeName + "]");
+    }
 }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/MultiValuesSource.java
@@ -10,7 +10,7 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.elasticsearch.common.util.Maps;
 import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
-import org.elasticsearch.search.aggregations.AggregationExecutionException;
+import org.elasticsearch.search.aggregations.AggregationErrors;
 
 import java.io.IOException;
 import java.util.Map;
@@ -28,9 +28,7 @@ public NumericMultiValuesSource(Map<String, ValuesSourceConfig> valuesSourceConf
             for (Map.Entry<String, ValuesSourceConfig> entry : valuesSourceConfigs.entrySet()) {
                 final ValuesSource valuesSource = entry.getValue().getValuesSource();
                 if (valuesSource instanceof ValuesSource.Numeric == false) {
-                    throw new AggregationExecutionException(
-                        "ValuesSource type " + valuesSource.toString() + "is not supported for multi-valued aggregation"
-                    );
+                    throw AggregationErrors.unsupportedValuesSourceType(valuesSource, "multi-value");
                 }
                 values.put(entry.getKey(), (ValuesSource.Numeric) valuesSource);
             }

diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java b/server/src/main/java/org/elasticsearch/search/aggregations/support/ValuesSource.java
@@ -35,7 +35,7 @@
 import org.elasticsearch.index.mapper.RangeType;
 import org.elasticsearch.script.AggregationScript;
 import org.elasticsearch.search.DocValueFormat;
-import org.elasticsearch.search.aggregations.AggregationExecutionException;
+import org.elasticsearch.search.aggregations.AggregationErrors;
 import org.elasticsearch.search.aggregations.Aggregator;
 import org.elasticsearch.search.aggregations.bucket.geogrid.GeoTileCellIdSource;
 import org.elasticsearch.search.aggregations.bucket.range.RangeAggregator;
@@ -116,7 +116,7 @@ public DocValueBits docsWithValue(LeafReaderContext context) throws IOException
 
         @Override
         public final Function<Rounding, Rounding.Prepared> roundingPreparer(AggregationContext context) throws IOException {
-            throw new AggregationExecutionException("can't round a [BYTES]");
+            throw AggregationErrors.unsupportedRounding("BYTES");
         }
 
         /**
@@ -723,7 +723,7 @@ public DocValueBits docsWithValue(LeafReaderContext context) throws IOException
 
         @Override
         public final Function<Rounding, Rounding.Prepared> roundingPreparer(AggregationContext context) throws IOException {
-            throw new AggregationExecutionException("can't round a [GEO_POINT]");
+            throw AggregationErrors.unsupportedRounding("GEO_POINT");
         }
 
         /**

diff --git a/...in/java/org/elasticsearch/xpack/analytics/aggregations/support/HistogramValuesSource.java b/...in/java/org/elasticsearch/xpack/analytics/aggregations/support/HistogramValuesSource.java
@@ -14,7 +14,7 @@
 import org.elasticsearch.index.fielddata.HistogramValues;
 import org.elasticsearch.index.fielddata.IndexHistogramFieldData;
 import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
-import org.elasticsearch.search.aggregations.AggregationExecutionException;
+import org.elasticsearch.search.aggregations.AggregationErrors;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
 
 import java.io.IOException;
@@ -27,7 +27,7 @@ public abstract static class Histogram extends org.elasticsearch.search.aggregat
 
         @Override
         public Function<Rounding, Prepared> roundingPreparer(AggregationContext context) throws IOException {
-            throw new AggregationExecutionException("can't round a [histogram]");
+            throw AggregationErrors.unsupportedRounding("histogram");
         }
 
         public static class Fielddata extends Histogram {

diff --git a/...lasticsearch/xpack/aggregatemetric/aggregations/support/AggregateMetricsValuesSource.java b/...lasticsearch/xpack/aggregatemetric/aggregations/support/AggregateMetricsValuesSource.java
@@ -11,7 +11,7 @@
 import org.elasticsearch.index.fielddata.DocValueBits;
 import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
 import org.elasticsearch.index.fielddata.SortedNumericDoubleValues;
-import org.elasticsearch.search.aggregations.AggregationExecutionException;
+import org.elasticsearch.search.aggregations.AggregationErrors;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
 import org.elasticsearch.xpack.aggregatemetric.fielddata.IndexAggregateDoubleMetricFieldData;
 import org.elasticsearch.xpack.aggregatemetric.mapper.AggregateDoubleMetricFieldMapper;
@@ -51,7 +51,7 @@ public boolean advanceExact(int doc) throws IOException {
 
             @Override
             protected Function<Rounding, Rounding.Prepared> roundingPreparer(AggregationContext context) throws IOException {
-                throw new AggregationExecutionException("Can't round an [" + AggregateDoubleMetricFieldMapper.CONTENT_TYPE + "]");
+                throw AggregationErrors.unsupportedRounding(AggregateDoubleMetricFieldMapper.CONTENT_TYPE);
             }
 
             public SortedNumericDoubleValues getAggregateMetricValues(LeafReaderContext context, Metric metric) throws IOException {

diff --git a/...g/elasticsearch/xpack/spatial/search/aggregations/support/CartesianPointValuesSource.java b/...g/elasticsearch/xpack/spatial/search/aggregations/support/CartesianPointValuesSource.java
@@ -16,7 +16,7 @@
 import org.elasticsearch.index.fielddata.MultiPointValues;
 import org.elasticsearch.index.fielddata.PointValues;
 import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
-import org.elasticsearch.search.aggregations.AggregationExecutionException;
+import org.elasticsearch.search.aggregations.AggregationErrors;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
 import org.elasticsearch.search.aggregations.support.ValuesSource;
 import org.elasticsearch.xcontent.ToXContentFragment;
@@ -51,7 +51,7 @@ public DocValueBits docsWithValue(LeafReaderContext context) {
 
     @Override
     public final Function<Rounding, Rounding.Prepared> roundingPreparer(AggregationContext context) {
-        throw new AggregationExecutionException("can't round a [POINT]");
+        throw AggregationErrors.unsupportedRounding("POINT");
     }
 
     /**

diff --git a/...g/elasticsearch/xpack/spatial/search/aggregations/support/CartesianShapeValuesSource.java b/...g/elasticsearch/xpack/spatial/search/aggregations/support/CartesianShapeValuesSource.java
@@ -10,7 +10,7 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.elasticsearch.common.Rounding;
 import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
-import org.elasticsearch.search.aggregations.AggregationExecutionException;
+import org.elasticsearch.search.aggregations.AggregationErrors;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
 import org.elasticsearch.xpack.spatial.index.fielddata.CartesianShapeValues;
 import org.elasticsearch.xpack.spatial.index.fielddata.IndexShapeFieldData;
@@ -28,7 +28,7 @@ public CartesianShapeValues shapeValues(LeafReaderContext context) {
 
     @Override
     protected Function<Rounding, Rounding.Prepared> roundingPreparer(AggregationContext context) {
-        throw new AggregationExecutionException("can't round a [shape]");
+        throw AggregationErrors.unsupportedRounding("shape");
     }
 
     public static class Fielddata extends CartesianShapeValuesSource {

diff --git a/...ava/org/elasticsearch/xpack/spatial/search/aggregations/support/GeoShapeValuesSource.java b/...ava/org/elasticsearch/xpack/spatial/search/aggregations/support/GeoShapeValuesSource.java
@@ -10,7 +10,7 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.elasticsearch.common.Rounding;
 import org.elasticsearch.index.fielddata.SortedBinaryDocValues;
-import org.elasticsearch.search.aggregations.AggregationExecutionException;
+import org.elasticsearch.search.aggregations.AggregationErrors;
 import org.elasticsearch.search.aggregations.support.AggregationContext;
 import org.elasticsearch.xpack.spatial.index.fielddata.GeoShapeValues;
 import org.elasticsearch.xpack.spatial.index.fielddata.IndexShapeFieldData;
@@ -28,7 +28,7 @@ public GeoShapeValues shapeValues(LeafReaderContext context) {
 
     @Override
     protected Function<Rounding, Rounding.Prepared> roundingPreparer(AggregationContext context) {
-        throw new AggregationExecutionException("can't round a [geo_shape]");
+        throw AggregationErrors.unsupportedRounding("geo_shape");
     }
 
     public static class Fielddata extends GeoShapeValuesSource {