From ad89f433f16d65ddcab3186baa84e14762d03e52 Mon Sep 17 00:00:00 2001
From: dengc367 <dengc367@gmail.com>
Date: Mon, 17 Aug 2020 17:28:46 +0800
Subject: [PATCH] [Feature]modify some cases from rockxsj:Feature-presto to add
 presto datasource support  (#3468)

* Feature presto (#1)

* * add presto datasource support
update .gitigonre to igonre some files

* * use another presto driver

* * add LICENSE files about presto-jdbc

* * just for test sonar

Co-authored-by: rockxsj <junjun@mgtv.com>

* modify the io.prestosql.jdbc.PrestoDriver to com.facebook.presto.jdbc.PrestoDriver

* add presto connection in sql node

Co-authored-by: rockxsj <junjun@mgtv.com>
---
 .../org/apache/dolphinscheduler/common/Constants.java     | 2 +-
 dolphinscheduler-ui/src/js/conf/home/store/dag/state.js   | 5 +++++
 script/scp-hosts.sh                                       | 8 ++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index 4f22e01241..072a67f44f 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -898,7 +898,7 @@ public final class Constants {
     public static final String COM_ORACLE_JDBC_DRIVER = "oracle.jdbc.driver.OracleDriver";
     public static final String COM_SQLSERVER_JDBC_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
     public static final String COM_DB2_JDBC_DRIVER = "com.ibm.db2.jcc.DB2Driver";
-    public static final String COM_PRESTO_JDBC_DRIVER = "io.prestosql.jdbc.PrestoDriver";
+    public static final String COM_PRESTO_JDBC_DRIVER = "com.facebook.presto.jdbc.PrestoDriver";
 
     /**
      * database type
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/state.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
index 05dfa77161..e3c75b838f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
@@ -96,6 +96,11 @@ export default {
       id: 7,
       code: 'DB2',
       disabled: false
+    },
+    {
+      id: 8,
+      code: 'PRESTO',
+      disabled: false
     }
   ],
   // Alarm interface
diff --git a/script/scp-hosts.sh b/script/scp-hosts.sh
index 4a94cffa29..9da94ab79c 100644
--- a/script/scp-hosts.sh
+++ b/script/scp-hosts.sh
@@ -33,8 +33,8 @@ for workerGroup in ${workersGroup[@]}
 do
   echo $workerGroup;
   worker=`echo $workerGroup|awk -F':' '{print $1}'`
-  groupName=`echo $workerGroup|awk -F':' '{print $2}'`
-  workersGroupMap+=([$worker]=$groupName)
+  groupsName=`echo $workerGroup|awk -F':' '{print $2}'`
+  workersGroupMap+=([$worker]=$groupsName)
 done
 
 
@@ -53,7 +53,7 @@ do
   do
     # if worker in workersGroupMap
     if [[ "${workersGroupMap[${host}]}" ]] && [[ "${dsDir}" == "conf" ]]; then
-      sed -i ${txt} "s#worker.group.*#worker.group=${workersGroupMap[${host}]}#g" ${dsDir}/worker.properties
+      sed -i ${txt} "s:.*worker.groups.*:worker.groups=${workersGroupMap[${host}]}:g" ${dsDir}/worker.properties
     fi
 
     echo "start to scp $dsDir to $host/$installPath"
@@ -61,4 +61,4 @@ do
   done
 
   echo "scp dirs to $host/$installPath complete"
-done
\ No newline at end of file
+done