Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions api/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Unified Query API

This module provides a high-level integration layer for the Calcite-based query engine, enabling external systems such as Apache Spark or command-line tools to parse and analyze queries without exposing low-level internals.

## Overview

The `UnifiedQueryPlanner` serves as the primary entry point for external consumers. It accepts PPL (Piped Processing Language) queries and returns Calcite `RelNode` logical plans as intermediate representation.

## Usage

Use the declarative, fluent builder API to initialize the `UnifiedQueryPlanner`.

```java
UnifiedQueryPlanner planner = UnifiedQueryPlanner.builder()
.language(QueryType.PPL)
.catalog("opensearch", schema)
.defaultNamespace("opensearch")
.cacheMetadata(true)
.build();

RelNode plan = planner.plan("source = opensearch.test");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does one execute the plan after they receive it?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. Currently, the plan isn’t directly executable. As noted in the README, the planner is designed to eventually return an executable plan—either a Calcite physical plan for immediate execution in the current JVM (useful for the OpenSearch plugin and CLI), or a SparkSQL plan for distributed execution by Spark (useful for PPL in Spark).

I initially considered designing the API this way, but haven’t yet found a clean way to model everything within Calcite’s optimizer. I plan to work on this later, especially since PPL in Spark Phase 2 may require it.

```

## Development & Testing

A set of unit tests is provided to validate planner behavior.

To run tests:

```
./gradlew :api:test
```

## Integration Guide

This guide walks through how to integrate unified query planner into your application.

### Step 1: Add Dependency

The module is currently published as a snapshot to the AWS Sonatype Snapshots repository. To include it as a dependency in your project, add the following to your `pom.xml` or `build.gradle`:

```xml
<dependency>
<groupId>org.opensearch.query</groupId>
<artifactId>unified-query-api</artifactId>
<version>YOUR_VERSION_HERE</version>
</dependency>
```

### Step 2: Implement a Calcite Schema

You must implement the Calcite `Schema` interface and register them using the fluent `catalog()` method on the builder.

```java
public class MySchema extends AbstractSchema {
@Override
protected Map<String, Table> getTableMap() {
return Map.of(
"test_table",
new AbstractTable() {
@Override
public RelDataType getRowType(RelDataTypeFactory typeFactory) {
return typeFactory.createStructType(
List.of(typeFactory.createSqlType(SqlTypeName.INTEGER)),
List.of("id"));
}
});
}
}
```

## Future Work

- Expand support to SQL language.
- Extend planner to generate optimized physical plans using Calcite's optimization frameworks.
71 changes: 71 additions & 0 deletions api/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

plugins {
id 'java-library'
id 'jacoco'
id 'com.diffplug.spotless' version '6.22.0'
}

dependencies {
api project(':ppl')

testImplementation group: 'junit', name: 'junit', version: '4.13.2'
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version: "${hamcrest_version}"
testImplementation group: 'org.mockito', name: 'mockito-core', version: "${mockito_version}"
testImplementation group: 'org.apache.calcite', name: 'calcite-testkit', version: '1.38.0'
}

spotless {
java {
target fileTree('.') {
include '**/*.java'
exclude '**/build/**', '**/build-*/**', 'src/main/gen/**'
}
importOrder()
removeUnusedImports()
trimTrailingWhitespace()
endWithNewline()
googleJavaFormat('1.17.0').reflowLongStrings().groupArtifact('com.google.googlejavaformat:google-java-format')
}
}

test {
testLogging {
events "passed", "skipped", "failed"
exceptionFormat "full"
}
}

jacocoTestReport {
reports {
html.required = true
xml.required = true
}
afterEvaluate {
classDirectories.setFrom(files(classDirectories.files.collect {
fileTree(dir: it,
exclude: ['**/antlr/parser/**'])
}))
}
}
test.finalizedBy(project.tasks.jacocoTestReport)
jacocoTestCoverageVerification {
violationRules {
rule {
limit {
minimum = 0.9
}

}
}
afterEvaluate {
classDirectories.setFrom(files(classDirectories.files.collect {
fileTree(dir: it,
exclude: ['**/antlr/parser/**'])
}))
}
}
check.dependsOn jacocoTestCoverageVerification
224 changes: 224 additions & 0 deletions api/src/main/java/org/opensearch/sql/api/UnifiedQueryPlanner.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

package org.opensearch.sql.api;

import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import org.antlr.v4.runtime.tree.ParseTree;
import org.apache.calcite.jdbc.CalciteSchema;
import org.apache.calcite.plan.RelTraitDef;
import org.apache.calcite.rel.RelCollation;
import org.apache.calcite.rel.RelCollations;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.rel.core.Sort;
import org.apache.calcite.rel.logical.LogicalSort;
import org.apache.calcite.rel.metadata.DefaultRelMetadataProvider;
import org.apache.calcite.schema.Schema;
import org.apache.calcite.schema.SchemaPlus;
import org.apache.calcite.sql.parser.SqlParser;
import org.apache.calcite.tools.FrameworkConfig;
import org.apache.calcite.tools.Frameworks;
import org.apache.calcite.tools.Programs;
import org.opensearch.sql.ast.statement.Query;
import org.opensearch.sql.ast.statement.Statement;
import org.opensearch.sql.ast.tree.UnresolvedPlan;
import org.opensearch.sql.calcite.CalcitePlanContext;
import org.opensearch.sql.calcite.CalciteRelNodeVisitor;
import org.opensearch.sql.common.antlr.Parser;
import org.opensearch.sql.common.antlr.SyntaxCheckException;
import org.opensearch.sql.executor.QueryType;
import org.opensearch.sql.ppl.antlr.PPLSyntaxParser;
import org.opensearch.sql.ppl.parser.AstBuilder;
import org.opensearch.sql.ppl.parser.AstStatementBuilder;

/**
* {@code UnifiedQueryPlanner} provides a high-level API for parsing and analyzing queries using the
* Calcite-based query engine. It serves as the primary integration point for external consumers
* such as Spark or command-line tools, abstracting away Calcite internals.
*/
public class UnifiedQueryPlanner {
/** The type of query language being used (e.g., PPL). */
private final QueryType queryType;

/** The parser instance responsible for converting query text into a parse tree. */
private final Parser parser;

/** Calcite framework configuration used during logical plan construction. */
private final FrameworkConfig config;

/** AST-to-RelNode visitor that builds logical plans from the parsed AST. */
private final CalciteRelNodeVisitor relNodeVisitor = new CalciteRelNodeVisitor();

/**
* Constructs a UnifiedQueryPlanner for a given query type and schema root.
*
* @param queryType the query language type (e.g., PPL)
* @param rootSchema the root Calcite schema containing all catalogs and tables
* @param defaultPath dot-separated path of schema to set as default schema
*/
public UnifiedQueryPlanner(QueryType queryType, SchemaPlus rootSchema, String defaultPath) {
this.queryType = queryType;
this.parser = buildQueryParser(queryType);
this.config = buildCalciteConfig(rootSchema, defaultPath);
}

/**
* Parses and analyzes a query string into a Calcite logical plan (RelNode). TODO: Generate
* optimal physical plan to fully unify query execution and leverage Calcite's optimizer.
*
* @param query the raw query string in PPL or other supported syntax
* @return a logical plan representing the query
*/
public RelNode plan(String query) {
try {
return preserveCollation(analyze(parse(query)));
} catch (SyntaxCheckException e) {
// Re-throw syntax error without wrapping
throw e;
} catch (Exception e) {
throw new IllegalStateException("Failed to plan query", e);
}
}

private Parser buildQueryParser(QueryType queryType) {
if (queryType == QueryType.PPL) {
return new PPLSyntaxParser();
}
throw new IllegalArgumentException("Unsupported query type: " + queryType);
}

private FrameworkConfig buildCalciteConfig(SchemaPlus rootSchema, String defaultPath) {
SchemaPlus defaultSchema = findSchemaByPath(rootSchema, defaultPath);
return Frameworks.newConfigBuilder()
.parserConfig(SqlParser.Config.DEFAULT)
.defaultSchema(defaultSchema)
.traitDefs((List<RelTraitDef>) null)
.programs(Programs.calc(DefaultRelMetadataProvider.INSTANCE))
.build();
}

private static SchemaPlus findSchemaByPath(SchemaPlus rootSchema, String defaultPath) {
if (defaultPath == null) {
return rootSchema;
}

// Find schema by the path recursively
SchemaPlus current = rootSchema;
for (String part : defaultPath.split("\\.")) {
current = current.getSubSchema(part);
if (current == null) {
throw new IllegalArgumentException("Invalid default catalog path: " + defaultPath);
}
}
return current;
}

private UnresolvedPlan parse(String query) {
ParseTree cst = parser.parse(query);
AstStatementBuilder astStmtBuilder =
new AstStatementBuilder(
new AstBuilder(query), AstStatementBuilder.StatementBuilderContext.builder().build());
Statement statement = cst.accept(astStmtBuilder);

if (statement instanceof Query) {
return ((Query) statement).getPlan();
}
throw new UnsupportedOperationException(
"Only query statements are supported but got " + statement.getClass().getSimpleName());
}

private RelNode analyze(UnresolvedPlan ast) {
// TODO: Hardcoded query size limit (10000) for now as only logical plan is generated.
CalcitePlanContext calcitePlanContext = CalcitePlanContext.create(config, 10000, queryType);
return relNodeVisitor.analyze(ast, calcitePlanContext);
}

private RelNode preserveCollation(RelNode logical) {
RelNode calcitePlan = logical;
RelCollation collation = logical.getTraitSet().getCollation();
if (!(logical instanceof Sort) && collation != RelCollations.EMPTY) {
calcitePlan = LogicalSort.create(logical, collation, null, null);
}
return calcitePlan;
}

/** Builder for {@link UnifiedQueryPlanner}, supporting declarative fluent API. */
public static Builder builder() {
return new Builder();
}

/**
* Builder for {@link UnifiedQueryPlanner}, supporting both declarative and dynamic schema
* registration for use in query planning.
*/
public static class Builder {
private final Map<String, Schema> catalogs = new HashMap<>();
private String defaultNamespace;
private QueryType queryType;
private boolean cacheMetadata;

/**
* Sets the query language frontend to be used by the planner.
*
* @param queryType the {@link QueryType}, such as PPL
* @return this builder instance
*/
public Builder language(QueryType queryType) {
this.queryType = queryType;
return this;
}

/**
* Registers a catalog with the specified name and its associated schema. The schema can be a
* flat or nested structure (e.g., catalog → schema → table), depending on how data is
* organized.
*
* @param name the name of the catalog to register
* @param schema the schema representing the structure of the catalog
* @return this builder instance
*/
public Builder catalog(String name, Schema schema) {
catalogs.put(name, schema);
return this;
}

/**
* Sets the default namespace path for resolving unqualified table names.
*
* @param namespace dot-separated path (e.g., "spark_catalog.default" or "opensearch")
* @return this builder instance
*/
public Builder defaultNamespace(String namespace) {
this.defaultNamespace = namespace;
return this;
}

/**
* Enables or disables catalog metadata caching in the root schema.
*
* @param cache whether to enable metadata caching
* @return this builder instance
*/
public Builder cacheMetadata(boolean cache) {
this.cacheMetadata = cache;
return this;
}

/**
* Builds a {@link UnifiedQueryPlanner} with the configuration.
*
* @return a new instance of {@link UnifiedQueryPlanner}
*/
public UnifiedQueryPlanner build() {
Objects.requireNonNull(queryType, "Must specify language before build");
SchemaPlus rootSchema = CalciteSchema.createRootSchema(true, cacheMetadata).plus();
catalogs.forEach(rootSchema::add);
return new UnifiedQueryPlanner(queryType, rootSchema, defaultNamespace);
}
}
}
Loading
Loading