Skip to content

[fix] fix two bug when executing mysql task #4365

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
AngerWind wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

[fix] fix two bug when executing mysql task #4365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75640bf
[Fix] [dinky-admin]: JobResult's status is null when executing mysql …
AngerWind Apr 15, 2025
6cca0ea
[Fix] [dinky-admin]: maxRowNum parameter did not work when executing …
AngerWind Apr 15, 2025
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
5 changes: 5 additions & 0 deletions dinky-admin/src/main/java/org/dinky/service/impl/DataBaseServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.dinky.data.model.Task;
import org.dinky.data.result.SqlExplainResult;
import org.dinky.job.Job;
import org.dinky.job.Job.JobStatus;
import org.dinky.job.JobResult;
import org.dinky.mapper.DataBaseMapper;
import org.dinky.metadata.driver.Driver;
Expand Down Expand Up @@ -305,6 +306,7 @@ public JobResult executeCommonSql(SqlDTO sqlDTO) {
result.setSuccess(false);
result.setError("please assign data source");
result.setEndTime(LocalDateTime.now());
result.setStatus(JobStatus.FAILED);
return result;
}

Expand All @@ -313,6 +315,7 @@ public JobResult executeCommonSql(SqlDTO sqlDTO) {
result.setSuccess(false);
result.setError("data source not exist.");
result.setEndTime(LocalDateTime.now());
result.setStatus(JobStatus.FAILED);
return result;
}

Expand All @@ -324,9 +327,11 @@ public JobResult executeCommonSql(SqlDTO sqlDTO) {
result.setResult(selectResult);
if (selectResult.isSuccess()) {
result.setSuccess(true);
result.setStatus(JobStatus.SUCCESS);
} else {
result.setSuccess(false);
result.setError(selectResult.getError());
result.setStatus(JobStatus.FAILED);
}
result.setEndTime(LocalDateTime.now());
return result;
Expand Down
4 changes: 2 additions & 2 deletions dinky-admin/src/main/java/org/dinky/service/task/CommonSqlTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public List<SqlExplainResult> explain() {
@Override
public JobResult execute() {
log.info("Preparing to execute common sql...");
SqlDTO sqlDTO = SqlDTO.build(task.getStatement(), task.getDatabaseId(), null);
SqlDTO sqlDTO = SqlDTO.build(task.getStatement(), task.getDatabaseId(), task.getMaxRowNum());
DataBaseService dataBaseService = SpringUtil.getBean(DataBaseService.class);
JobResult jobResult = dataBaseService.executeCommonSql(sqlDTO);
return jobResult;
Expand All @@ -70,7 +70,7 @@ public JobResult execute() {
@Override
public JobResult StreamExecute() {
log.info("Preparing to execute common sql...");
SqlDTO sqlDTO = SqlDTO.build(task.getStatement(), task.getDatabaseId(), null);
SqlDTO sqlDTO = SqlDTO.build(task.getStatement(), task.getDatabaseId(), task.getMaxRowNum());
DataBaseService dataBaseService = SpringUtil.getBean(DataBaseService.class);
JobResult jobResult = dataBaseService.StreamExecuteCommonSql(sqlDTO);
return jobResult;
Expand Down
Loading