(dolphinscheduler) branch dev updated: [fix-#11726] fix error when set connection proerty both in the URL and an argument (#15093)

[zihaoxiang]

This is an automated email from the ASF dual-hosted git repository.

zihaoxiang 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 8665951981 [fix-#11726] fix error when set connection proerty both in 
the URL and an argument (#15093)
8665951981 is described below

commit 8665951981b48fad051fe7457af5fddf8e61de87
Author: izualzhy <izual...@163.com>
AuthorDate: Fri Nov 3 14:44:27 2023 +0800

    [fix-#11726] fix error when set connection proerty both in the URL and an 
argument (#15093)
    
    Co-authored-by: zhangying14 <zhangyin...@zuoyebang.com>
    Co-authored-by: xiangzihao <460888...@qq.com>
---
 .../datasource/presto/param/PrestoDataSourceProcessor.java       | 9 +++++----
 1 file changed, 5 insertions(+), 4 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 06f22a705a..e466ea98c9 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,10 +102,11 @@ public class PrestoDataSourceProcessor extends 
AbstractDataSourceProcessor {
     @Override
     public String getJdbcUrl(ConnectionParam connectionParam) {
         PrestoConnectionParam prestoConnectionParam = (PrestoConnectionParam) 
connectionParam;
-        if (MapUtils.isNotEmpty(prestoConnectionParam.getOther())) {
-            return String.format("%s?%s", prestoConnectionParam.getJdbcUrl(),
-                    transformOther(prestoConnectionParam.getOther()));
-        }
+        /**
+         * 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</>
+         */
         return prestoConnectionParam.getJdbcUrl();
     }