Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java

@@ -98,7 +98,7 @@ public class ExecutorService extends BaseService{
                                                    String receivers, String receiversCc, RunMode runMode,
                                                    Priority processInstancePriority, int workerGroupId, Integer timeout) throws ParseException {
         Map<String, Object> result = new HashMap<>(5);
-        // timeout is valid
+        // timeout is invalid
         if (timeout <= 0 || timeout > MAX_TASK_TIMEOUT) {
             putMsg(result,Status.TASK_TIMEOUT_PARAMS_ERROR);
             return result;

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ZKNodeType.java

@@ -22,10 +22,10 @@ package org.apache.dolphinscheduler.common.enums;
 public enum ZKNodeType {
 
     /**
-     * 0 do not send warning;
-     * 1 send if process success;
-     * 2 send if process failed;
-     * 3 send if process ending;
+     * 0 master node;
+     * 1 worker node;
+     * 2 dead_server node;
+     * 3 task_queue node;
      */
     MASTER, WORKER, DEAD_SERVER, TASK_QUEUE;
 }

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java

@@ -299,7 +299,11 @@ public class SqlTask extends AbstractTask {
                     while (resultSet.next()) {
                         JSONObject mapOfColValues = new JSONObject(true);
                         for (int i = 1; i <= num; i++) {
-                            mapOfColValues.put(md.getColumnName(i), resultSet.getObject(i));
+                            if (StringUtils.isNotEmpty(md.getColumnLabel(i))) {
+                                mapOfColValues.put(md.getColumnLabel(i), resultSet.getObject(i));
+                            } else {
+                                mapOfColValues.put(md.getColumnName(i), resultSet.getObject(i));
+                            }
                         }
                         resultJSONArray.add(mapOfColValues);
                     }