You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by we...@apache.org on 2025/03/24 14:11:49 UTC
(dolphinscheduler) 01/01: Revert "[fix-#11726] fix error when set connection proerty both in the URL an…"
This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch revert-15093-fix-#11726
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit d485e3ef4d468270a010120d9bedf78c155c61bc
Author: Wenjun Ruan <we...@apache.org>
AuthorDate: Mon Mar 24 22:11:38 2025 +0800
Revert "[fix-#11726] fix error when set connection proerty both in the URL an…"
This reverts commit 8665951981b48fad051fe7457af5fddf8e61de87.
---
.../datasource/presto/param/PrestoDataSourceProcessor.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/param/PrestoDataSourceProcessor.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/param/PrestoDataSourceProcessor.java
index f72bdb2b64..b5dc8fd09c 100644
--- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/param/PrestoDataSourceProcessor.java
+++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-presto/src/main/java/org/apache/dolphinscheduler/plugin/datasource/presto/param/PrestoDataSourceProcessor.java
@@ -102,11 +102,10 @@ public class PrestoDataSourceProcessor extends AbstractDataSourceProcessor {
@Override
public String getJdbcUrl(ConnectionParam connectionParam) {
PrestoConnectionParam prestoConnectionParam = (PrestoConnectionParam) connectionParam;
- /**
- * return jdbc url without other parameters, avoid to assign same parameters both in URL and properties.
- * or else got error msg: Connection property '...' is both in the URL and an argument
- * ref to <a href="https://prestodb.io/docs/current/installation/jdbc.html">Presto JDBC Driver</>
- */
+ if (MapUtils.isNotEmpty(prestoConnectionParam.getOther())) {
+ return String.format("%s?%s", prestoConnectionParam.getJdbcUrl(),
+ transformOther(prestoConnectionParam.getOther()));
+ }
return prestoConnectionParam.getJdbcUrl();
}