Skip to content

Fix SQL query routing to analytics engine #5453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
finnegancarroll wants to merge 1 commit into from
Closed

Fix SQL query routing to analytics engine #5453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions plugin/src/main/java/org/opensearch/sql/plugin/rest/RestUnifiedQueryAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@
import static org.opensearch.sql.opensearch.executor.OpenSearchQueryManager.SQL_WORKER_THREAD_POOL_NAME;
import static org.opensearch.sql.protocol.response.format.JsonResponseFormatter.Style.PRETTY;

import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import org.apache.calcite.rel.RelNode;
import org.apache.calcite.sql.SqlCall;
import org.apache.calcite.sql.SqlIdentifier;
import org.apache.calcite.sql.SqlJoin;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.SqlOrderBy;
import org.apache.calcite.sql.SqlSelect;
import org.apache.calcite.sql.parser.SqlParser;
import org.apache.calcite.sql.util.SqlBasicVisitor;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
Expand Down Expand Up @@ -214,13 +217,14 @@ private void forwardClusterSetting(
* node. Uses the context's parser which supports both PPL and SQL.
*/
private static Optional<String> extractIndexName(
String query, QueryType queryType, UnifiedQueryContext context) {
String query, QueryType queryType, UnifiedQueryContext context) throws Exception {
if (queryType == QueryType.PPL) {
UnresolvedPlan unresolvedPlan = (UnresolvedPlan) context.getParser().parse(query);
return Optional.ofNullable(unresolvedPlan.accept(new IndexNameExtractor(), null));
}
SqlNode sqlNode = (SqlNode) context.getParser().parse(query);
return Optional.ofNullable(extractTableNameFromSqlNode(sqlNode));
SqlNode sqlNode = SqlParser.create(query).parseQuery();
String tableName = extractTableNameFromSqlNode(sqlNode);
return Optional.ofNullable(tableName != null ? tableName.toLowerCase(Locale.ROOT) : null);
}

/** AST visitor that extracts the source index name from a Relation node (PPL path). */
Expand All @@ -235,6 +239,9 @@ public String visitRelation(Relation node, Void context) {
private static class SqlTableNameExtractor extends SqlBasicVisitor<String> {
@Override
public String visit(SqlCall call) {
if (call instanceof SqlOrderBy orderBy) {
return orderBy.query.accept(this);
}
if (call instanceof SqlSelect select) {
return select.getFrom().accept(this);
}
Expand Down
23 changes: 23 additions & 0 deletions plugin/src/test/java/org/opensearch/sql/plugin/rest/RestUnifiedQueryActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,29 @@ public void pluggableDataformatIndexRoutesToAnalytics() {
action.isAnalyticsIndex("source = opensearch.parquet_logs | fields ts", QueryType.PPL));
}

@Test
public void sqlQueryRoutesToAnalyticsForCompositeIndex() {
registerIndex(
"parquet_logs",
Settings.builder()
.put(IndexSettings.PLUGGABLE_DATAFORMAT_ENABLED_SETTING.getKey(), true)
.put(IndexSettings.PLUGGABLE_DATAFORMAT_VALUE_SETTING.getKey(), "composite")
.build());

assertTrue(action.isAnalyticsIndex("SELECT ts, msg FROM parquet_logs", QueryType.SQL));
assertTrue(action.isAnalyticsIndex("SELECT ts FROM parquet_logs LIMIT 10", QueryType.SQL));
assertTrue(
action.isAnalyticsIndex(
"SELECT score, name FROM parquet_logs WHERE score > 90", QueryType.SQL));
}

@Test
public void sqlQueryRoutesToLuceneForNonCompositeIndex() {
registerIndex("plain_logs", Settings.EMPTY);

assertFalse(action.isAnalyticsIndex("SELECT ts FROM plain_logs", QueryType.SQL));
}

@Test
public void pluggableEnabledButLuceneFormatRoutesToLucene() {
registerIndex(
Expand Down
Loading