Repository: helix Updated Branches: refs/heads/master 542fbc840 -> e1ca65193
[HELIX-713] Remove unused imports in TaskAssignmentCalculator Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/e1ca6519 Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/e1ca6519 Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/e1ca6519 Branch: refs/heads/master Commit: e1ca65193973045b2a372190740b1d9b4a78c5d8 Parents: 542fbc8 Author: Hunter Lee <[email protected]> Authored: Mon Jul 9 12:09:30 2018 -0700 Committer: Hunter Lee <[email protected]> Committed: Mon Jul 9 13:48:53 2018 -0700 ---------------------------------------------------------------------- .../FixedTargetTaskAssignmentCalculator.java | 25 +++++++++++--------- .../task/GenericTaskAssignmentCalculator.java | 17 +++++-------- .../helix/task/TaskAssignmentCalculator.java | 1 - 3 files changed, 20 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/e1ca6519/helix-core/src/main/java/org/apache/helix/task/FixedTargetTaskAssignmentCalculator.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/task/FixedTargetTaskAssignmentCalculator.java b/helix-core/src/main/java/org/apache/helix/task/FixedTargetTaskAssignmentCalculator.java index 99b3ae6..0ce6012 100644 --- a/helix-core/src/main/java/org/apache/helix/task/FixedTargetTaskAssignmentCalculator.java +++ b/helix-core/src/main/java/org/apache/helix/task/FixedTargetTaskAssignmentCalculator.java @@ -28,10 +28,8 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.helix.controller.stages.ClusterDataCache; import org.apache.helix.controller.stages.CurrentStateOutput; import org.apache.helix.model.IdealState; -import org.apache.helix.model.InstanceConfig; import org.apache.helix.model.Message; import org.apache.helix.model.Partition; import org.apache.helix.model.ResourceAssignment; @@ -42,12 +40,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * A TaskAssignmentCalculator for when a task group must be assigned according to partitions/states on a target + * A TaskAssignmentCalculator for when a task group must be assigned according to partitions/states + * on a target * resource. Here, tasks are co-located according to where a resource's partitions are, as well as * (if desired) only where those partitions are in a given state. */ public class FixedTargetTaskAssignmentCalculator extends TaskAssignmentCalculator { - private static final Logger LOG = LoggerFactory.getLogger(FixedTargetTaskAssignmentCalculator.class); + private static final Logger LOG = + LoggerFactory.getLogger(FixedTargetTaskAssignmentCalculator.class); @Override public Set<Integer> getAllTaskPartitions(JobConfig jobCfg, JobContext jobCtx, @@ -68,7 +68,8 @@ public class FixedTargetTaskAssignmentCalculator extends TaskAssignmentCalculato return Collections.emptyMap(); } Set<String> tgtStates = jobCfg.getTargetPartitionStates(); - return getTgtPartitionAssignment(currStateOutput, instances, tgtIs, tgtStates, partitionSet, jobContext); + return getTgtPartitionAssignment(currStateOutput, instances, tgtIs, tgtStates, partitionSet, + jobContext); } /** @@ -93,7 +94,8 @@ public class FixedTargetTaskAssignmentCalculator extends TaskAssignmentCalculato Set<Integer> taskPartitions = Sets.newTreeSet(); for (String targetPartition : targetPartitions) { - taskPartitions.addAll(getPartitionsForTargetPartition(targetPartition, currentTargets, taskCtx)); + taskPartitions + .addAll(getPartitionsForTargetPartition(targetPartition, currentTargets, taskCtx)); } return taskPartitions; } @@ -123,7 +125,7 @@ public class FixedTargetTaskAssignmentCalculator extends TaskAssignmentCalculato private static Map<String, SortedSet<Integer>> getTgtPartitionAssignment( CurrentStateOutput currStateOutput, Iterable<String> instances, IdealState tgtIs, Set<String> tgtStates, Set<Integer> includeSet, JobContext jobCtx) { - Map<String, SortedSet<Integer>> result = new HashMap<String, SortedSet<Integer>>(); + Map<String, SortedSet<Integer>> result = new HashMap<>(); for (String instance : instances) { result.put(instance, new TreeSet<Integer>()); } @@ -137,13 +139,14 @@ public class FixedTargetTaskAssignmentCalculator extends TaskAssignmentCalculato int pId = partitions.get(0); if (includeSet.contains(pId)) { for (String instance : instances) { - Message pendingMessage = currStateOutput.getPendingState(tgtIs.getResourceName(), new Partition(pName), - instance); + Message pendingMessage = currStateOutput.getPendingState(tgtIs.getResourceName(), + new Partition(pName), instance); if (pendingMessage != null) { continue; } - String s = currStateOutput.getCurrentState(tgtIs.getResourceName(), new Partition(pName), instance); + String s = currStateOutput.getCurrentState(tgtIs.getResourceName(), new Partition(pName), + instance); if (s != null && (tgtStates == null || tgtStates.contains(s))) { result.get(instance).add(pId); } @@ -153,4 +156,4 @@ public class FixedTargetTaskAssignmentCalculator extends TaskAssignmentCalculato return result; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/helix/blob/e1ca6519/helix-core/src/main/java/org/apache/helix/task/GenericTaskAssignmentCalculator.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/task/GenericTaskAssignmentCalculator.java b/helix-core/src/main/java/org/apache/helix/task/GenericTaskAssignmentCalculator.java index c9a37b0..c72282d 100644 --- a/helix-core/src/main/java/org/apache/helix/task/GenericTaskAssignmentCalculator.java +++ b/helix-core/src/main/java/org/apache/helix/task/GenericTaskAssignmentCalculator.java @@ -22,7 +22,6 @@ package org.apache.helix.task; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -32,10 +31,8 @@ import java.util.TreeMap; import java.util.TreeSet; import org.apache.helix.HelixException; -import org.apache.helix.controller.stages.ClusterDataCache; import org.apache.helix.controller.stages.CurrentStateOutput; import org.apache.helix.model.IdealState; -import org.apache.helix.model.Partition; import org.apache.helix.model.ResourceAssignment; import org.apache.helix.util.JenkinsHash; import org.slf4j.Logger; @@ -43,7 +40,6 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import com.google.common.collect.Sets; /** * This class does an assignment based on an automatic rebalancing strategy, rather than requiring @@ -76,8 +72,8 @@ public class GenericTaskAssignmentCalculator extends TaskAssignmentCalculator { if (jobCfg.getTargetResource() != null) { LOG.error( - "Target resource is not null, should call FixedTaskAssignmentCalculator, target resource : " - + jobCfg.getTargetResource()); + "Target resource is not null, should call FixedTaskAssignmentCalculator, target resource : {}", + jobCfg.getTargetResource()); return new HashMap<>(); } @@ -104,7 +100,7 @@ public class GenericTaskAssignmentCalculator extends TaskAssignmentCalculator { public Map<String, SortedSet<Integer>> computeMapping(JobConfig jobConfig, JobContext jobContext, List<Integer> partitions, String resourceId) { if (_numInstances == 0) { - return new HashMap<String, SortedSet<Integer>>(); + return new HashMap<>(); } Map<String, SortedSet<Integer>> taskAssignment = Maps.newHashMap(); @@ -118,8 +114,7 @@ public class GenericTaskAssignmentCalculator extends TaskAssignmentCalculator { if (jobConfig.getMaxAttemptsPerTask() < _numInstances) { shiftTimes = numAttempts == -1 ? 0 : numAttempts; } else { - shiftTimes = (maxAttempts == 0) - ? 0 + shiftTimes = (maxAttempts == 0) ? 0 : jobContext.getPartitionNumAttempts(partition) / (maxAttempts / _numInstances); } // Hash the value based on the shifting time. The default shift time will be 0. @@ -143,7 +138,7 @@ public class GenericTaskAssignmentCalculator extends TaskAssignmentCalculator { private class ConsistentHashSelector { private final static int DEFAULT_TOKENS_PER_INSTANCE = 1000; - private final SortedMap<Long, String> circle = new TreeMap<Long, String>(); + private final SortedMap<Long, String> circle = new TreeMap<>(); protected int instanceSize = 0; public ConsistentHashSelector(List<String> instances) { @@ -179,4 +174,4 @@ public class GenericTaskAssignmentCalculator extends TaskAssignmentCalculator { } } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/helix/blob/e1ca6519/helix-core/src/main/java/org/apache/helix/task/TaskAssignmentCalculator.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/task/TaskAssignmentCalculator.java b/helix-core/src/main/java/org/apache/helix/task/TaskAssignmentCalculator.java index a6a9ed3..66b961b 100644 --- a/helix-core/src/main/java/org/apache/helix/task/TaskAssignmentCalculator.java +++ b/helix-core/src/main/java/org/apache/helix/task/TaskAssignmentCalculator.java @@ -1,6 +1,5 @@ package org.apache.helix.task; -import org.apache.helix.controller.stages.ClusterDataCache; import org.apache.helix.controller.stages.CurrentStateOutput; import org.apache.helix.model.IdealState; import org.apache.helix.model.ResourceAssignment;
