Skip to content

Route analytics queries by index setting #5432

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

Merged
ahkcs merged 1 commit into from
May 11, 2026
+4 −4
Merged

Route analytics queries by index setting #5432

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
4 changes: 2 additions & 2 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 @@ -76,7 +76,7 @@ public RestUnifiedQueryAction(
/**
* Returns true iff the target index has {@link
* IndexSettings#PLUGGABLE_DATAFORMAT_ENABLED_SETTING} set and {@link
* IndexSettings#PLUGGABLE_DATAFORMAT_VALUE_SETTING} is {@code "parquet"}, routing it to
* IndexSettings#PLUGGABLE_DATAFORMAT_VALUE_SETTING} is {@code "composite"}, routing it to
* DataFusion instead of the Calcite→DSL path.
*
* <p>Note: This creates a separate UnifiedQueryContext for parsing. The context cannot be shared
Expand Down Expand Up @@ -110,7 +110,7 @@ private boolean isPluggableDataformatIndex(String indexName) {
}
var settings = indexMetadata.getSettings();
return IndexSettings.PLUGGABLE_DATAFORMAT_ENABLED_SETTING.get(settings)
&& "parquet".equals(IndexSettings.PLUGGABLE_DATAFORMAT_VALUE_SETTING.get(settings));
&& "composite".equals(IndexSettings.PLUGGABLE_DATAFORMAT_VALUE_SETTING.get(settings));
}

/** Execute a query through the unified query pipeline on the sql-worker thread pool. */
Expand Down
4 changes: 2 additions & 2 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 @@ -25,7 +25,7 @@

/**
* Tests for analytics index routing in RestUnifiedQueryAction. Routing requires both {@code
* index.pluggable.dataformat.enabled=true} and {@code index.pluggable.dataformat=parquet}.
* index.pluggable.dataformat.enabled=true} and {@code index.pluggable.dataformat=composite}.
*/
public class RestUnifiedQueryActionTest {

Expand Down Expand Up @@ -57,7 +57,7 @@ public void pluggableDataformatIndexRoutesToAnalytics() {
"parquet_logs",
Settings.builder()
.put(IndexSettings.PLUGGABLE_DATAFORMAT_ENABLED_SETTING.getKey(), true)
.put(IndexSettings.PLUGGABLE_DATAFORMAT_VALUE_SETTING.getKey(), "parquet")
.put(IndexSettings.PLUGGABLE_DATAFORMAT_VALUE_SETTING.getKey(), "composite")
.build());

assertTrue(action.isAnalyticsIndex("source = parquet_logs | fields ts", QueryType.PPL));
Expand Down
Loading