Add query filter, project, aggregation, sort converters

Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>

Author: vinaykpud

sandbox/plugins/dsl-query-executor/src/internalClusterTest/java/org/opensearch/dsl/DslAggregationIT.java

@@ -0,0 +1,76 @@
+/*
+ * 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.dsl;
+
+import org.opensearch.search.aggregations.AggregationBuilders;
+import org.opensearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.opensearch.search.builder.SearchSourceBuilder;
+
+/**
+ * Integration tests for DSL aggregation conversion.
+ * Uses matchAllQuery; focus is on aggregation plan building.
+ */
+public class DslAggregationIT extends DslIntegTestBase {
+
+    public void testMetricOnly() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder()
+            .size(0)
+            .aggregation(AggregationBuilders.avg("avg_price").field("price"))
+        ));
+    }
+
+    public void testMultipleMetrics() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder()
+            .size(0)
+            .aggregation(AggregationBuilders.avg("avg_price").field("price"))
+            .aggregation(AggregationBuilders.sum("total_price").field("price"))
+            .aggregation(AggregationBuilders.min("min_price").field("price"))
+            .aggregation(AggregationBuilders.max("max_price").field("price"))
+        ));
+    }
+
+    public void testTermsBucket() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder()
+            .size(0)
+            .aggregation(new TermsAggregationBuilder("by_brand").field("brand"))
+        ));
+    }
+
+    public void testTermsBucketWithMetric() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder()
+            .size(0)
+            .aggregation(new TermsAggregationBuilder("by_brand").field("brand")
+                .subAggregation(AggregationBuilders.avg("avg_price").field("price")))
+        ));
+    }
+
+    public void testNestedBuckets() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder()
+            .size(0)
+            .aggregation(new TermsAggregationBuilder("by_brand").field("brand")
+                .subAggregation(AggregationBuilders.sum("total").field("price"))
+                .subAggregation(new TermsAggregationBuilder("by_name").field("name")
+                    .subAggregation(AggregationBuilders.avg("avg_price").field("price"))))
+        ));
+    }
+
+    public void testAggsWithHits() {
+        createTestIndex();
+        // size > 0 with aggs produces both HITS + AGGREGATION plans
+        assertOk(search(new SearchSourceBuilder()
+            .size(10)
+            .aggregation(AggregationBuilders.avg("avg_price").field("price"))
+        ));
+    }
+}

sandbox/plugins/dsl-query-executor/src/internalClusterTest/java/org/opensearch/dsl/DslIntegTestBase.java

@@ -0,0 +1,56 @@
+/*
+ * 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.dsl;
+
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.action.search.SearchResponse;
+import org.opensearch.analytics.AnalyticsPlugin;
+import org.opensearch.common.xcontent.XContentType;
+import org.opensearch.plugins.Plugin;
+import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.test.OpenSearchIntegTestCase;
+
+import java.util.Collection;
+import java.util.List;
+
+// TODO: once end-to-end execution returns real results, update ITs to verify
+//  actual hit count, field values, sort order, and aggregation buckets.
+/**
+ * Base class for DSL query executor integration tests.
+ * Provides shared index setup and search helper.
+ */
+@OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE, numDataNodes = 1)
+public abstract class DslIntegTestBase extends OpenSearchIntegTestCase {
+
+    protected static final String INDEX = "test-index";
+
+    @Override
+    protected Collection<Class<? extends Plugin>> nodePlugins() {
+        return List.of(AnalyticsPlugin.class, DslQueryExecutorPlugin.class);
+    }
+
+    protected void createTestIndex() {
+        createIndex(INDEX);
+        ensureGreen();
+        client().prepareIndex(INDEX)
+            .setId("1")
+            .setSource("{\"name\":\"laptop\",\"price\":1200,\"brand\":\"brandX\",\"rating\":4.5}", XContentType.JSON)
+            .get();
+        refresh(INDEX);
+    }
+
+    protected SearchResponse search(SearchSourceBuilder source) {
+        return client().search(new SearchRequest(INDEX).source(source)).actionGet();
+    }
+
+    protected void assertOk(SearchResponse response) {
+        assertNotNull(response);
+        assertEquals(200, response.status().getStatus());
+    }
+}

sandbox/plugins/dsl-query-executor/src/internalClusterTest/java/org/opensearch/dsl/DslProjectIT.java

@@ -0,0 +1,49 @@
+/*
+ * 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.dsl;
+
+import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.search.fetch.subphase.FetchSourceContext;
+
+/**
+ * Integration tests for DSL _source filtering (projection) conversion.
+ * Uses matchAllQuery; focus is on _source includes/excludes behavior.
+ */
+public class DslProjectIT extends DslIntegTestBase {
+
+    public void testNoSourceFiltering() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder()));
+    }
+
+    public void testIncludeSpecificFields() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().fetchSource(new String[]{"name", "price"}, null)));
+    }
+
+    public void testExcludeFields() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().fetchSource(new String[]{}, new String[]{"rating"})));
+    }
+
+    public void testSourceDisabled() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().fetchSource(false)));
+    }
+
+    public void testWildcardIncludes() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().fetchSource(new String[]{"na*"}, null)));
+    }
+
+    public void testWildcardExcludes() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().fetchSource(new String[]{}, new String[]{"ra*"})));
+    }
+}

sandbox/plugins/dsl-query-executor/src/internalClusterTest/java/org/opensearch/dsl/DslQueryIT.java

@@ -0,0 +1,57 @@
+/*
+ * 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.dsl;
+
+import org.opensearch.action.search.SearchRequest;
+import org.opensearch.index.query.QueryBuilders;
+import org.opensearch.search.builder.SearchSourceBuilder;
+
+/**
+ * Integration tests for DSL query conversion (filter path).
+ * Uses various query types; sort and projection use defaults.
+ */
+public class DslQueryIT extends DslIntegTestBase {
+
+    public void testNoQuery() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder()));
+    }
+
+    public void testMatchAll() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().query(QueryBuilders.matchAllQuery())));
+    }
+
+    public void testTermQuery() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().query(QueryBuilders.termQuery("name", "laptop"))));
+    }
+
+    public void testWildcardQueryWithUnresolvedNode() {
+        createTestIndex();
+        // Wildcard query is not converted to standard Rex — wraps in UnresolvedQueryCall.
+        assertOk(search(new SearchSourceBuilder().query(QueryBuilders.wildcardQuery("name", "lap*"))));
+    }
+
+    public void testFailsForNonexistentIndex() {
+        expectThrows(Exception.class, () ->
+            client().search(new SearchRequest("nonexistent-index").source(new SearchSourceBuilder())).actionGet()
+        );
+    }
+
+    public void testFailsForMultipleIndices() {
+        createTestIndex();
+        createIndex("test-index-2");
+        ensureGreen();
+
+        expectThrows(Exception.class, () ->
+            client().search(new SearchRequest(INDEX, "test-index-2").source(new SearchSourceBuilder())).actionGet()
+        );
+    }
+}

sandbox/plugins/dsl-query-executor/src/internalClusterTest/java/org/opensearch/dsl/DslSortIT.java

@@ -0,0 +1,58 @@
+/*
+ * 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.dsl;
+
+import org.opensearch.search.builder.SearchSourceBuilder;
+import org.opensearch.search.sort.SortOrder;
+
+/**
+ * Integration tests for DSL sort and pagination conversion.
+ * Uses matchAllQuery; focus is on sort/from/size behavior.
+ */
+public class DslSortIT extends DslIntegTestBase {
+
+    public void testDefaultPagination() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder()));
+    }
+
+    public void testSortAscending() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().sort("name", SortOrder.ASC)));
+    }
+
+    public void testSortDescending() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().sort("price", SortOrder.DESC)));
+    }
+
+    public void testMultipleSortFields() {
+        createTestIndex();
+        assertOk(search(
+            new SearchSourceBuilder()
+                .sort("brand", SortOrder.ASC)
+                .sort("price", SortOrder.DESC)
+        ));
+    }
+
+    public void testCustomSize() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().size(5)));
+    }
+
+    public void testFromAndSize() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().from(0).size(5)));
+    }
+
+    public void testFromOffset() {
+        createTestIndex();
+        assertOk(search(new SearchSourceBuilder().from(10).size(5)));
+    }
+}

sandbox/plugins/dsl-query-executor/src/main/java/org/opensearch/dsl/aggregation/AggregationMetadata.java

@@ -0,0 +1,69 @@
+/*
+ * 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.dsl.aggregation;
+
+import org.apache.calcite.rel.core.AggregateCall;
+import org.apache.calcite.util.ImmutableBitSet;
+
+import java.util.List;
+
+/**
+ * Pre-computed metadata for one aggregation granularity level.
+ * Contains everything needed to build a single {@code LogicalAggregate}.
+ *
+ * <p>A multi-level aggregation tree (e.g., terms → terms → avg) produces
+ * multiple metadata instances — one per distinct GROUP BY key set.
+ */
+public class AggregationMetadata {
+
+    private final ImmutableBitSet groupByBitSet;
+    private final List<String> groupByFieldNames;
+    private final List<AggregateCall> aggregateCalls;
+    private final List<String> aggregateFieldNames;
+
+    /**
+     * Creates aggregation metadata.
+     *
+     * @param groupByBitSet column indices for GROUP BY
+     * @param groupByFieldNames field names for GROUP BY columns
+     * @param aggregateCalls Calcite aggregate calls (AVG, SUM, etc.)
+     * @param aggregateFieldNames output names for aggregate results
+     */
+    public AggregationMetadata(
+        ImmutableBitSet groupByBitSet,
+        List<String> groupByFieldNames,
+        List<AggregateCall> aggregateCalls,
+        List<String> aggregateFieldNames
+    ) {
+        this.groupByBitSet = groupByBitSet;
+        this.groupByFieldNames = List.copyOf(groupByFieldNames);
+        this.aggregateCalls = List.copyOf(aggregateCalls);
+        this.aggregateFieldNames = List.copyOf(aggregateFieldNames);
+    }
+
+    /** Returns the GROUP BY column indices. */
+    public ImmutableBitSet getGroupByBitSet() {
+        return groupByBitSet;
+    }
+
+    /** Returns the GROUP BY field names. */
+    public List<String> getGroupByFieldNames() {
+        return groupByFieldNames;
+    }
+
+    /** Returns the aggregate calls. */
+    public List<AggregateCall> getAggregateCalls() {
+        return aggregateCalls;
+    }
+
+    /** Returns the output field names for aggregate results. */
+    public List<String> getAggregateFieldNames() {
+        return aggregateFieldNames;
+    }
+}