Changes to unmapped fields in metric aggregation factory

Signed-off-by: expani <anijainc@amazon.com>
opensearch-project · Oct 25, 2024 · 1f8dcc6 · 1f8dcc6
1 parent 936cdb9
commit 1f8dcc6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...java/org/opensearch/index/compositeindex/datacube/startree/utils/StarTreeQueryHelper.java b/...java/org/opensearch/index/compositeindex/datacube/startree/utils/StarTreeQueryHelper.java
@@ -152,7 +152,7 @@ private static MetricStat validateStarTreeMetricSupport(
             MetricStat metricStat = ((MetricAggregatorFactory) aggregatorFactory).getMetricStat();
             field = ((MetricAggregatorFactory) aggregatorFactory).getField();
 
-            if (supportedMetrics.containsKey(field) && supportedMetrics.get(field).contains(metricStat)) {
+            if (field != null && supportedMetrics.containsKey(field) && supportedMetrics.get(field).contains(metricStat)) {
                 return metricStat;
             }
         }

diff --git a/...c/main/java/org/opensearch/search/aggregations/support/ValuesSourceAggregatorFactory.java b/...c/main/java/org/opensearch/search/aggregations/support/ValuesSourceAggregatorFactory.java
@@ -104,6 +104,6 @@ public String getStatsSubtype() {
     }
 
     public String getField() {
-        return config.fieldContext().field();
+        return config.fieldContext() != null ? config.fieldContext().field() : null;
     }
 }