natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Bug-#12057][task-plugin] fix when the sql query result is empty, the email fails to send the attachment, and an exception will be reported (#12059) (#12633) 

Co-authored-by: 冯剑 Jian <jian.feng@jiduauto.com>
This commit is contained in:
Eric Gao 2022-11-01 11:41:09 +08:00 committed by GitHub
parent 457c06c6cf
commit d158ae55b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
View File

@ -257,6 +257,7 @@ public class SqlTask extends AbstractTaskExecutor {
resultJSONArray.add(mapOfColValues);
rowCount++;
}
int displayRows = sqlParameters.getDisplayRows() > 0 ? sqlParameters.getDisplayRows() : TaskConstants.DEFAULT_DISPLAY_ROWS;
displayRows = Math.min(displayRows, rowCount);
logger.info("display sql result {} rows as follows:", displayRows);
@ -265,7 +266,10 @@ public class SqlTask extends AbstractTaskExecutor {
logger.info("row {} : {}", i + 1, row);
}
}
String result = JSONUtils.toJsonString(resultJSONArray);
String result = resultJSONArray.isEmpty() ?
JSONUtils.toJsonString(generateEmptyRow(resultSet)) : JSONUtils.toJsonString(resultJSONArray);
if (sqlParameters.getSendEmail() == null || sqlParameters.getSendEmail()) {
sendAttachment(sqlParameters.getGroupId(), StringUtils.isNotEmpty(sqlParameters.getTitle())
? sqlParameters.getTitle()
@ -275,6 +279,27 @@ public class SqlTask extends AbstractTaskExecutor {
return result;
}
/**
* generate empty Results as ArrayNode
*/
private ArrayNode generateEmptyRow(ResultSet resultSet) throws SQLException {
ArrayNode resultJSONArray = JSONUtils.createArrayNode();
ObjectNode emptyOfColValues = JSONUtils.createObjectNode();
if (resultSet != null) {
ResultSetMetaData metaData = resultSet.getMetaData();
int columnsNum = metaData.getColumnCount();
logger.info("sql query results is empty");
for (int i = 1; i <= columnsNum; i++) {
emptyOfColValues.set(metaData.getColumnLabel(i), JSONUtils.toJsonNode(""));
}
} else {
emptyOfColValues.set("error", JSONUtils.toJsonNode("resultSet is null"));
}
resultJSONArray.add(emptyOfColValues);
return resultJSONArray;
}
/**
* send alert as an attachment
*