Route analytics queries by index setting

[bowenlan-amzn]

Summary

• Route queries to the analytics engine based on index settings instead of table-name prefix convention
• Check both index.pluggable.dataformat.enabled=true AND index.pluggable.dataformat=composite before routing to the analytics path
• If pluggable dataformat is enabled but the value is not composite (e.g. lucene), fall through to the standard Calcite→DSL path
• Add pluginSettings to RestUnifiedQueryAction to support cluster-level setting overrides (rex max_match limit)

Test plan

• Unit tests for routing logic (RestUnifiedQueryActionTest)
  • Composite format routes to analytics
  • Lucene format routes to old path
  • Missing index routes to old path
  • Null/empty queries route to old path

[github-actions]

PR Reviewer Guide 🔍

(Review updated until commit 28ac22a)

Here are some key observations to aid the review process:

🧪 PR contains tests

🔒 No security concerns identified

✅ No TODO sections

🔀 No multiple PR themes

⚡ Recommended focus areas for review Misleading test name The test pluggableDataformatIndexRoutesToAnalytics registers an index named parquet_logs but now sets the dataformat to composite. This creates confusion between the index name and its actual format, potentially misleading future maintainers about what the test validates. public void pluggableDataformatIndexRoutesToAnalytics() { registerIndex( "parquet_logs", Settings.builder() .put(IndexSettings.PLUGGABLE_DATAFORMAT_ENABLED_SETTING.getKey(), true) .put(IndexSettings.PLUGGABLE_DATAFORMAT_VALUE_SETTING.getKey(), "composite") .build());

[github-actions]

PR Code Suggestions ✨

Latest suggestions up to 28ac22a
Explore these optional code suggestions:

Category	Suggestion	Impact
General	Update test index name for clarity The test index name parquet_logs is misleading since the dataformat value has been changed from "parquet" to "composite". Consider renaming the index to reflect the actual dataformat being tested, such as composite_logs, to maintain consistency and avoid confusion. plugin/src/test/java/org/opensearch/sql/plugin/rest/RestUnifiedQueryActionTest.java [56-61] registerIndex( - "parquet_logs", + "composite_logs", Settings.builder() .put(IndexSettings.PLUGGABLE_DATAFORMAT_ENABLED_SETTING.getKey(), true) .put(IndexSettings.PLUGGABLE_DATAFORMAT_VALUE_SETTING.getKey(), "composite") .build()); Suggestion importance[1-10]: 7 __ Why: The suggestion correctly identifies that the test index name parquet_logs is now misleading after changing the dataformat value from "parquet" to "composite". Renaming to composite_logs would improve code clarity and maintainability, though this is not a critical functional issue.	Medium

---

Previous suggestions

Suggestions up to commit d504f77

Category	Suggestion	Impact
General	Replace hardcoded string with constant The hardcoded string "composite" should be replaced with a constant to prevent typos and improve maintainability. Consider defining a constant like COMPOSITE_FORMAT or using an existing constant if available in IndexSettings. plugin/src/main/java/org/opensearch/sql/plugin/rest/RestUnifiedQueryAction.java [106-114] +private static final String COMPOSITE_FORMAT = "composite"; + private boolean isPluggableDataformatIndex(String indexName) { var indexMetadata = clusterService.state().metadata().index(indexName); if (indexMetadata == null) { return false; } var settings = indexMetadata.getSettings(); return IndexSettings.PLUGGABLE_DATAFORMAT_ENABLED_SETTING.get(settings) - && "composite".equals(IndexSettings.PLUGGABLE_DATAFORMAT_VALUE_SETTING.get(settings)); + && COMPOSITE_FORMAT.equals(IndexSettings.PLUGGABLE_DATAFORMAT_VALUE_SETTING.get(settings)); } Suggestion importance[1-10]: 5 __ Why: While replacing the hardcoded "composite" string with a constant improves maintainability and reduces typo risk, this is a minor code quality improvement. The suggestion is valid and follows best practices, but has moderate impact.	Low

[github-actions]

Persistent review updated to latest commit 28ac22a