add support for postgresql in upgrade database (#801)

* Remove useless dependencies and add jsp-2.1-6.1.14

* Determine if principal is empty in getJdbcUrl method

* fix bug  when register worker but create master node in zookeeper

* Remove useless dependencies such as hive-shims and log4j

* upgrade commons-email from 1.2 to 1.5 and remove mail-1.4.5.jar

* add support for postgresql in upgrade database

* add support for postgresql in upgrade database

escheduler-common/src/main/java/cn/escheduler/common/utils/MysqlUtils.java → escheduler-common/src/main/java/cn/escheduler/common/utils/ConnectionUtils.java

@@ -21,16 +21,16 @@ import org.slf4j.LoggerFactory;
 
 import java.sql.*;
 
-public class MysqlUtils {
+public class ConnectionUtils {
 
-	public static final Logger logger = LoggerFactory.getLogger(MysqlUtils.class);
+	public static final Logger logger = LoggerFactory.getLogger(ConnectionUtils.class);
 
-	private static MysqlUtils instance;
+	private static ConnectionUtils instance;
 
-	MysqlUtils() {
+	ConnectionUtils() {
 	}
 
-	public static MysqlUtils getInstance() {
+	public static ConnectionUtils getInstance() {
 		if (null == instance) {
 			syncInit();
 		}
@@ -39,7 +39,7 @@ public class MysqlUtils {
 
 	private static synchronized void syncInit() {
 		if (instance == null) {
-			instance = new MysqlUtils();
+			instance = new ConnectionUtils();
 		}
 	}
 
@@ -76,7 +76,7 @@ public class MysqlUtils {
 	}
 
 	public static void releaseResource(ResultSet rs, PreparedStatement ps, Connection conn) {
-		MysqlUtils.getInstance().release(rs,ps,conn);
+		ConnectionUtils.getInstance().release(rs,ps,conn);
 		if (null != rs) {
 			try {
 				rs.close();

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/EschedulerManager.java → escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/DolphinSchedulerManager.java

@@ -16,6 +16,7 @@
  */
 package cn.escheduler.dao.upgrade;
 
+import cn.escheduler.common.enums.DbType;
 import cn.escheduler.common.utils.SchemaUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,30 +26,51 @@ import java.util.List;
 /**
  * upgrade manager
  */
-public class EschedulerManager {
-    private static final Logger logger = LoggerFactory.getLogger(EschedulerManager.class);
-    UpgradeDao upgradeDao = UpgradeDao.getInstance();
+public class DolphinSchedulerManager {
+    private static final Logger logger = LoggerFactory.getLogger(DolphinSchedulerManager.class);
+    UpgradeDao upgradeDao;
+
+    private void initUpgradeDao() {
+        DbType dbType = UpgradeDao.getDbType();
+        if (dbType != null) {
+            switch (dbType) {
+                case MYSQL:
+                    upgradeDao = MysqlUpgradeDao.getInstance();
+                    break;
+                case POSTGRESQL:
+                    upgradeDao = PostgresqlUpgradeDao.getInstance();
+                    break;
+                default:
+                    logger.error("not support sql type: {},can't upgrade", dbType);
+                    throw new IllegalArgumentException("not support sql type,can't upgrade");
+            }
+        }
+    }
+
+    public DolphinSchedulerManager() {
+        initUpgradeDao();
+    }
 
-    public void initEscheduler() {
+    public void initDolphinScheduler() {
         // Determines whether the escheduler table structure has been init
         if(upgradeDao.isExistsTable("t_escheduler_version") || upgradeDao.isExistsTable("t_escheduler_queue")) {
             logger.info("The database has been initialized. Skip the initialization step");
             return;
         }
-        this.initEschedulerSchema();
+        this.initDolphinSchedulerSchema();
     }
 
-    public void initEschedulerSchema() {
+    public void initDolphinSchedulerSchema() {
 
-        logger.info("Start initializing the escheduler manager mysql table structure");
-        upgradeDao.initEschedulerSchema();
+        logger.info("Start initializing the DolphinScheduler manager table structure");
+        upgradeDao.initSchema();
     }
 
 
     /**
-     * upgrade escheduler
+     * upgrade DolphinScheduler
      */
-    public void upgradeEscheduler() throws Exception{
+    public void upgradeDolphinScheduler() throws Exception{
 
         // Gets a list of all upgrades
         List<String> schemaList = SchemaUtils.getAllSchemaList();
@@ -76,11 +98,11 @@ public class EschedulerManager {
                 schemaVersion = schemaDir.split("_")[0];
                 if(SchemaUtils.isAGreatVersion(schemaVersion , version)) {
 
-                    logger.info("upgrade escheduler metadata version from " + version + " to " + schemaVersion);
+                    logger.info("upgrade DolphinScheduler metadata version from " + version + " to " + schemaVersion);
 
 
-                    logger.info("Begin upgrading escheduler's mysql table structure");
-                    upgradeDao.upgradeEscheduler(schemaDir);
+                    logger.info("Begin upgrading DolphinScheduler's table structure");
+                    upgradeDao.upgradeDolphinScheduler(schemaDir);
                     if(SchemaUtils.isAGreatVersion(version,"1.0.1")){
                         version = upgradeDao.getCurrentVersion();
                     }else {

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/MysqlUpgradeDao.java

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.dao.upgrade;
+
+import cn.escheduler.common.utils.ConnectionUtils;
+import cn.escheduler.dao.datasource.ConnectionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class MysqlUpgradeDao extends UpgradeDao {
+
+    public static final Logger logger = LoggerFactory.getLogger(UpgradeDao.class);
+    private static final String T_VERSION_NAME = "t_escheduler_version";
+    private static final String rootDir = System.getProperty("user.dir");
+
+    @Override
+    protected void init() {
+
+    }
+
+    private static class MysqlUpgradeDaoHolder {
+        private static final MysqlUpgradeDao INSTANCE = new MysqlUpgradeDao();
+    }
+
+    private MysqlUpgradeDao() {
+    }
+
+    public static final MysqlUpgradeDao getInstance() {
+        return MysqlUpgradeDaoHolder.INSTANCE;
+    }
+
+
+    /**
+     * Determines whether a table exists
+     * @param tableName
+     * @return
+     */
+    public boolean isExistsTable(String tableName) {
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            ResultSet rs = conn.getMetaData().getTables(null, null, tableName, null);
+            if (rs.next()) {
+                return true;
+            } else {
+                return false;
+            }
+
+        } catch (SQLException e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            ConnectionUtils.releaseResource(null, null, conn);
+
+        }
+
+    }
+
+    /**
+     * Determines whether a field exists in the specified table
+     * @param tableName
+     * @param columnName
+     * @return
+     */
+    public boolean isExistsColumn(String tableName,String columnName) {
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            ResultSet rs = conn.getMetaData().getColumns(null,null,tableName,columnName);
+            if (rs.next()) {
+                return true;
+            } else {
+                return false;
+            }
+
+        } catch (SQLException e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            ConnectionUtils.releaseResource(null, null, conn);
+
+        }
+
+    }
+
+}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/PostgresqlUpgradeDao.java

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.escheduler.dao.upgrade;
+
+import cn.escheduler.common.utils.ConnectionUtils;
+import cn.escheduler.dao.datasource.ConnectionFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class PostgresqlUpgradeDao extends UpgradeDao {
+
+    public static final Logger logger = LoggerFactory.getLogger(UpgradeDao.class);
+    private static final String T_VERSION_NAME = "t_escheduler_version";
+    private static final String rootDir = System.getProperty("user.dir");
+    private static final String schema = getSchema();
+
+    @Override
+    protected void init() {
+
+    }
+
+    private static class PostgresqlUpgradeDaoHolder {
+        private static final PostgresqlUpgradeDao INSTANCE = new PostgresqlUpgradeDao();
+    }
+
+    private PostgresqlUpgradeDao() {
+    }
+
+    public static final PostgresqlUpgradeDao getInstance() {
+        return PostgresqlUpgradeDaoHolder.INSTANCE;
+    }
+
+
+    @Override
+    public void initSchema(String initSqlPath) {
+        super.initSchema(initSqlPath);
+    }
+
+    private static String getSchema(){
+        Connection conn = null;
+        PreparedStatement pstmt = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            pstmt = conn.prepareStatement("select current_schema()");
+            ResultSet resultSet = pstmt.executeQuery();
+            while (resultSet.next()){
+                if(resultSet.isFirst()){
+                    return resultSet.getString(1);
+                }
+            }
+        } catch (SQLException e) {
+            logger.error(e.getMessage(),e);
+
+        } finally {
+            ConnectionUtils.releaseResource(null, null, conn);
+        }
+        return "";
+    }
+
+    /**
+     * Determines whether a table exists
+     * @param tableName
+     * @return
+     */
+    public boolean isExistsTable(String tableName) {
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+
+            ResultSet rs = conn.getMetaData().getTables(null, schema, tableName, null);
+            if (rs.next()) {
+                return true;
+            } else {
+                return false;
+            }
+
+        } catch (SQLException e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            ConnectionUtils.releaseResource(null, null, conn);
+        }
+
+    }
+
+    /**
+     * Determines whether a field exists in the specified table
+     * @param tableName
+     * @param columnName
+     * @return
+     */
+    public boolean isExistsColumn(String tableName,String columnName) {
+        Connection conn = null;
+        try {
+            conn = ConnectionFactory.getDataSource().getConnection();
+            ResultSet rs = conn.getMetaData().getColumns(null,schema,tableName,columnName);
+            if (rs.next()) {
+                return true;
+            } else {
+                return false;
+            }
+
+        } catch (SQLException e) {
+            logger.error(e.getMessage(),e);
+            throw new RuntimeException(e.getMessage(),e);
+        } finally {
+            ConnectionUtils.releaseResource(null, null, conn);
+
+        }
+
+    }
+
+}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/UpgradeDao.java

@@ -16,7 +16,8 @@
  */
 package cn.escheduler.dao.upgrade;
 
-import cn.escheduler.common.utils.MysqlUtils;
+import cn.escheduler.common.enums.DbType;
+import cn.escheduler.common.utils.ConnectionUtils;
 import cn.escheduler.common.utils.ScriptRunner;
 import cn.escheduler.dao.AbstractBaseDao;
 import cn.escheduler.dao.datasource.ConnectionFactory;
@@ -29,8 +30,9 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.text.MessageFormat;
 
-public class UpgradeDao extends AbstractBaseDao {
+public abstract class UpgradeDao extends AbstractBaseDao {
 
     public static final Logger logger = LoggerFactory.getLogger(UpgradeDao.class);
     private static final String T_VERSION_NAME = "t_escheduler_version";
@@ -41,35 +43,59 @@ public class UpgradeDao extends AbstractBaseDao {
 
     }
 
-    private static class UpgradeDaoHolder {
-        private static final UpgradeDao INSTANCE = new UpgradeDao();
-    }
-
-    private UpgradeDao() {
+    /**
+     * get db type
+     * @return
+     */
+    public static DbType getDbType(){
+        try {
+            Connection conn = ConnectionFactory.getDataSource().getConnection();
+            String name = conn.getMetaData().getDatabaseProductName().toUpperCase();
+            return DbType.valueOf(name);
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
+            return null;
+        }
     }
 
-    public static final UpgradeDao getInstance() {
-        return UpgradeDaoHolder.INSTANCE;
+    public void initSchema(){
+        DbType dbType = getDbType();
+        String initSqlPath = "";
+        if (dbType != null) {
+            switch (dbType) {
+                case MYSQL:
+                    initSqlPath = "/sql/create/release-1.0.0_schema/mysql/";
+                    initSchema(initSqlPath);
+                    break;
+                case POSTGRESQL:
+                    initSqlPath = "/sql/create/release-1.2.0_schema/postgresql/";
+                    initSchema(initSqlPath);
+                    break;
+                default:
+                    logger.error("not support sql type: {},can't upgrade", dbType);
+                    throw new IllegalArgumentException("not support sql type,can't upgrade");
+            }
+        }
     }
 
 
-
-    public void initEschedulerSchema() {
+    public void initSchema(String initSqlPath) {
 
         // Execute the escheduler DDL, it cannot be rolled back
-        runInitEschedulerDDL();
+        runInitDDL(initSqlPath);
 
         // Execute the escheduler DML, it can be rolled back
-        runInitEschedulerDML();
+        runInitDML(initSqlPath);
 
     }
 
-    private void runInitEschedulerDML() {
+    private void runInitDML(String initSqlPath) {
         Connection conn = null;
         if (StringUtils.isEmpty(rootDir)) {
             throw new RuntimeException("Environment variable user.dir not found");
         }
-        String mysqlSQLFilePath = rootDir + "/sql/create/release-1.0.0_schema/mysql/escheduler_dml.sql";
+        //String mysqlSQLFilePath = rootDir + "/sql/create/release-1.0.0_schema/mysql/escheduler_dml.sql";
+        String mysqlSQLFilePath = rootDir + initSqlPath + "dolphinscheduler_dml.sql";
         try {
             conn = ConnectionFactory.getDataSource().getConnection();
             conn.setAutoCommit(false);
@@ -98,18 +124,19 @@ public class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            MysqlUtils.releaseResource(null, null, conn);
+            ConnectionUtils.releaseResource(null, null, conn);
 
         }
 
     }
 
-    private void runInitEschedulerDDL() {
+    private void runInitDDL(String initSqlPath) {
         Connection conn = null;
         if (StringUtils.isEmpty(rootDir)) {
             throw new RuntimeException("Environment variable user.dir not found");
         }
-        String mysqlSQLFilePath = rootDir + "/sql/create/release-1.0.0_schema/mysql/escheduler_ddl.sql";
+        //String mysqlSQLFilePath = rootDir + "/sql/create/release-1.0.0_schema/mysql/dolphinscheduler_ddl.sql";
+        String mysqlSQLFilePath = rootDir + initSqlPath + "dolphinscheduler_ddl.sql";
         try {
             conn = ConnectionFactory.getDataSource().getConnection();
             // Execute the escheduler_ddl.sql script to create the table structure of escheduler
@@ -126,7 +153,7 @@ public class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            MysqlUtils.releaseResource(null, null, conn);
+            ConnectionUtils.releaseResource(null, null, conn);
 
         }
 
@@ -137,26 +164,7 @@ public class UpgradeDao extends AbstractBaseDao {
      * @param tableName
      * @return
      */
-    public boolean isExistsTable(String tableName) {
-        Connection conn = null;
-        try {
-            conn = ConnectionFactory.getDataSource().getConnection();
-            ResultSet rs = conn.getMetaData().getTables(null, null, tableName, null);
-            if (rs.next()) {
-                return true;
-            } else {
-                return false;
-            }
-
-        } catch (SQLException e) {
-            logger.error(e.getMessage(),e);
-            throw new RuntimeException(e.getMessage(),e);
-        } finally {
-            MysqlUtils.releaseResource(null, null, conn);
-
-        }
-
-    }
+    public abstract boolean isExistsTable(String tableName);
 
     /**
      * Determines whether a field exists in the specified table
@@ -164,26 +172,7 @@ public class UpgradeDao extends AbstractBaseDao {
      * @param columnName
      * @return
      */
-    public boolean isExistsColumn(String tableName,String columnName) {
-        Connection conn = null;
-        try {
-            conn = ConnectionFactory.getDataSource().getConnection();
-            ResultSet rs = conn.getMetaData().getColumns(null,null,tableName,columnName);
-            if (rs.next()) {
-                return true;
-            } else {
-                return false;
-            }
-
-        } catch (SQLException e) {
-            logger.error(e.getMessage(),e);
-            throw new RuntimeException(e.getMessage(),e);
-        } finally {
-            MysqlUtils.releaseResource(null, null, conn);
-
-        }
-
-    }
+    public abstract boolean isExistsColumn(String tableName,String columnName);
 
 
     public String getCurrentVersion() {
@@ -207,26 +196,26 @@ public class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException("sql: " + sql, e);
         } finally {
-            MysqlUtils.releaseResource(rs, pstmt, conn);
-
+            ConnectionUtils.releaseResource(rs, pstmt, conn);
         }
     }
 
 
-    public void upgradeEscheduler(String schemaDir) {
+    public void upgradeDolphinScheduler(String schemaDir) {
 
-        upgradeEschedulerDDL(schemaDir);
+        upgradeDolphinSchedulerDDL(schemaDir);
 
-        upgradeEschedulerDML(schemaDir);
+        upgradeDolphinSchedulerDML(schemaDir);
 
     }
 
-    private void upgradeEschedulerDML(String schemaDir) {
+    private void upgradeDolphinSchedulerDML(String schemaDir) {
         String schemaVersion = schemaDir.split("_")[0];
         if (StringUtils.isEmpty(rootDir)) {
             throw new RuntimeException("Environment variable user.dir not found");
         }
-        String mysqlSQLFilePath = rootDir + "/sql/upgrade/" + schemaDir + "/mysql/escheduler_dml.sql";
+        String mysqlSQLFilePath = MessageFormat.format("{0}/sql/upgrade/{1}/{2}/dolphinscheduler_dml.sql",rootDir,schemaDir,getDbType().name().toLowerCase());
+        logger.info("mysqlSQLFilePath"+mysqlSQLFilePath);
         Connection conn = null;
         PreparedStatement pstmt = null;
         try {
@@ -277,16 +266,16 @@ public class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            MysqlUtils.releaseResource(null, pstmt, conn);
+            ConnectionUtils.releaseResource(null, pstmt, conn);
         }
 
     }
 
-    private void upgradeEschedulerDDL(String schemaDir) {
+    private void upgradeDolphinSchedulerDDL(String schemaDir) {
         if (StringUtils.isEmpty(rootDir)) {
             throw new RuntimeException("Environment variable user.dir not found");
         }
-        String mysqlSQLFilePath = rootDir + "/sql/upgrade/" + schemaDir + "/mysql/escheduler_ddl.sql";
+        String mysqlSQLFilePath = MessageFormat.format("{0}/sql/upgrade/{1}/{2}/dolphinscheduler_dml.sql",rootDir,schemaDir,getDbType().name().toLowerCase());
         Connection conn = null;
         PreparedStatement pstmt = null;
         try {
@@ -316,7 +305,7 @@ public class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException(e.getMessage(),e);
         } finally {
-            MysqlUtils.releaseResource(null, pstmt, conn);
+            ConnectionUtils.releaseResource(null, pstmt, conn);
         }
 
     }
@@ -338,7 +327,7 @@ public class UpgradeDao extends AbstractBaseDao {
             logger.error(e.getMessage(),e);
             throw new RuntimeException("sql: " + upgradeSQL, e);
         } finally {
-            MysqlUtils.releaseResource(null, pstmt, conn);
+            ConnectionUtils.releaseResource(null, pstmt, conn);
         }
 
     }

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/CreateEscheduler.java → escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/CreateDolphinScheduler.java

@@ -16,29 +16,29 @@
  */
 package cn.escheduler.dao.upgrade.shell;
 
-import cn.escheduler.dao.upgrade.EschedulerManager;
+import cn.escheduler.dao.upgrade.DolphinSchedulerManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * init escheduler
+ * init DolphinScheduler
  *
  */
-public class CreateEscheduler {
+public class CreateDolphinScheduler {
 
-	private static final Logger logger = LoggerFactory.getLogger(CreateEscheduler.class);
+	private static final Logger logger = LoggerFactory.getLogger(CreateDolphinScheduler.class);
 
 	public static void main(String[] args) {
-		EschedulerManager eschedulerManager = new EschedulerManager();
+		DolphinSchedulerManager dolphinSchedulerManager = new DolphinSchedulerManager();
 
 		try {
-			eschedulerManager.initEscheduler();
-			logger.info("init escheduler finished");
-			eschedulerManager.upgradeEscheduler();
-			logger.info("upgrade escheduler finished");
-			logger.info("create escheduler success");
+			dolphinSchedulerManager.initDolphinScheduler();
+			logger.info("init DolphinScheduler finished");
+			dolphinSchedulerManager.upgradeDolphinScheduler();
+			logger.info("upgrade DolphinScheduler finished");
+			logger.info("create DolphinScheduler success");
 		} catch (Exception e) {
-			logger.error("create escheduler failed",e);
+			logger.error("create DolphinScheduler failed",e);
 		}
 
 	}

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/InitEscheduler.java → escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/InitDolphinScheduler.java

@@ -16,23 +16,23 @@
  */
 package cn.escheduler.dao.upgrade.shell;
 
-import cn.escheduler.dao.upgrade.EschedulerManager;
+import cn.escheduler.dao.upgrade.DolphinSchedulerManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * init escheduler
+ * init DolphinScheduler
  *
  */
-public class InitEscheduler {
+public class InitDolphinScheduler {
 
-	private static final Logger logger = LoggerFactory.getLogger(InitEscheduler.class);
+	private static final Logger logger = LoggerFactory.getLogger(InitDolphinScheduler.class);
 
 	public static void main(String[] args) {
-		Thread.currentThread().setName("manager-InitEscheduler");
-		EschedulerManager eschedulerManager = new EschedulerManager();
-		eschedulerManager.initEscheduler();
-		logger.info("init escheduler finished");
+		Thread.currentThread().setName("manager-InitDolphinScheduler");
+		DolphinSchedulerManager dolphinSchedulerManager = new DolphinSchedulerManager();
+		dolphinSchedulerManager.initDolphinScheduler();
+		logger.info("init DolphinScheduler finished");
 		
 	}
 }

escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/UpgradeEscheduler.java → escheduler-dao/src/main/java/cn/escheduler/dao/upgrade/shell/UpgradeDolphinScheduler.java

@@ -16,28 +16,26 @@
  */
 package cn.escheduler.dao.upgrade.shell;
 
-import cn.escheduler.dao.upgrade.EschedulerManager;
+import cn.escheduler.dao.upgrade.DolphinSchedulerManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * upgrade escheduler database
+ * upgrade DolphinScheduler database
  */
-public class UpgradeEscheduler {
-	private static final Logger logger = LoggerFactory.getLogger(UpgradeEscheduler.class);
+public class UpgradeDolphinScheduler {
+	private static final Logger logger = LoggerFactory.getLogger(UpgradeDolphinScheduler.class);
 
 	public static void main(String[] args) {
-		EschedulerManager eschedulerManager = new EschedulerManager();
+		DolphinSchedulerManager dolphinSchedulerManager = new DolphinSchedulerManager();
 		try {
-			eschedulerManager.upgradeEscheduler();
-			logger.info("upgrade escheduler success");
+			dolphinSchedulerManager.upgradeDolphinScheduler();
+			logger.info("upgrade DolphinScheduler success");
 		} catch (Exception e) {
 			logger.error(e.getMessage(),e);
-			logger.info("Upgrade escheduler failed");
+			logger.info("Upgrade DolphinScheduler failed");
 			throw new RuntimeException(e);
 		}
-
-		
 	}
 	
 	

script/create_escheduler.sh

@@ -13,7 +13,7 @@ export ESCHEDULER_LIB_JARS=$ESCHEDULER_HOME/lib/*
 export ESCHEDULER_OPTS="-server -Xmx1g -Xms1g -Xss512k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70"
 export STOP_TIMEOUT=5
 
-CLASS=cn.escheduler.dao.upgrade.shell.CreateEscheduler
+CLASS=cn.escheduler.dao.upgrade.shell.CreateDolphinScheduler
 
 exec_command="$ESCHEDULER_OPTS -classpath $ESCHEDULER_CONF_DIR:$ESCHEDULER_LIB_JARS $CLASS"
 

script/upgrade_escheduler.sh

@@ -13,7 +13,7 @@ export ESCHEDULER_LIB_JARS=$ESCHEDULER_HOME/lib/*
 export ESCHEDULER_OPTS="-server -Xmx1g -Xms1g -Xss512k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70"
 export STOP_TIMEOUT=5
 
-CLASS=cn.escheduler.dao.upgrade.shell.UpgradeEscheduler
+CLASS=cn.escheduler.dao.upgrade.shell.UpgradeDolphinScheduler
 
 exec_command="$ESCHEDULER_OPTS -classpath $ESCHEDULER_CONF_DIR:$ESCHEDULER_LIB_JARS $CLASS"
 

sql/create/release-1.2.0_schema/postgresql/dolphinscheduler_dml.sql

+-- Records of t_escheduler_user,user : admin , password : escheduler123
+INSERT INTO "t_escheduler_user" VALUES ('1', 'admin', '055a97b5fcd6d120372ad1976518f371', '0', 'xxx@qq.com', 'xx', '0', '2018-03-27 15:48:50', '2018-10-24 17:40:22');
+INSERT INTO "t_escheduler_alertgroup" VALUES (1, 'escheduler管理员告警组', '0', 'escheduler管理员告警组','2018-11-29 10:20:39', '2018-11-29 10:20:39');
+INSERT INTO "t_escheduler_relation_user_alertgroup" VALUES ('1', '1', '1', '2018-11-29 10:22:33', '2018-11-29 10:22:33');
+
+-- Records of t_escheduler_queue,default queue name : default
+INSERT INTO "t_escheduler_queue" VALUES ('1', 'default', 'default');
+INSERT INTO "t_escheduler_version" VALUES ('1', '1.2.0');
\ No newline at end of file

sql/soft_version

-1.1.0
\ No newline at end of file
+1.2.0
\ No newline at end of file