Skip to content
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.

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

when use list as out property in sql tasks, if sql result has only one row, still wrap result in a list #15972

Open
wants to merge 26 commits into
base: dev
Choose a base branch
from

Conversation

HouSong
Copy link

@HouSong HouSong commented May 10, 2024

Purpose of the pull request

when use list as out property in sql tasks, if sql result has only one row, there will be an exception.
In this PR, when use list as out property in sql tasks, if sql result has only one row, this result will be wrapped in a list; if sql result has no row, use property value as default and wrap it in a list (if property value exists) .

Brief change log

Verify this pull request

This pull request is code cleanup without any test coverage.

(or)

This pull request is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

(or)

If your pull request contain incompatible change, you should also add it to docs/docs/en/guide/upgrede/incompatible.md

zhongjiajie and others added 26 commits January 31, 2024 16:45
(cherry picked from commit 25810a8)
Co-authored-by: fuchanghai <changhaifu@apache.org>
(cherry picked from commit 2f66a66)
Co-authored-by: xiangzihao <460888207@qq.com>
Co-authored-by: Eric Gao <ericgao.apache@gmail.com>
(cherry picked from commit 1b42d45)
* fix: data quality can not use

fix: apache#15468, apache#15249, apache#14858

---------

Co-authored-by: Rick Cheng <rickchengx@gmail.com>
Co-authored-by: Eric Gao <ericgao.apache@gmail.com>
(cherry picked from commit 8efaa9f)
Co-authored-by: Rick Cheng <rickchengx@gmail.com>
Co-authored-by: Eric Gao <ericgao.apache@gmail.com>
(cherry picked from commit ef9ed3d)
…on MacOS in ProcessUtilsTest (apache#15480) (apache#15529)

Co-authored-by: Rick Cheng <rickchengx@gmail.com>
(cherry picked from commit 4d6af51)
Co-authored-by: Rick Cheng <rickchengx@gmail.com>
(cherry picked from commit d8e820c)
Co-authored-by: Rick Cheng <rickchengx@gmail.com>
(cherry picked from commit e5a208f)
* fix: start param for wf not work

fix: apache#15280

* fix test

(cherry picked from commit 01eb8f8)
…ccess but task insatnce is killed/paused (apache#15574)

(cherry picked from commit 43a0652)
Co-authored-by: fuchanghai <changhaifu@apache.org>
Co-authored-by: Eric Gao <ericgao.apache@gmail.com>
Co-authored-by: Rick Cheng <rickchengx@gmail.com>
(cherry picked from commit 69676b4)
…ache#15576)

Co-authored-by: Rick Cheng <rickchengx@gmail.com>
(cherry picked from commit 4541e74)
…on in the worker (apache#15565)

Co-authored-by: Rick Cheng <rickchengx@gmail.com>
(cherry picked from commit 89da67d)
* fix can not get correct resource related path when
  user run workflow with differnet tenant of resource
  created
* also fix can not get correct related path when we
  use `resource.storage.type=LOCAL`

(cherry picked from commit bd83631)
* Revert "Fix k8sTaskExecutionContext setting configYaml (apache#15116)"

This reverts commit ce11674.

* Revert "[Improvement] Refactoring K8S task plugin with connections managed in connection center (apache#14977)"

This reverts commit c532fea.
…e row, still wrap result in a list; if sql result has no row, use property value as default and wrap it in a list
Copy link
Member

@SbloodyS SbloodyS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change your target branch to dev and link this PR to your issue.

@HouSong HouSong changed the base branch from 3.2.1-release to dev May 10, 2024 08:44
@HouSong
Copy link
Author

HouSong commented May 10, 2024

Please change your target branch to dev and link this PR to your issue.

I haven't created an issue for this PR. Is it required?

@ruanwenjun
Copy link
Member

ruanwenjun commented May 10, 2024

Please rebase latest dev.

@codecov-commenter
Copy link

codecov-commenter commented May 11, 2024

Codecov Report

Attention: Patch coverage is 36.40000% with 318 lines in your changes are missing coverage. Please review.

Project coverage is 38.49%. Comparing base (3640a28) to head (2c65c17).
Report is 141 commits behind head on dev.

❗ Current head 2c65c17 differs from pull request most recent head 9ee0b1e. Consider uploading reports for the commit 9ee0b1e to get more accurate results

Files Patch % Lines
.../master/runner/taskgroup/TaskGroupCoordinator.java 42.10% 114 Missing and 7 partials ⚠️
...duler/plugin/datasource/api/utils/CommonUtils.java 5.12% 37 Missing ⚠️
.../server/master/runner/WorkflowExecuteRunnable.java 3.70% 24 Missing and 2 partials ⚠️
...pache/dolphinscheduler/common/utils/FileUtils.java 22.22% 18 Missing and 3 partials ⚠️
...aster/rpc/TaskInstanceWakeupOperationFunction.java 0.00% 16 Missing ⚠️
...cheduler/api/service/impl/ExecutorServiceImpl.java 0.00% 11 Missing ⚠️
...nscheduler/service/process/ProcessServiceImpl.java 56.00% 8 Missing and 3 partials ⚠️
...tasource/mysql/param/MySQLDataSourceProcessor.java 0.00% 7 Missing and 1 partial ⚠️
...ver/master/runner/TaskExecutionContextFactory.java 0.00% 8 Missing ⚠️
...uler/plugin/task/api/parameters/SqlParameters.java 20.00% 5 Missing and 3 partials ⚠️
... and 27 more
Additional details and impacted files
@@             Coverage Diff              @@
##                dev   #15972      +/-   ##
============================================
+ Coverage     38.15%   38.49%   +0.33%     
- Complexity     4707     4752      +45     
============================================
  Files          1304     1301       -3     
  Lines         44828    44781      -47     
  Branches       4807     4809       +2     
============================================
+ Hits          17105    17237     +132     
+ Misses        25870    25663     -207     
- Partials       1853     1881      +28     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link

sonarcloud bot commented May 11, 2024

Please retry analysis of this Pull-Request directly on SonarCloud

@wangxj3
Copy link
Contributor

wangxj3 commented May 13, 2024

There seems to be some conflict, please pull the upstream dev code.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet