reset pgsql (#1178)

+ 1

dockerfile/Dockerfile

@@ -1,6 +1,7 @@
 FROM ubuntu:18.04
 
 ENV LANG=C.UTF-8
+ENV DEBIAN_FRONTEND=noninteractive
 
 ARG version
 ARG tar_version
@@ -52,52 +53,46 @@ RUN cd /opt && \
 ENV NODE_HOME=/opt/node
 ENV PATH $PATH:$NODE_HOME/bin
 
-#5,add dolphinscheduler source code to /opt/dolphinscheduler_source
+#5,install postgresql
+RUN apt-get update && \
+    apt-get install -y postgresql postgresql-contrib sudo && \
+    sed -i 's/localhost/*/g' /etc/postgresql/10/main/postgresql.conf
+
+#6,install nginx
+RUN apt-get update && \
+  apt-get install -y nginx && \
+  rm -rf /var/lib/apt/lists/* && \
+  echo "\ndaemon off;" >> /etc/nginx/nginx.conf && \
+  chown -R www-data:www-data /var/lib/nginx
+
+#7,install sudo,python,vim,ping and ssh command
+RUN apt-get update && \
+  apt-get -y install sudo && \
+  apt-get -y install python && \
+  apt-get -y install vim && \
+  apt-get -y install iputils-ping && \
+  apt-get -y install net-tools && \
+  apt-get -y install openssh-server && \
+  apt-get -y install python-pip && \
+  pip install kazoo
+
+#8,add dolphinscheduler source code to /opt/dolphinscheduler_source
 ADD . /opt/dolphinscheduler_source
 
 
-#5,backend compilation
+#9,backend compilation
 RUN cd /opt/dolphinscheduler_source && \
     mvn -U clean package assembly:assembly -Dmaven.test.skip=true
 
-#6,frontend compilation
+#10,frontend compilation
 RUN chmod -R 777 /opt/dolphinscheduler_source/dolphinscheduler-ui && \
     cd /opt/dolphinscheduler_source/dolphinscheduler-ui && \
     rm -rf /opt/dolphinscheduler_source/dolphinscheduler-ui/node_modules && \
     npm install node-sass --unsafe-perm && \
     npm install && \
     npm run build
-#7,install mysql
-RUN echo "deb http://cn.archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse" >> /etc/apt/sources.list
-
-RUN echo "mysql-server mysql-server/root_password password root" | debconf-set-selections
-RUN echo "mysql-server mysql-server/root_password_again password root" | debconf-set-selections
-
-RUN apt-get update && \
-        apt-get -y install mysql-server-5.7 && \
-        mkdir -p /var/lib/mysql && \
-        mkdir -p /var/run/mysqld && \
-        mkdir -p /var/log/mysql && \
-        chown -R mysql:mysql /var/lib/mysql && \
-        chown -R mysql:mysql /var/run/mysqld && \
-        chown -R mysql:mysql /var/log/mysql
-
-
-# UTF-8 and bind-address
-RUN sed -i -e "$ a [client]\n\n[mysql]\n\n[mysqld]"  /etc/mysql/my.cnf && \
-        sed -i -e "s/\(\[client\]\)/\1\ndefault-character-set = utf8/g" /etc/mysql/my.cnf && \
-        sed -i -e "s/\(\[mysql\]\)/\1\ndefault-character-set = utf8/g" /etc/mysql/my.cnf && \
-        sed -i -e "s/\(\[mysqld\]\)/\1\ninit_connect='SET NAMES utf8'\ncharacter-set-server = utf8\ncollation-server=utf8_general_ci\nbind-address = 0.0.0.0/g" /etc/mysql/my.cnf
-
-
-#8,install nginx
-RUN apt-get update && \
-  apt-get install -y nginx && \
-  rm -rf /var/lib/apt/lists/* && \
-  echo "\ndaemon off;" >> /etc/nginx/nginx.conf && \
-  chown -R www-data:www-data /var/lib/nginx
 
-#9,modify dolphinscheduler configuration file
+#11,modify dolphinscheduler configuration file
 #backend configuration
 RUN mkdir -p /opt/dolphinscheduler && \
     tar -zxvf /opt/dolphinscheduler_source/target/dolphinscheduler-${tar_version}.tar.gz -C /opt/dolphinscheduler && \
@@ -106,22 +101,11 @@ ADD ./dockerfile/conf/dolphinscheduler/conf /opt/dolphinscheduler/conf
 #frontend nginx configuration
 ADD ./dockerfile/conf/nginx/dolphinscheduler.conf /etc/nginx/conf.d
 
-#10,open port
+#12,open port
 EXPOSE 2181 2888 3888 3306 80 12345 8888
 
-#11,install sudo,python,vim,ping and ssh command
-RUN apt-get update && \
-  apt-get -y install sudo && \
-  apt-get -y install python && \
-  apt-get -y install vim && \
-  apt-get -y install iputils-ping && \
-  apt-get -y install net-tools && \
-  apt-get -y install openssh-server && \
-  apt-get -y install python-pip && \
-  pip install kazoo
-
 COPY ./dockerfile/startup.sh /root/startup.sh
-#12,modify permissions and set soft links
+#13,modify permissions and set soft links
 RUN chmod +x /root/startup.sh && \
   chmod +x /opt/dolphinscheduler/script/create-dolphinscheduler.sh && \
   chmod +x /opt/zookeeper/bin/zkServer.sh && \

dockerfile/conf/dolphinscheduler/conf/application.properties

@@ -1,10 +1,8 @@
-# mysql
-#    url=jdbc:postgresql://192.168.220.154:5432/dolphinscheduler
 # base spring data source configuration
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-#spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?useUnicode=true&characterEncoding=UTF-8
+# postgre
+spring.datasource.driver-class-name=org.postgresql.Driver
+spring.datasource.url=jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
 spring.datasource.username=root
 spring.datasource.password=root@123
 
@@ -29,7 +27,7 @@ spring.datasource.timeBetweenConnectErrorMillis=60000
 spring.datasource.minEvictableIdleTimeMillis=300000
 
 #the SQL used to check whether the connection is valid requires a query statement. If validation Query is null, testOnBorrow, testOnReturn, and testWhileIdle will not work.
-spring.datasource.validationQuery=SELECT 1 FROM DUAL
+spring.datasource.validationQuery=SELECT 1
 
 #check whether the connection is valid for timeout, in seconds
 spring.datasource.validationQueryTimeout=3
@@ -57,21 +55,21 @@ mybatis-plus.mapper-locations=classpath*:/org.apache.dolphinscheduler.dao.mapper
 
 mybatis-plus.typeEnumsPackage=org.apache.dolphinscheduler.*.enums
 
-#实体扫描，多个package用逗号或者分号分隔
+#Entity scan, where multiple packages are separated by a comma or semicolon
 mybatis-plus.typeAliasesPackage=org.apache.dolphinscheduler.dao.entity
 
-#主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
+#Primary key type AUTO:" database ID AUTO ", INPUT:" user INPUT ID", ID_WORKER:" global unique ID (numeric type unique ID)", UUID:" global unique ID UUID";
 mybatis-plus.global-config.db-config.id-type=AUTO
 
-#字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
+#Field policy IGNORED:" ignore judgment ",NOT_NULL:" not NULL judgment "),NOT_EMPTY:" not NULL judgment"
 mybatis-plus.global-config.db-config.field-strategy=NOT_NULL
 
-#驼峰下划线转换
+#The hump underline is converted
 mybatis-plus.global-config.db-config.column-underline=true
 mybatis-plus.global-config.db-config.logic-delete-value=-1
 mybatis-plus.global-config.db-config.logic-not-delete-value=0
 mybatis-plus.global-config.db-config.banner=false
-#原生配置
+#The original configuration
 mybatis-plus.configuration.map-underscore-to-camel-case=true
 mybatis-plus.configuration.cache-enabled=false
 mybatis-plus.configuration.call-setters-on-nulls=true
@@ -80,9 +78,9 @@ mybatis-plus.configuration.jdbc-type-for-null=null
 # data quality analysis is not currently in use. please ignore the following configuration
 # task record flag
 task.record.flag=false
-task.record.datasource.url=jdbc:mysql://127.0.0.1:3306/etl?characterEncoding=UTF-8
-task.record.datasource.username=xx
-task.record.datasource.password=xx
+task.record.datasource.url=jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
+task.record.datasource.username=root
+task.record.datasource.password=root@123
 
 # Logger Config
 logging.level.org.apache.dolphinscheduler.dao=debug

dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/CommandMapper.xml

@@ -9,7 +9,7 @@
         limit 1
     </select>
     <select id="countCommandState" resultType="org.apache.dolphinscheduler.dao.entity.CommandCount">
-        select cmd.command_type as state, count(1) as count
+        select cmd.command_type as command_type, count(1) as count
         from t_ds_command cmd, t_ds_process_definition process
         where cmd.process_definition_id = process.id
         <if test="projectIdArray != null and projectIdArray.length != 0">

dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="org.apache.dolphinscheduler.dao.mapper.ErrorCommandMapper">
     <select id="countCommandState" resultType="org.apache.dolphinscheduler.dao.entity.CommandCount">
-        select cmd.command_type as commandType, count(1) as count
+        select cmd.command_type as command_type, count(1) as count
         from t_ds_error_command cmd, t_ds_process_definition process
         where cmd.process_definition_id = process.id
         <if test="projectIdArray != null and projectIdArray.length != 0">

dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml

@@ -12,10 +12,14 @@
         and pd.name = #{processDefinitionName}
     </select>
     <select id="queryDefineListPaging" resultType="org.apache.dolphinscheduler.dao.entity.ProcessDefinition">
-        SELECT td.*,sc.schedule_release_state
+        SELECT td.*,sc.schedule_release_state,tu.user_name
         FROM t_ds_process_definition td
         left join (select process_definition_id,release_state as schedule_release_state from t_ds_schedules group by process_definition_id,release_state) sc on sc.process_definition_id = td.id
+        left join t_ds_user tu on  td.user_id = tu.id
         where td.project_id = #{projectId}
+        <if test=" isAdmin == false ">
+            and tu.user_type=1
+        </if>
         <if test=" searchVal != null and searchVal != ''">
             and td.name like concat('%', #{searchVal}, '%')
         </if>
@@ -24,12 +28,18 @@
         </if>
         order by sc.schedule_release_state desc,td.update_time desc
     </select>
+
     <select id="queryAllDefinitionList" resultType="org.apache.dolphinscheduler.dao.entity.ProcessDefinition">
         select *
         from t_ds_process_definition
         where project_id = #{projectId}
         order by create_time desc
     </select>
+    <select id="queryDefinitionListByTenant" resultType="org.apache.dolphinscheduler.dao.entity.ProcessDefinition">
+        select *
+        from t_ds_process_definition
+        where tenant_id = #{tenantId}
+    </select>
     <select id="queryDefinitionListByIdList" resultType="org.apache.dolphinscheduler.dao.entity.ProcessDefinition">
         select *
         from t_ds_process_definition
@@ -43,6 +53,9 @@
         FROM t_ds_process_definition td
         JOIN t_ds_user tu on tu.id=td.user_id
         where 1 = 1
+        <if test=" isAdmin == false ">
+            and tu.user_type=1
+        </if>
         <if test="projectIds != null and projectIds.length != 0">
             and td.project_id in
             <foreach collection="projectIds" index="index" item="i" open="(" separator="," close=")">
@@ -51,6 +64,16 @@
         </if>
         group by td.user_id,tu.user_name
     </select>
-
-
+    <select id="queryByDefineId" resultType="org.apache.dolphinscheduler.dao.entity.ProcessDefinition">
+        SELECT
+            pd.*, u.user_name,
+            p.name AS project_name
+        FROM
+            t_ds_process_definition pd,
+            t_ds_user u,
+            t_ds_project p
+        WHERE
+            pd.user_id = u.id AND pd.project_id = p.id
+        AND pd.id = #{processDefineId}
+    </select>
 </mapper>

dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml

@@ -19,6 +19,35 @@
         </foreach>
         order by id asc
     </select>
+
+    <select id="queryByTenantIdAndStatus" resultType="org.apache.dolphinscheduler.dao.entity.ProcessInstance">
+        select *
+        from t_ds_process_instance
+        where 1=1
+        <if test="tenantId != -1">
+            and tenant_id =#{tenantId}
+        </if>
+        and state in
+        <foreach collection="states" item="i" open="(" close=")" separator=",">
+            #{i}
+        </foreach>
+        order by id asc
+    </select>
+
+    <select id="queryByWorkerGroupIdAndStatus" resultType="org.apache.dolphinscheduler.dao.entity.ProcessInstance">
+        select *
+        from t_ds_process_instance
+        where 1=1
+        <if test="workerGroupId != -1">
+            and worker_group_id =#{workerGroupId}
+        </if>
+        and state in
+        <foreach collection="states" item="i" open="(" close=")" separator=",">
+            #{i}
+        </foreach>
+        order by id asc
+    </select>
+
     <select id="queryProcessInstanceListPaging" resultType="org.apache.dolphinscheduler.dao.entity.ProcessInstance">
         select instance.*
         from t_ds_process_instance instance
@@ -59,6 +88,19 @@
         set state = #{destState}
         where state = #{originState}
     </update>
+
+    <update id="updateProcessInstanceByTenantId">
+        update t_ds_process_instance
+        set tenant_id = #{destTenantId}
+        where tenant_id = #{originTenantId}
+    </update>
+
+    <update id="updateProcessInstanceByWorkerGroupId">
+        update t_ds_process_instance
+        set worker_group_id = #{destWorkerGroupId}
+        where worker_group_id = #{originWorkerGroupId}
+    </update>
+
     <select id="countInstanceStateByUser" resultType="org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount">
         select t.state, count(0) as count
         from t_ds_process_instance t

dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/SessionMapper.xml

@@ -6,4 +6,10 @@
         from t_ds_session
         where user_id = #{userId}
     </select>
+
+    <select id="queryByUserIdAndIp" resultType="org.apache.dolphinscheduler.dao.entity.Session">
+        select *
+        from t_ds_session
+        where user_id = #{userId} AND ip = #{ip}
+    </select>
 </mapper>

dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml

@@ -50,7 +50,6 @@
                 #{i}
             </foreach>
         </if>
-        and t.flag = 1
         <if test="startTime != null and endTime != null">
             and t.start_time > #{startTime} and t.start_time <![CDATA[ <= ]]> #{endTime}
         </if>

dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UdfFuncMapper.xml

@@ -12,7 +12,7 @@
             </foreach>
         </if>
         <if test="funcNames != null and funcNames != ''">
-            and func_name = #{funcName}
+            and func_name = #{funcNames}
         </if>
         order by id asc
     </select>
@@ -21,7 +21,7 @@
         from t_ds_udfs
         where 1=1
         <if test="searchVal!= null and searchVal != ''">
-            and name like concat('%', #{searchVal}, '%')
+            and func_name like concat('%', #{searchVal}, '%')
         </if>
         <if test="userId != 0">
             and id in (

dockerfile/conf/dolphinscheduler/conf/org/apache/dolphinscheduler/dao/mapper/UserMapper.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="org.apache.dolphinscheduler.dao.mapper.UserMapper">
-
     <select id="queryAllGeneralUser" resultType="org.apache.dolphinscheduler.dao.entity.User">
         select * from t_ds_user
         where user_type=1;
@@ -14,7 +13,6 @@
         select * from t_ds_user
         where user_name=#{userName} and user_password = #{password}
     </select>
-
     <select id="queryUserPaging" resultType="org.apache.dolphinscheduler.dao.entity.User">
         select u.id,u.user_name,u.user_password,u.user_type,u.email,u.phone,u.tenant_id,u.create_time,
         u.update_time,t.tenant_name,
@@ -28,20 +26,22 @@
         </if>
         order by u.update_time desc
     </select>
-
     <select id="queryDetailsById" resultType="org.apache.dolphinscheduler.dao.entity.User">
         select u.*, t.tenant_name,
         case when u.queue <![CDATA[ <> ]]>  '' then u.queue else q.queue_name end as queue_name
         from t_ds_user u,t_ds_tenant t,t_ds_queue q
         WHERE u.tenant_id = t.id and t.queue_id = q.id and u.id = #{userId}
     </select>
-
     <select id="queryUserListByAlertGroupId" resultType="org.apache.dolphinscheduler.dao.entity.User">
       select u.*
       from t_ds_user u, t_ds_relation_user_alertgroup rel
-      where u.id = rel.user_id AND u.user_type = 1 AND rel.alertgroup_id = #{alertgroupId}
+      where u.id = rel.user_id AND rel.alertgroup_id = #{alertgroupId}
+    </select>
+    <select id="queryUserListByTenant" resultType="org.apache.dolphinscheduler.dao.entity.User">
+      select *
+      from t_ds_user
+      where tenant_id = #{tenantId}
     </select>
-
     <select id="queryTenantCodeByUserId" resultType="org.apache.dolphinscheduler.dao.entity.User">
         SELECT  u.*,t.tenant_code
         FROM  t_ds_user u, t_ds_tenant t

dockerfile/conf/dolphinscheduler/conf/quartz.properties

@@ -31,8 +31,8 @@ org.quartz.jobStore.dataSource = myDs
 # Configure Datasources
 #============================================================================
 org.quartz.dataSource.myDs.connectionProvider.class = org.apache.dolphinscheduler.server.quartz.DruidConnectionProvider
-org.quartz.dataSource.myDs.driver = com.mysql.jdbc.Driver
-org.quartz.dataSource.myDs.URL=jdbc:mysql://127.0.0.1:3306/dolphinscheduler?characterEncoding=utf8
+org.quartz.dataSource.myDs.driver = org.postgresql.Driver
+org.quartz.dataSource.myDs.URL=jdbc:postgresql://127.0.0.1:5432/dolphinscheduler
 org.quartz.dataSource.myDs.user=root
 org.quartz.dataSource.myDs.password=root@123
 org.quartz.dataSource.myDs.maxConnections = 10

dockerfile/startup.sh

@@ -1,39 +1,16 @@
-#! /bin/bash
 
 set -e
-if [ `netstat -anop|grep mysql|wc -l` -gt 0 ];then
-                echo "MySQL is Running."
-else
-	MYSQL_ROOT_PWD="root@123"
-    ESZ_DB="dolphinscheduler"
-	echo "start mysql service"
-	chown -R mysql:mysql /var/lib/mysql /var/run/mysqld
-	find /var/lib/mysql -type f -exec touch {} \; && service mysql restart $ sleep 10
-	if [ ! -f /nohup.out ];then
-		echo "setting mysql password"
-		mysql --user=root --password=root -e "UPDATE mysql.user set authentication_string=password('$MYSQL_ROOT_PWD') where user='root'; FLUSH PRIVILEGES;"
-
-		echo "setting mysql permission"
-		mysql --user=root --password=$MYSQL_ROOT_PWD -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '$MYSQL_ROOT_PWD' WITH GRANT OPTION; FLUSH PRIVILEGES;"
-		echo "create dolphinscheduler database"
-		mysql --user=root --password=$MYSQL_ROOT_PWD -e "CREATE DATABASE IF NOT EXISTS \`$ESZ_DB\` CHARACTER SET utf8 COLLATE utf8_general_ci; FLUSH PRIVILEGES;"
-		echo "import mysql data"
-		nohup /opt/dolphinscheduler/script/create-dolphinscheduler.sh &
-		sleep 90
-	fi
-
-	if [ `mysql --user=root --password=$MYSQL_ROOT_PWD -s -r -e  "SELECT count(TABLE_NAME) FROM information_schema.TABLES WHERE TABLE_SCHEMA='dolphinscheduler';" | grep -v count` -eq 38 ];then
-		echo "\`$ESZ_DB\` the number of tables is correct"
-	else
-		echo "\`$ESZ_DB\` the number of tables is incorrect"
-		mysql --user=root --password=$MYSQL_ROOT_PWD  -e "DROP DATABASE \`$ESZ_DB\`;"
-		echo "create dolphinscheduler database"
-                mysql --user=root --password=$MYSQL_ROOT_PWD -e "CREATE DATABASE IF NOT EXISTS \`$ESZ_DB\` CHARACTER SET utf8 COLLATE utf8_general_ci; FLUSH PRIVILEGES;"
-                echo "import mysql data"
-                nohup /opt/dolphinscheduler/script/create-dolphinscheduler.sh &
-                sleep 90
-	fi
-fi
+	echo "start postgresql service"
+    /etc/init.d/postgresql restart
+    echo "create user and init db"
+    sudo -u postgres psql <<'ENDSSH'
+create user root with password 'root@123';
+create database dolphinscheduler owner root;
+grant all privileges on database dolphinscheduler to root;
+\q
+ENDSSH
+    echo "import sql data"
+    /opt/dolphinscheduler/script/create-dolphinscheduler.sh
 
 /opt/zookeeper/bin/zkServer.sh restart