diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java index 5f834a20048a2ab56cadc444f77df64863123c70..d442c13ebc008ef9fd993a388658959b8c07b0ed 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/queue/TaskQueueZkImpl.java @@ -30,7 +30,7 @@ import java.util.*; /** * A singleton of a task queue implemented with zookeeper - * tasks queue implemention + * tasks queue implementation */ @Service public class TaskQueueZkImpl implements ITaskQueue { @@ -72,7 +72,7 @@ public class TaskQueueZkImpl implements ITaskQueue { } catch (Exception e) { logger.error("get all tasks from tasks queue exception",e); } - return new ArrayList<>(); + return Collections.emptyList(); } /** @@ -196,11 +196,11 @@ public class TaskQueueZkImpl implements ITaskQueue { } } - List taskslist = getTasksListFromTreeSet(tasksNum, taskTreeSet); + List tasksList = getTasksListFromTreeSet(tasksNum, taskTreeSet); - logger.info("consume tasks: {},there still have {} tasks need to be executed", Arrays.toString(taskslist.toArray()), size - taskslist.size()); + logger.info("consume tasks: {},there still have {} tasks need to be executed", Arrays.toString(tasksList.toArray()), size - tasksList.size()); - return taskslist; + return tasksList; }else{ Thread.sleep(Constants.SLEEP_TIME_MILLIS); } @@ -208,7 +208,7 @@ public class TaskQueueZkImpl implements ITaskQueue { } catch (Exception e) { logger.error("add task to tasks queue exception",e); } - return new ArrayList(); + return Collections.emptyList(); } @@ -221,15 +221,15 @@ public class TaskQueueZkImpl implements ITaskQueue { public List getTasksListFromTreeSet(int tasksNum, Set taskTreeSet) { Iterator iterator = taskTreeSet.iterator(); int j = 0; - List taskslist = new ArrayList<>(tasksNum); + List tasksList = new ArrayList<>(tasksNum); while(iterator.hasNext()){ if(j++ >= tasksNum){ break; } String task = iterator.next(); - taskslist.add(getOriginTaskFormat(task)); + tasksList.add(getOriginTaskFormat(task)); } - return taskslist; + return tasksList; } /** @@ -330,22 +330,13 @@ public class TaskQueueZkImpl implements ITaskQueue { */ @Override public Set smembers(String key) { - - Set tasksSet = new HashSet<>(); - try { List list = zookeeperOperator.getChildrenKeys(getTasksPath(key)); - - for (String task : list) { - tasksSet.add(task); - } - - return tasksSet; + return new HashSet<>(list); } catch (Exception e) { logger.error("get all tasks from tasks queue exception",e); } - - return tasksSet; + return Collections.emptySet(); } /**