Skip to content

Return 4xx instead of 500 for unsupported window functions #5587

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
dai-chen merged 1 commit into from
Jun 25, 2026
Merged

Return 4xx instead of 500 for unsupported window functions #5587

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
12 changes: 12 additions & 0 deletions api/src/test/java/org/opensearch/sql/api/UnifiedQueryPlannerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,18 @@ public void unsupportedFeatureIsRethrownAsSemanticCheckException() {
.assertErrorMessageContains("unsupported in Calcite");
}

@Test
public void unsupportedWindowFunctionIsRethrownAsSemanticCheckException() {
// Window functions outside WINDOW_FUNC_MAPPING reach
// CalciteRexNodeVisitor#visitWindowFunction's
// orElseThrow. The throw site emits CalciteUnsupportedException so this path normalizes to a
// 4xx SemanticCheckException rather than escaping as a 500.
givenInvalidQuery("source = catalog.employees | eventstats rank()")
.assertErrorType(SemanticCheckException.class)
.assertCauseType(CalciteUnsupportedException.class)
.assertErrorMessageContains("Unexpected window function: rank");
}

@Test
public void assertionErrorIsWrappedAsSemanticCheckException() {
// Remove when the underlying Calcite assertion is fixed.
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/opensearch/sql/calcite/CalciteRexNodeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ public RexNode visitWindowFunction(WindowFunction node, CalcitePlanContext conte
node.getWindowFrame());
})
.orElseThrow(
() -> new UnsupportedOperationException("Unexpected window function: " + funcName));
() -> new CalciteUnsupportedException("Unexpected window function: " + funcName));
}

private List<RexNode> translateOrderKeys(
Expand Down
Loading