New added commands should throw exception when calcite disabled #3571

LantaoJin · 2025-04-22T07:08:15Z

Description

New added commands should throw exception when calcite disabled

Related Issues

Check List

New functionality includes testing.
New functionality has been documented.
New functionality has javadoc added.
New functionality has a user manual doc added.
API changes companion pull request created.
Commits are signed per the DCO using --signoff.
Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Lantao Jin <[email protected]>

qianheng-aws · 2025-04-22T09:09:04Z

If customer set calcite and fallback both enabled, and submit an incorrect query with new commands, it seems will return error "xxx is supported only when plugins.calcite.enabled=true" as it will always fallback to v2.

But the expected error message should be the exception message thrown by calcite.

qianheng-aws · 2025-04-22T09:09:57Z

integ-test/src/test/java/org/opensearch/sql/ppl/PPLIntegTestCase.java

-  protected static boolean isFallbackEnabled() throws IOException {
-    return Boolean.parseBoolean(
-        getClusterSetting(Settings.Key.CALCITE_FALLBACK_ALLOWED.getKeyValue(), "persistent"));
+  protected static boolean isFallbackEnabled() {


Just curious, what's the concern of changing IOException to RuntimeException.

qianheng-aws · 2025-04-22T09:22:23Z

If customer set calcite and fallback both enabled, and submit an incorrect query with new commands, it seems will return error "xxx is supported only when plugins.calcite.enabled=true" as it will always fallback to v2.

But the expected error message should be the exception message thrown by calcite.

Maybe we should show Calcite's error message, if fallback to v2 also ends with failure.

Signed-off-by: Lantao Jin <[email protected]>

LantaoJin · 2025-04-22T12:39:54Z

If customer set calcite and fallback both enabled, and submit an incorrect query with new commands, it seems will return error "xxx is supported only when plugins.calcite.enabled=true" as it will always fallback to v2.
But the expected error message should be the exception message thrown by calcite.

Maybe we should show Calcite's error message, if fallback to v2 also ends with failure.

addressed.

Signed-off-by: Lantao Jin <[email protected]>

LantaoJin · 2025-04-22T13:56:27Z

The commit b9cbb9b fails due to #3445 (comment)

core/src/main/java/org/opensearch/sql/analysis/Analyzer.java

integ-test/src/test/java/org/opensearch/sql/ppl/NewAddedCommandsIT.java

qianheng-aws · 2025-04-24T06:08:04Z

core/src/main/java/org/opensearch/sql/executor/QueryService.java

+      if (shouldUseCalcite(queryType) && isCalciteFallbackAllowed()) {
+        // if there is a failure thrown from Calcite and execution after fallback V2
+        // keeps failure, we should throw the failure from Calcite.
+        calciteFailure.ifPresentOrElse(


Do we have IT for this feature?

Signed-off-by: Lantao Jin <[email protected]>

opensearch-trigger-bot · 2025-04-25T03:14:56Z

The backport to 3.0 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-3.0 3.0
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-3.0
# Create a new branch
git switch --create backport/backport-3571-to-3.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 69b9e82b35a8d2b856ec7c6ae7dd2487a8c16a3a
# Push it to GitHub
git push --set-upstream origin backport/backport-3571-to-3.0
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-3.0

Then, create a pull request where the base branch is 3.0 and the compare/head branch is backport/backport-3571-to-3.0.

…search-project#3571) * New added commands should throw exception when calcite disabled Signed-off-by: Lantao Jin <[email protected]> * remove useless code Signed-off-by: Lantao Jin <[email protected]> * address comments Signed-off-by: Lantao Jin <[email protected]> * fix UT Signed-off-by: Lantao Jin <[email protected]> * Add a new IT case Signed-off-by: Lantao Jin <[email protected]> --------- Signed-off-by: Lantao Jin <[email protected]> (cherry picked from commit 69b9e82)

… (#3582) * New added commands should throw exception when calcite disabled Signed-off-by: Lantao Jin <[email protected]> * remove useless code Signed-off-by: Lantao Jin <[email protected]> * address comments Signed-off-by: Lantao Jin <[email protected]> * fix UT Signed-off-by: Lantao Jin <[email protected]> * Add a new IT case Signed-off-by: Lantao Jin <[email protected]> --------- Signed-off-by: Lantao Jin <[email protected]> (cherry picked from commit 69b9e82)

* New added commands should throw exception when calcite disabled Signed-off-by: Lantao Jin <[email protected]> * remove useless code Signed-off-by: Lantao Jin <[email protected]> * address comments Signed-off-by: Lantao Jin <[email protected]> * fix UT Signed-off-by: Lantao Jin <[email protected]> * Add a new IT case Signed-off-by: Lantao Jin <[email protected]> --------- Signed-off-by: Lantao Jin <[email protected]> Signed-off-by: xinyual <[email protected]>

New added commands should throw exception when calcite disabled

915686b

Signed-off-by: Lantao Jin <[email protected]>

LantaoJin added the calcite calcite migration releated label Apr 22, 2025

remove useless code

777273b

Signed-off-by: Lantao Jin <[email protected]>

LantaoJin marked this pull request as ready for review April 22, 2025 08:26

LantaoJin requested review from GumpacG, MaxKsyunz, Swiddis, YANG-DB, Yury-Fridlyand, acarbonetto, anirudha, dai-chen, derek-ho, forestmvey, joshuali925, kavithacm, mengweieric, noCharger, penghuo, ps48, qianheng-aws, seankao-az and ykmr1224 as code owners April 22, 2025 08:26

qianheng-aws reviewed Apr 22, 2025

View reviewed changes

address comments

b9cbb9b

Signed-off-by: Lantao Jin <[email protected]>

LantaoJin added 2 commits April 22, 2025 21:36

Merge remote-tracking branch 'upstream/main' into issues/3568

4f9f561

fix UT

8e25b66

Signed-off-by: Lantao Jin <[email protected]>

penghuo reviewed Apr 22, 2025

View reviewed changes

core/src/main/java/org/opensearch/sql/analysis/Analyzer.java Show resolved Hide resolved

LantaoJin mentioned this pull request Apr 23, 2025

Support explain PPL command #3560

Merged

7 tasks

LantaoJin requested review from penghuo and qianheng-aws April 23, 2025 08:58

penghuo previously approved these changes Apr 23, 2025

View reviewed changes

qianheng-aws reviewed Apr 24, 2025

View reviewed changes

integ-test/src/test/java/org/opensearch/sql/ppl/NewAddedCommandsIT.java Show resolved Hide resolved

qianheng-aws reviewed Apr 24, 2025

View reviewed changes

LantaoJin added 2 commits April 24, 2025 14:56

Merge remote-tracking branch 'upstream/main' into issues/3568

a38e064

Add a new IT case

879240c

Signed-off-by: Lantao Jin <[email protected]>

LantaoJin dismissed penghuo’s stale review via 879240c April 24, 2025 06:58

qianheng-aws approved these changes Apr 24, 2025

View reviewed changes

penghuo approved these changes Apr 24, 2025

View reviewed changes

penghuo merged commit 69b9e82 into opensearch-project:main Apr 24, 2025
22 checks passed

LantaoJin added backport 3.0 bug Something isn't working labels Apr 25, 2025

opensearch-trigger-bot bot added the backport-failed label Apr 25, 2025

LantaoJin mentioned this pull request Apr 25, 2025

[Backport 3.0] New added commands should throw exception when calcite disabled (#3571) #3582

Merged

LantaoJin added the backport-manually Filed a PR to backport manually. label Jul 22, 2025

opensearch-project deleted a comment from opensearch-trigger-bot bot Aug 13, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

New added commands should throw exception when calcite disabled #3571

New added commands should throw exception when calcite disabled #3571

Uh oh!

LantaoJin commented Apr 22, 2025 •

edited

Loading

Uh oh!

qianheng-aws commented Apr 22, 2025 •

edited

Loading

Uh oh!

qianheng-aws Apr 22, 2025

Uh oh!

LantaoJin Apr 22, 2025

Uh oh!

qianheng-aws commented Apr 22, 2025

Uh oh!

LantaoJin commented Apr 22, 2025

Uh oh!

LantaoJin commented Apr 22, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

qianheng-aws Apr 24, 2025

Uh oh!

LantaoJin Apr 24, 2025

Uh oh!

Uh oh!

opensearch-trigger-bot bot commented Apr 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

New added commands should throw exception when calcite disabled #3571

New added commands should throw exception when calcite disabled #3571

Uh oh!

Conversation

LantaoJin commented Apr 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related Issues

Check List

Uh oh!

qianheng-aws commented Apr 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

qianheng-aws Apr 22, 2025

Choose a reason for hiding this comment

Uh oh!

LantaoJin Apr 22, 2025

Choose a reason for hiding this comment

Uh oh!

qianheng-aws commented Apr 22, 2025

Uh oh!

LantaoJin commented Apr 22, 2025

Uh oh!

LantaoJin commented Apr 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

qianheng-aws Apr 24, 2025

Choose a reason for hiding this comment

Uh oh!

LantaoJin Apr 24, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

opensearch-trigger-bot bot commented Apr 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

LantaoJin commented Apr 22, 2025 •

edited

Loading

qianheng-aws commented Apr 22, 2025 •

edited

Loading

LantaoJin commented Apr 22, 2025 •

edited

Loading