You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by GitBox <gi...@apache.org> on 2020/09/02 07:03:57 UTC
[GitHub] [incubator-doris] xy720 opened a new pull request #4515: [Feature] Support cancel load jobs in batch
xy720 opened a new pull request #4515:
URL: https://github.com/apache/incubator-doris/pull/4515
## Proposed changes
#3992
## Types of changes
What types of changes does your code introduce to Doris?
_Put an `x` in the boxes that apply_
- [x] New feature (non-breaking change which adds functionality)
## Checklist
_Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code._
- [x] I have create an issue on (Fix #ISSUE), and have described the bug/feature there in detail
- [x] Compiling and unit tests pass locally with my changes
- [x] I have added tests that prove my fix is effective or that my feature works
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [incubator-doris] morningman commented on a change in pull request #4515: [Feature] Support cancel load jobs in batch
Posted by GitBox <gi...@apache.org>.
morningman commented on a change in pull request #4515:
URL: https://github.com/apache/incubator-doris/pull/4515#discussion_r487524636
##########
File path: fe/fe-core/src/main/java/org/apache/doris/load/Load.java
##########
@@ -1570,6 +1581,105 @@ public boolean isLabelExist(String dbName, String label) throws DdlException {
}
}
+ public boolean cancelLoadJob(CancelLoadStmt stmt, boolean isAccurateMatch) throws DdlException {
+ // get params
+ String dbName = stmt.getDbName();
+ String label = stmt.getLabel();
+
+ // get load job and check state
+ Database db = Catalog.getCurrentCatalog().getDb(dbName);
+ if (db == null) {
+ throw new DdlException("Db does not exist. name: " + dbName);
+ }
+ // List of load jobs waiting to be cancelled
+ List<LoadJob> loadJobs = Lists.newArrayList();
+ readLock();
+ try {
+ Map<String, List<LoadJob>> labelToLoadJobs = dbLabelToLoadJobs.get(db.getId());
+ if (labelToLoadJobs == null) {
+ throw new DdlException("Load job does not exist");
+ }
+
+ // get jobs by label
+ List<LoadJob> matchLoadJobs = Lists.newArrayList();
+ if (isAccurateMatch) {
+ if (labelToLoadJobs.containsKey(label)) {
+ matchLoadJobs.addAll(labelToLoadJobs.get(label));
+ }
+ } else {
+ for (Map.Entry<String, List<LoadJob>> entry : labelToLoadJobs.entrySet()) {
+ if (entry.getKey().contains(label)) {
+ matchLoadJobs.addAll(entry.getValue());
+ }
+ }
+ }
+
+ if (matchLoadJobs.isEmpty()) {
+ throw new DdlException("Load job does not exist");
+ }
+
+ // check state here
+ if (isAccurateMatch) {
+ // only the last one should be running
Review comment:
We should not rely on "the last one is running", better filter it by state.
So that we can unify the logic just same as batch cancel.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [incubator-doris] morningman merged pull request #4515: [Feature] Support cancel load jobs in batch
Posted by GitBox <gi...@apache.org>.
morningman merged pull request #4515:
URL: https://github.com/apache/incubator-doris/pull/4515
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[GitHub] [incubator-doris] xy720 commented on a change in pull request #4515: [Feature] Support cancel load jobs in batch
Posted by GitBox <gi...@apache.org>.
xy720 commented on a change in pull request #4515:
URL: https://github.com/apache/incubator-doris/pull/4515#discussion_r496905845
##########
File path: fe/fe-core/src/main/java/org/apache/doris/load/Load.java
##########
@@ -1570,6 +1581,105 @@ public boolean isLabelExist(String dbName, String label) throws DdlException {
}
}
+ public boolean cancelLoadJob(CancelLoadStmt stmt, boolean isAccurateMatch) throws DdlException {
+ // get params
+ String dbName = stmt.getDbName();
+ String label = stmt.getLabel();
+
+ // get load job and check state
+ Database db = Catalog.getCurrentCatalog().getDb(dbName);
+ if (db == null) {
+ throw new DdlException("Db does not exist. name: " + dbName);
+ }
+ // List of load jobs waiting to be cancelled
+ List<LoadJob> loadJobs = Lists.newArrayList();
+ readLock();
+ try {
+ Map<String, List<LoadJob>> labelToLoadJobs = dbLabelToLoadJobs.get(db.getId());
+ if (labelToLoadJobs == null) {
+ throw new DdlException("Load job does not exist");
+ }
+
+ // get jobs by label
+ List<LoadJob> matchLoadJobs = Lists.newArrayList();
+ if (isAccurateMatch) {
+ if (labelToLoadJobs.containsKey(label)) {
+ matchLoadJobs.addAll(labelToLoadJobs.get(label));
+ }
+ } else {
+ for (Map.Entry<String, List<LoadJob>> entry : labelToLoadJobs.entrySet()) {
+ if (entry.getKey().contains(label)) {
+ matchLoadJobs.addAll(entry.getValue());
+ }
+ }
+ }
+
+ if (matchLoadJobs.isEmpty()) {
+ throw new DdlException("Load job does not exist");
+ }
+
+ // check state here
+ if (isAccurateMatch) {
+ // only the last one should be running
Review comment:
ok. I just unify the logic.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org