accommodate geo distance agg

Signed-off-by: bowenlan-amzn <[email protected]>
opensearch-project · May 29, 2024 · c7043e4 · c7043e4
1 parent ed79e02
commit c7043e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...n/java/org/opensearch/search/aggregations/bucket/range/GeoDistanceAggregatorSupplier.java b/...n/java/org/opensearch/search/aggregations/bucket/range/GeoDistanceAggregatorSupplier.java
@@ -39,6 +39,7 @@
 import org.opensearch.search.aggregations.AggregatorFactories;
 import org.opensearch.search.aggregations.CardinalityUpperBound;
 import org.opensearch.search.aggregations.support.ValuesSource;
+import org.opensearch.search.aggregations.support.ValuesSourceConfig;
 import org.opensearch.search.internal.SearchContext;
 
 import java.io.IOException;
@@ -64,6 +65,7 @@ Aggregator build(
         SearchContext context,
         Aggregator parent,
         CardinalityUpperBound cardinality,
-        Map<String, Object> metadata
+        Map<String, Object> metadata,
+        ValuesSourceConfig valuesSourceConfig
     ) throws IOException;
 }
diff --git a/...va/org/opensearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java b/...va/org/opensearch/search/aggregations/bucket/range/GeoDistanceRangeAggregatorFactory.java
@@ -82,7 +82,8 @@ public static void registerAggregators(ValuesSourceRegistry.Builder builder) {
                 context,
                 parent,
                 cardinality,
-                metadata) -> {
+                metadata,
+                config) -> {
                 DistanceSource distanceSource = new DistanceSource((ValuesSource.GeoPoint) valuesSource, distanceType, origin, units);
                 return new RangeAggregator(
                     name,
@@ -96,7 +97,7 @@ public static void registerAggregators(ValuesSourceRegistry.Builder builder) {
                     parent,
                     cardinality,
                     metadata,
-                    null
+                    config
                 );
             },
             true
@@ -169,7 +170,8 @@ protected Aggregator doCreateInternal(
                 searchContext,
                 parent,
                 cardinality,
-                metadata
+                metadata,
+                config
             );
     }