This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
new 901e4c4eb81 [fix](load) fix cancel load job bug, ignore CANCELLED
status job (#25118)
901e4c4eb81 is described below
commit 901e4c4eb812cd648affc518bfe806c46cb56bed
Author: huanghg1994 <[email protected]>
AuthorDate: Fri Oct 20 20:01:49 2023 +0800
[fix](load) fix cancel load job bug, ignore CANCELLED status job (#25118)
---
.../org/apache/doris/load/loadv2/LoadManager.java | 40 +++++++++++++---------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java
b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java
index e5bef1b35ac..cb825ac96e2 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/LoadManager.java
@@ -242,23 +242,29 @@ public class LoadManager implements Writable {
String state = stmt.getState();
PatternMatcher matcher =
PatternMatcherWrapper.createMysqlPattern(label,
CaseSensibility.LABEL.getCaseSensibility());
- matchLoadJobs.addAll(loadJobs.stream().filter(job -> {
- if (stmt.getOperator() != null) {
- // compound
- boolean labelFilter =
- label.contains("%") ? matcher.match(job.getLabel()) :
job.getLabel().equalsIgnoreCase(label);
- boolean stateFilter =
job.getState().name().equalsIgnoreCase(state);
- return Operator.AND.equals(stmt.getOperator()) ? labelFilter
&& stateFilter :
- labelFilter || stateFilter;
- }
- if (StringUtils.isNotEmpty(label)) {
- return label.contains("%") ? matcher.match(job.getLabel()) :
job.getLabel().equalsIgnoreCase(label);
- }
- if (StringUtils.isNotEmpty(state)) {
- return job.getState().name().equalsIgnoreCase(state);
- }
- return false;
- }).collect(Collectors.toList()));
+ matchLoadJobs.addAll(
+ loadJobs.stream()
+ .filter(job -> job.getState() != JobState.CANCELLED)
+ .filter(job -> {
+ if (stmt.getOperator() != null) {
+ // compound
+ boolean labelFilter =
+ label.contains("%") ?
matcher.match(job.getLabel())
+ :
job.getLabel().equalsIgnoreCase(label);
+ boolean stateFilter =
job.getState().name().equalsIgnoreCase(state);
+ return Operator.AND.equals(stmt.getOperator()) ?
labelFilter && stateFilter :
+ labelFilter || stateFilter;
+ }
+ if (StringUtils.isNotEmpty(label)) {
+ return label.contains("%") ?
matcher.match(job.getLabel())
+ : job.getLabel().equalsIgnoreCase(label);
+ }
+ if (StringUtils.isNotEmpty(state)) {
+ return
job.getState().name().equalsIgnoreCase(state);
+ }
+ return false;
+ }).collect(Collectors.toList())
+ );
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
