[Star Tree] Support of Boolean Queries in Aggregations

CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Unset discovery nodes for every transport node actions request ([#17682](https://github.com/opensearch-project/OpenSearch/pull/17682))
 - Implement parallel shard refresh behind cluster settings ([#17782](https://github.com/opensearch-project/OpenSearch/pull/17782))
 - Bump OpenSearch Core main branch to 3.0.0 ([#18039](https://github.com/opensearch-project/OpenSearch/pull/18039))
+- [Star Tree] Support of Boolean Queries in Aggregations ([#17941](https://github.com/opensearch-project/OpenSearch/pull/17941))
 - Update API of Message in index to add the timestamp for lag calculation in ingestion polling ([#17977](https://github.com/opensearch-project/OpenSearch/pull/17977/))
 - Enabled default throttling for all tasks submitted to cluster manager ([#17711](https://github.com/opensearch-project/OpenSearch/pull/17711))
 

server/src/main/java/org/opensearch/search/startree/filter/DimensionFilter.java

@@ -74,6 +74,10 @@
      */
     boolean matchDimValue(long ordinal, StarTreeValues starTreeValues);
 
+    default String getDimensionName() {
+        return null;
+    }
+
     /**
      * Represents how to match a value when comparing during StarTreeTraversal
      */

server/src/main/java/org/opensearch/search/startree/filter/DimensionFilterMergerUtils.java

@@ -0,0 +1,191 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ */
+
+package org.opensearch.search.startree.filter;
+
+import org.opensearch.search.startree.filter.provider.DimensionFilterMapper;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Utility class for merging different types of {@link DimensionFilter}
+ * Handles intersection operations between {@link ExactMatchDimFilter} and {@link RangeMatchDimFilter}
+ */
+public class DimensionFilterMergerUtils {
+
+    /**
+     * Gets intersection of two DimensionFilters
+     * Returns null if intersection results in no possible matches.
+     */
+    public static DimensionFilter intersect(DimensionFilter filter1, DimensionFilter filter2, DimensionFilterMapper mapper) {
+        if (filter1 == null || filter2 == null) {
+            return null;
+        }
+
+        if (filter1.getDimensionName() == null || filter2.getDimensionName() == null) {
+            throw new IllegalArgumentException("Cannot intersect filters with null dimension name");
+        }
+
+        // Verify filters are for same dimension
+        if (!filter1.getDimensionName().equals(filter2.getDimensionName())) {
+            throw new IllegalArgumentException(
+                "Cannot intersect filters for different dimensions: " + filter1.getDimensionName() + " and " + filter2.getDimensionName()
+            );
+        }
+
+        // Handle Range + Range combination
+        if (filter1 instanceof RangeMatchDimFilter && filter2 instanceof RangeMatchDimFilter) {
+            return intersectRangeFilters((RangeMatchDimFilter) filter1, (RangeMatchDimFilter) filter2, mapper);
+        }
+
+        // Handle ExactMatch + ExactMatch combination
+        if (filter1 instanceof ExactMatchDimFilter && filter2 instanceof ExactMatchDimFilter) {
+            return intersectExactMatchFilters((ExactMatchDimFilter) filter1, (ExactMatchDimFilter) filter2);
+        }
+
+        // Handle Range + ExactMatch combination
+        if (filter1 instanceof RangeMatchDimFilter && filter2 instanceof ExactMatchDimFilter) {
+            return intersectRangeWithExactMatch((RangeMatchDimFilter) filter1, (ExactMatchDimFilter) filter2, mapper);
+        }
+
+        // Handle ExactMatch + Range combination
+        if (filter1 instanceof ExactMatchDimFilter && filter2 instanceof RangeMatchDimFilter) {
+            return intersectRangeWithExactMatch((RangeMatchDimFilter) filter2, (ExactMatchDimFilter) filter1, mapper);
+        }
+
+        // throw exception for unsupported exception
+        throw new IllegalArgumentException(
+            "Unsupported filter combination: " + filter1.getClass().getSimpleName() + " and " + filter2.getClass().getSimpleName()
+        );
+    }
+
+    /**
+     * Intersects two range filters
+     * Returns null if ranges don't overlap
+     */
+    private static DimensionFilter intersectRangeFilters(
+        RangeMatchDimFilter range1,
+        RangeMatchDimFilter range2,
+        DimensionFilterMapper mapper
+    ) {
+        Object low1 = range1.getLow();
+        Object high1 = range1.getHigh();
+        Object low2 = range2.getLow();
+        Object high2 = range2.getHigh();
+
+        // Find the more restrictive bounds
+        Object newLow;
+        boolean includeLow;
+        if (low1 == null) {
+            newLow = low2;
+            includeLow = range2.isIncludeLow();
+        } else if (low2 == null) {
+            newLow = low1;
+            includeLow = range1.isIncludeLow();
+        } else {
+            int comparison = mapper.compareValues(low1, low2);
+            if (comparison > 0) {
+                newLow = low1;
+                includeLow = range1.isIncludeLow();
+            } else if (comparison < 0) {
+                newLow = low2;
+                includeLow = range2.isIncludeLow();
+            } else {
+                newLow = low1;
+                includeLow = range1.isIncludeLow() && range2.isIncludeLow();
+            }
+        }
+
+        Object newHigh;
+        boolean includeHigh;
+        if (high1 == null) {
+            newHigh = high2;
+            includeHigh = range2.isIncludeHigh();
+        } else if (high2 == null) {
+            newHigh = high1;
+            includeHigh = range1.isIncludeHigh();
+        } else {
+            int comparison = mapper.compareValues(high1, high2);
+            if (comparison < 0) {
+                newHigh = high1;
+                includeHigh = range1.isIncludeHigh();
+            } else if (comparison > 0) {
+                newHigh = high2;
+                includeHigh = range2.isIncludeHigh();
+            } else {
+                newHigh = high1;
+                includeHigh = range1.isIncludeHigh() && range2.isIncludeHigh();
+            }
+        }
+
+        // Check if range is valid
+        if (newLow != null && newHigh != null) {
+            if (!mapper.isValidRange(newLow, newHigh, includeLow, includeHigh)) {
+                return null; // No overlap
+            }
+        }
+
+        return new RangeMatchDimFilter(range1.getDimensionName(), newLow, newHigh, includeLow, includeHigh);
+    }
+
+    /**
+     * Intersects two exact match filters
+     * Returns null if no common values
+     */
+    private static DimensionFilter intersectExactMatchFilters(ExactMatchDimFilter exact1, ExactMatchDimFilter exact2) {
+        List<Object> values1 = exact1.getRawValues();
+        Set<Object> values2Set = new HashSet<>(exact2.getRawValues());
+
+        List<Object> intersection = new ArrayList<>();
+        for (Object value : values1) {
+            if (values2Set.contains(value)) {
+                intersection.add(value);
+            }
+        }
+
+        if (intersection.isEmpty()) {
+            return null;
+        }
+
+        return new ExactMatchDimFilter(exact1.getDimensionName(), intersection);
+    }
+
+    /**
+     * Intersects a range filter with an exact match filter.
+     * Returns null if no values from exact match are within range.
+     */
+    private static DimensionFilter intersectRangeWithExactMatch(
+        RangeMatchDimFilter range,
+        ExactMatchDimFilter exact,
+        DimensionFilterMapper mapper
+    ) {
+        List<Object> validValues = new ArrayList<>();
+
+        for (Object value : exact.getRawValues()) {
+            if (isValueInRange(value, range, mapper)) {
+                validValues.add(value);
+            }
+        }
+
+        if (validValues.isEmpty()) {
+            return null;
+        }
+
+        return new ExactMatchDimFilter(exact.getDimensionName(), validValues);
+    }
+
+    /**
+     * Checks if a value falls within a range.
+     */
+    private static boolean isValueInRange(Object value, RangeMatchDimFilter range, DimensionFilterMapper mapper) {
+        return mapper.isValueInRange(value, range.getLow(), range.getHigh(), range.isIncludeLow(), range.isIncludeHigh());
+    }
+}

server/src/main/java/org/opensearch/search/startree/filter/ExactMatchDimFilter.java

@@ -84,4 +84,13 @@ public void matchStarTreeNodes(StarTreeNode parentNode, StarTreeValues starTreeV
     public boolean matchDimValue(long ordinal, StarTreeValues starTreeValues) {
         return convertedOrdinals.contains(ordinal);
     }
+
+    public List<Object> getRawValues() {
+        return rawValues;
+    }
+
+    @Override
+    public String getDimensionName() {
+        return dimensionName;
+    }
 }

server/src/main/java/org/opensearch/search/startree/filter/MatchNoneFilter.java

@@ -19,6 +19,7 @@
  */
 @ExperimentalApi
 public class MatchNoneFilter implements DimensionFilter {
+
     @Override
     public void initialiseForSegment(StarTreeValues starTreeValues, SearchContext searchContext) {
         // Nothing to do as we won't match anything.

server/src/main/java/org/opensearch/search/startree/filter/RangeMatchDimFilter.java

@@ -26,7 +26,6 @@
 public class RangeMatchDimFilter implements DimensionFilter {
 
     private final String dimensionName;
-
     private final Object low;
     private final Object high;
     private final boolean includeLow;
@@ -35,6 +34,7 @@ public class RangeMatchDimFilter implements DimensionFilter {
     private Long lowOrdinal;
     private Long highOrdinal;
 
+    // TODO - see if we need to handle this while intersecting
     private boolean skipRangeCollection = false;
 
     private DimensionFilterMapper dimensionFilterMapper;
@@ -90,4 +90,25 @@ public boolean matchDimValue(long ordinal, StarTreeValues starTreeValues) {
             && dimensionFilterMapper.comparator().compare(ordinal, highOrdinal) <= 0;
     }
 
+    @Override
+    public String getDimensionName() {
+        return dimensionName;
+    }
+
+    public Object getLow() {
+        return low;
+    }
+
+    public Object getHigh() {
+        return high;
+    }
+
+    public boolean isIncludeLow() {
+        return includeLow;
+    }
+
+    public boolean isIncludeHigh() {
+        return includeHigh;
+    }
+
 }