fallback to float if source type is scaled_float for mapping deduction (

#51990) (#52006) fallback to float if source type is scaled_float for mapping deduction of min/max aggregation fixes #51780
elastic · Feb 12, 2020 · a53e4aa · a53e4aa
1 parent 0460712
commit a53e4aa
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/...nsform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Aggregations.java b/...nsform/src/main/java/org/elasticsearch/xpack/transform/transforms/pivot/Aggregations.java
@@ -17,6 +17,13 @@ public final class Aggregations {
     private static final String DYNAMIC = "_dynamic";
     // the field mapping should be determined explicitly from the source field mapping if possible.
     private static final String SOURCE = "_source";
+    public static final String FLOAT = "float";
+    public static final String SCALED_FLOAT = "scaled_float";
+    public static final String DOUBLE = "double";
+    public static final String LONG = "long";
+    public static final String GEO_SHAPE = "geo_shape";
+    public static final String GEO_POINT = "geo_point";
+
     private Aggregations() {}
 
     /**
@@ -29,14 +36,14 @@ private Aggregations() {}
      *
      */
     enum AggregationType {
-        AVG("avg", "double"),
-        CARDINALITY("cardinality", "long"),
-        VALUE_COUNT("value_count", "long"),
+        AVG("avg", DOUBLE),
+        CARDINALITY("cardinality", LONG),
+        VALUE_COUNT("value_count", LONG),
         MAX("max", SOURCE),
         MIN("min", SOURCE),
-        SUM("sum", "double"),
-        GEO_CENTROID("geo_centroid", "geo_point"),
-        GEO_BOUNDS("geo_bounds", "geo_shape"),
+        SUM("sum", DOUBLE),
+        GEO_CENTROID("geo_centroid", GEO_POINT),
+        GEO_BOUNDS("geo_bounds", GEO_SHAPE),
         SCRIPTED_METRIC("scripted_metric", DYNAMIC),
         WEIGHTED_AVG("weighted_avg", DYNAMIC),
         BUCKET_SELECTOR("bucket_selector", DYNAMIC),
@@ -72,6 +79,15 @@ public static boolean isDynamicMapping(String targetMapping) {
 
     public static String resolveTargetMapping(String aggregationType, String sourceType) {
         AggregationType agg = AggregationType.valueOf(aggregationType.toUpperCase(Locale.ROOT));
-        return agg.getTargetMapping().equals(SOURCE) ? sourceType : agg.getTargetMapping();
+
+        if (agg.getTargetMapping().equals(SOURCE)) {
+            // scaled float requires an additional parameter "scaling_factor", which we do not know, therefore we fallback to float
+            if (sourceType.equals(SCALED_FLOAT)) {
+                return FLOAT;
+            }
+            return sourceType;
+        }
+
+        return agg.getTargetMapping();
     }
 }
diff --git a/...m/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationsTests.java b/...m/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/AggregationsTests.java
@@ -27,11 +27,13 @@ public void testResolveTargetMapping() {
         assertEquals("int", Aggregations.resolveTargetMapping("max", "int"));
         assertEquals("double", Aggregations.resolveTargetMapping("max", "double"));
         assertEquals("half_float", Aggregations.resolveTargetMapping("max", "half_float"));
+        assertEquals("float", Aggregations.resolveTargetMapping("max", "scaled_float"));
 
         // min
         assertEquals("int", Aggregations.resolveTargetMapping("min", "int"));
         assertEquals("double", Aggregations.resolveTargetMapping("min", "double"));
         assertEquals("half_float", Aggregations.resolveTargetMapping("min", "half_float"));
+        assertEquals("float", Aggregations.resolveTargetMapping("min", "scaled_float"));
 
         // sum
         assertEquals("double", Aggregations.resolveTargetMapping("sum", "double"));