Skip to content

fix(sql-execute): fall back to exception type when error message is null #634

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

Open
ydflow wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(sql-execute): fall back to exception type when error message is null #634

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: 3 additions & 1 deletion ...management/src/main/java/com/alibaba/cloud/ai/dataagent/workflow/node/SqlExecuteNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,9 @@ private Map<String, Object> executeSqlQuery(OverAllState state, Integer currentS
.flatMapMany(executed -> Flux.concat(baseResultResponses(executed.resultSet()),
chartUpdateResponses(state, executed.resultSet())))
.onErrorResume(e -> {
String errorMessage = e.getMessage();
// NPE / StackOverflowError and several JDBC wrappers carry a null message;
// fall back to the exception type so the user never sees the literal "null"
String errorMessage = StringUtils.isNotBlank(e.getMessage()) ? e.getMessage() : e.getClass().getName();
log.error("SQL execution failed - SQL as follows: \n {} \n ", sqlQuery, e);
result.put(SQL_REGENERATE_REASON, SqlRetryDto.sqlExecute(errorMessage));
return Flux.just(ChatResponseUtil.createResponse("SQL执行失败: " + errorMessage));
Expand Down
20 changes: 20 additions & 0 deletions ...nt/src/test/java/com/alibaba/cloud/ai/dataagent/workflow/node/sql/SqlExecuteNodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,26 @@ void apply_sqlExecutionError_setsRetryReason() throws Exception {
assertFalse(execution.finalResult().containsKey(PLAN_CURRENT_STEP));
}

@Test
void apply_sqlExecutionErrorWithoutMessage_doesNotLeakNullIntoUserFacingText() throws Exception {
OverAllState state = createTestState();
setupBasicState(state);
setupBasicMocks();

// NPE / StackOverflowError and several JDBC wrappers carry a null message
when(accessor.executeSqlAndReturnObject(any(), any())).thenThrow(new RuntimeException((String) null));

NodeExecution execution = execute(sqlExecuteNode.apply(state), SQL_EXECUTE_NODE_OUTPUT);

String streamed = execution.streamedText();
assertFalse(streamed.contains("null"),
"user-facing text must not leak the literal 'null', was: " + streamed);
assertTrue(streamed.contains("SQL执行失败"), "failure notice must still be emitted, was: " + streamed);
SqlRetryDto retryReason = (SqlRetryDto) execution.finalResult().get(SQL_REGENERATE_REASON);
assertNotNull(retryReason);
assertTrue(retryReason.sqlExecuteFail());
}

@Test
void apply_connectionFailure_throwsException() throws Exception {
OverAllState state = createTestState();
Expand Down
Loading