Commit ea1c653e authored by lenboo's avatar lenboo
Browse files

merge from dev

parents 8e7bdfa2 518d03b6

dolphinscheduler-api/src/main/resources/application-api.properties

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ server.servlet.session.timeout=7200 


server.servlet.context-path=/dolphinscheduler/



# Set time zone

spring.jackson.time-zone=GMT+8



# file size limit for upload

spring.servlet.multipart.max-file-size=1024MB

spring.servlet.multipart.max-request-size=1024MB

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/DependentUtils.java

+1 −3
Original line number Diff line number Diff line
@@ -40,10 +40,8 @@ public class DependentUtils { 
            case AND:

                if(dependResultList.contains(DependResult.FAILED)){

                    dependResult = DependResult.FAILED;

                }else if(dependResultList.contains(DependResult.WAITING)){

                } if(dependResultList.contains(DependResult.WAITING)){

                    dependResult = DependResult.WAITING;

                }else{

                    dependResult = DependResult.SUCCESS;

                }

                break;

            case OR:

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/IpUtils.java

+5 −6
Original line number Diff line number Diff line
@@ -49,12 +49,11 @@ public class IpUtils { 
    ipNumbers[2] = ipLong >> 8 & tmp;

    ipNumbers[3] = ipLong & tmp;



    StringBuilder sb = new StringBuilder(16);

    sb.append(ipNumbers[0]).append(DOT)

            .append(ipNumbers[1]).append(DOT)

            .append(ipNumbers[2]).append(DOT)

            .append(ipNumbers[3]);

    return sb.toString();

    String sb = ipNumbers[0] + DOT +

            ipNumbers[1] + DOT +

            ipNumbers[2] + DOT +

            ipNumbers[3];

    return sb;

  }



}

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/SchemaUtils.java

+3 −7
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import org.slf4j.LoggerFactory; 
import java.io.File;

import java.io.FileInputStream;

import java.io.FileNotFoundException;

import java.io.IOException;

import java.util.ArrayList;

import java.util.Collections;

import java.util.Comparator;
@@ -96,11 +95,11 @@ public class SchemaUtils { 


		String[] schemaVersionArr = schemaVersion.split("\\.");

		String[] versionArr = version.split("\\.");

		int arrLength = schemaVersionArr.length < versionArr.length ? schemaVersionArr.length : versionArr.length;

		int arrLength = Math.min(schemaVersionArr.length, versionArr.length);

		for(int i = 0 ; i < arrLength ; i++) {

			if(Integer.valueOf(schemaVersionArr[i]) > Integer.valueOf(versionArr[i])) {

			if(Integer.parseInt(schemaVersionArr[i]) > Integer.parseInt(versionArr[i])) {

				return true;

			}else if(Integer.valueOf(schemaVersionArr[i]) < Integer.valueOf(versionArr[i])) {

			}else if(Integer.parseInt(schemaVersionArr[i]) < Integer.parseInt(versionArr[i])) {

				return false;

			}

		}
@@ -121,9 +120,6 @@ public class SchemaUtils { 
		} catch (FileNotFoundException e) {

			logger.error(e.getMessage(),e);

			throw new RuntimeException("Failed to get the product version description file. The file could not be found", e);

		} catch (IOException e) {

			logger.error(e.getMessage(),e);

			throw new RuntimeException("Failed to get product version number description file, failed to read the file", e);

		}

		return soft_version;

	}

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

+3 −10
Original line number Diff line number Diff line
@@ -270,17 +270,10 @@ public class SqlTask extends AbstractTask { 
        String result = JSONUtils.toJsonString(resultJSONArray);

        logger.debug("execute sql : {}", result);



        // if there is a result set

        if (!resultJSONArray.isEmpty(null) ) {

            if (StringUtils.isNotEmpty(sqlParameters.getTitle())) {

                sendAttachment(sqlParameters.getTitle(),

                        JSONUtils.toJsonString(resultJSONArray));

            }else{

                sendAttachment(taskExecutionContext.getTaskName() + " query resultsets ",

        sendAttachment(StringUtils.isNotEmpty(sqlParameters.getTitle()) ?

                        sqlParameters.getTitle(): taskExecutionContext.getTaskName() + " query result sets",

                JSONUtils.toJsonString(resultJSONArray));

    }

        }

    }



    /**

     *  pre sql