fix: data quality can not use #15551
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zhongjiajie
requested review from
SbloodyS,
caishunfeng,
ruanwenjun and
zhuangchong
as code owners
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## dev #15551 +/- ##
============================================
- Coverage 38.41% 38.37% -0.04%
+ Complexity 4751 4745 -6
============================================
Files 1305 1305
Lines 44815 44841 +26
Branches 4800 4808 +8
============================================
- Hits 17214 17209 -5
- Misses 25731 25759 +28
- Partials 1870 1873 +3 ☔ View full report in Codecov by Sentry. |
zhongjiajie
commented
Feb 1, 2024
Comment on lines
+151
to
+156
| // not standalone mode | ||
| String currentAbsolutePath = new ClassPathResource("./").getFile().getAbsolutePath(); | ||
| String currentLibPath = currentAbsolutePath + "/../libs"; | ||
| getDataQualityJarPathFromPath(currentLibPath).ifPresent(jarName -> DEFAULT_DATA_QUALITY_JAR_PATH = jarName); | ||
|
|
||
| // standalone mode |
Member
Author
There was a problem hiding this comment.
auto discovery data quality jar path for both standalone mode and not
Comment on lines
+398
to
+404
| BaseConnectionParam baseConnectionParam = new DefaultConnectionParam(); | ||
| baseConnectionParam.setUser(hikariDataSource.getUsername()); | ||
| baseConnectionParam.setPassword(hikariDataSource.getPassword()); | ||
| baseConnectionParam.setDatabase(jdbcInfo.getDatabase()); | ||
| baseConnectionParam.setAddress(jdbcInfo.getAddress()); | ||
| baseConnectionParam.setJdbcUrl(jdbcInfo.getJdbcUrl()); | ||
| baseConnectionParam.setOther(jdbcInfo.getParams()); |
Member
Author
There was a problem hiding this comment.
key change for data quality task can not be use
Comment on lines
+113
to
+125
| if (StringUtils.isNotEmpty(params)) { | ||
| Map<String, String> others = new HashMap<>(); | ||
| String[] paramList = params.split("&"); | ||
| for (String param : paramList) { | ||
| // handle bad params | ||
| if (StringUtils.isEmpty(param) || !param.contains(EQUAL_SIGN)) { | ||
| continue; | ||
| } | ||
| String[] kv = param.split(EQUAL_SIGN); | ||
| others.put(kv[0], kv[1]); | ||
| } | ||
| jdbcInfo.setParams(others); | ||
| } |
Member
Author
There was a problem hiding this comment.
parse metadata other param to avoid connect error
caishunfeng
approved these changes
Feb 1, 2024
| log.info( | ||
| "Can not get data quality jar from path {}, maybe service running in standalone mode, will try to find another path", | ||
| currentLibPath); | ||
| currentLibPath = currentAbsolutePath + "/../../worker-server/libs"; |
Contributor
There was a problem hiding this comment.
It seems can not auto find in docker image?
Is it better to add env when use standalone mode?
rickchengx
reviewed
Feb 2, 2024
...e-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/utils/CommonUtils.java
Show resolved
Hide resolved
|
zhongjiajie
added a commit
that referenced
this pull request
Feb 6, 2024
* fix: data quality can not use fix: #15468, #15249, #14858 --------- Co-authored-by: Rick Cheng <[email protected]> Co-authored-by: Eric Gao <[email protected]> (cherry picked from commit 8efaa9f)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix: #15468, #15249, #14858