This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new a62a7a7 [Fix][Task] sql limit param no default value (#6337) (#6387)
a62a7a7 is described below
commit a62a7a7216fe2021d1516b6d7370598123cced37
Author: mask <[email protected]>
AuthorDate: Tue Sep 28 11:38:22 2021 +0800
[Fix][Task] sql limit param no default value (#6337) (#6387)
* add default query sql limit
---
.../java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
b/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
index 3846c35..cc18d5e 100644
---
a/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
+++
b/dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
@@ -82,6 +82,11 @@ public class SqlTask extends AbstractTaskExecutor {
private static final String CREATE_FUNCTION_FORMAT = "create temporary
function {0} as ''{1}''";
/**
+ * default query sql limit
+ */
+ private static final int LIMIT = 10000;
+
+ /**
* Abstract Yarn Task
*
* @param taskRequest taskRequest
@@ -234,8 +239,9 @@ public class SqlTask extends AbstractTaskExecutor {
int num = md.getColumnCount();
int rowCount = 0;
+ int limit = sqlParameters.getLimit() == 0 ? LIMIT :
sqlParameters.getLimit();
- while (rowCount < sqlParameters.getLimit() && resultSet.next()) {
+ while (rowCount < limit && resultSet.next()) {
ObjectNode mapOfColValues = JSONUtils.createObjectNode();
for (int i = 1; i <= num; i++) {
mapOfColValues.set(md.getColumnLabel(i),
JSONUtils.toJsonNode(resultSet.getObject(i)));