@ -40,14 +40,12 @@ import org.apache.dolphinscheduler.spi.enums.Flag;
import org.apache.commons.collections4.CollectionUtils ;
import org.apache.commons.collections4.CollectionUtils ;
import org.apache.commons.io.FileUtils ;
import org.apache.commons.io.FileUtils ;
import org.apache.commons.lang3.StringUtils ;
import org.apache.commons.lang3.SystemUtils ;
import org.apache.commons.lang3.SystemUtils ;
import java.io.File ;
import java.io.File ;
import java.nio.charset.StandardCharsets ;
import java.nio.charset.StandardCharsets ;
import java.nio.file.Files ;
import java.nio.file.Files ;
import java.nio.file.Path ;
import java.nio.file.Path ;
import java.nio.file.Paths ;
import java.nio.file.StandardOpenOption ;
import java.nio.file.StandardOpenOption ;
import java.nio.file.attribute.FileAttribute ;
import java.nio.file.attribute.FileAttribute ;
import java.nio.file.attribute.PosixFilePermission ;
import java.nio.file.attribute.PosixFilePermission ;
@ -60,10 +58,9 @@ import java.sql.SQLException;
import java.util.ArrayList ;
import java.util.ArrayList ;
import java.util.List ;
import java.util.List ;
import java.util.Map ;
import java.util.Map ;
import java.util.Optional ;
import java.util.Set ;
import java.util.Set ;
import java.util.concurrent.ExecutionException ;
import java.util.concurrent.ExecutionException ;
import java.util.regex.Matcher ;
import java.util.regex.Pattern ;
import com.alibaba.druid.sql.ast.SQLStatement ;
import com.alibaba.druid.sql.ast.SQLStatement ;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr ;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr ;
@ -87,9 +84,9 @@ public class DataxTask extends AbstractTask {
public static final String CUSTOM_PARAM = " -D%s='%s'" ;
public static final String CUSTOM_PARAM = " -D%s='%s'" ;
/ * *
/ * *
* python process ( datax only supports version 2 . 7 by default )
* python process ( datax only supports version 2 . 7 by default )
* todo : Create a shell script to execute the datax task , and read the python version from the env , so we can support multiple versions of datax python
* /
* /
private static final String DATAX_PYTHON = "python2.7" ;
private static final String DATAX_PYTHON = Optional . ofNullable ( System . getenv ( "DATAX_PYTHON" ) ) . orElse ( "python2.7" ) ;
private static final Pattern PYTHON_PATH_PATTERN = Pattern . compile ( "/bin/python[\\d.]*$" ) ;
/ * *
/ * *
* select all
* select all
@ -399,7 +396,7 @@ public class DataxTask extends AbstractTask {
}
}
// datax python command
// datax python command
String sbr = getPythonCommand ( ) +
String sbr = DATAX_PYTHON +
" " +
" " +
DATAX_PATH +
DATAX_PATH +
" " +
" " +
@ -441,23 +438,6 @@ public class DataxTask extends AbstractTask {
return customParameters ;
return customParameters ;
}
}
public String getPythonCommand ( ) {
String pythonHome = System . getenv ( "PYTHON_HOME" ) ;
return getPythonCommand ( pythonHome ) ;
}
public String getPythonCommand ( String pythonHome ) {
if ( StringUtils . isEmpty ( pythonHome ) ) {
return DATAX_PYTHON ;
}
String pythonBinPath = "/bin/" + DATAX_PYTHON ;
Matcher matcher = PYTHON_PATH_PATTERN . matcher ( pythonHome ) ;
if ( matcher . find ( ) ) {
return matcher . replaceAll ( pythonBinPath ) ;
}
return Paths . get ( pythonHome , pythonBinPath ) . toString ( ) ;
}
public String loadJvmEnv ( DataxParameters dataXParameters ) {
public String loadJvmEnv ( DataxParameters dataXParameters ) {
int xms = Math . max ( dataXParameters . getXms ( ) , 1 ) ;
int xms = Math . max ( dataXParameters . getXms ( ) , 1 ) ;
int xmx = Math . max ( dataXParameters . getXmx ( ) , 1 ) ;
int xmx = Math . max ( dataXParameters . getXmx ( ) , 1 ) ;