Skip to content

fixbug: varPool value is error #7724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhuangchong merged 8 commits into from
Feb 23, 2022
Merged

fixbug: varPool value is error #7724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0813b70
Update ProcessDefinitionServiceImpl.java
Ivan0626 Dec 17, 2021
e49b2cc
Merge branch 'apache:dev' into dev
Ivan0626 Dec 30, 2021
213fa88
Update AbstractCommandExecutor.java
Ivan0626 Dec 30, 2021
6c42907
Merge branch 'apache:dev' into dev
Ivan0626 Jan 11, 2022
b1cdda6
Update TaskConstants.java
Ivan0626 Jan 11, 2022
fbcb9b7
Update AbstractCommandExecutor.java
Ivan0626 Jan 11, 2022
4e2df98
Merge branch 'apache:dev' into dev
Ivan0626 Jan 15, 2022
b627b6a
Merge branch 'dev' into dev
zhuangchong Feb 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/TaskConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ private TaskConstants() {
}

public static final String APPLICATION_REGEX = "application_\\d+_\\d+";

public static final String SETVALUE_REGEX = "\\$\\{setValue\\(([^)]*)\\)}";

/**
* string false
Expand Down Expand Up @@ -369,4 +371,5 @@ private TaskConstants() {
* data.quality.error.output.path
*/
public static final String DATA_QUALITY_ERROR_OUTPUT_PATH = "data-quality.error.output.path";

}
20 changes: 19 additions & 1 deletion ...pi/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ public abstract class AbstractCommandExecutor {
* rules for extracting application ID
*/
protected static final Pattern APPLICATION_REGEX = Pattern.compile(TaskConstants.APPLICATION_REGEX);

/**
* rules for extracting Var Pool
*/
protected static final Pattern SETVALUE_REGEX = Pattern.compile(TaskConstants.SETVALUE_REGEX);

protected StringBuilder varPool = new StringBuilder();
/**
Expand Down Expand Up @@ -318,7 +323,7 @@ private void parseProcessOutput(Process process) {
String line;
while ((line = inReader.readLine()) != null) {
if (line.startsWith("${setValue(")) {
varPool.append(line, "${setValue(".length(), line.length() - 2);
varPool.append(findVarPool(line));
varPool.append("$VarPool$");
} else {
logBuffer.add(line);
Expand Down Expand Up @@ -403,6 +408,19 @@ private List<String> convertFile2List(String filename) {

return lineList;
}

/**
* find var pool
* @param line
* @return
*/
private String findVarPool(String line){
Matcher matcher = SETVALUE_REGEX.matcher(line);
if (matcher.find()) {
return matcher.group(1);
}
return null;
}

/**
* find app id
Expand Down