FInalization.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a1c70470 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a1c70470 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a1c70470 Branch: refs/heads/ignite-3414 Commit: a1c70470c6b8be954371af716c8f2cbfceddd4b8 Parents: ae2d9e1 Author: vozerov-gridgain <[email protected]> Authored: Tue Jul 19 10:24:35 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Jul 19 10:24:35 2016 +0300 ---------------------------------------------------------------------- .../IgniteHadoopWeightedMapReducePlanner.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a1c70470/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopWeightedMapReducePlanner.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopWeightedMapReducePlanner.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopWeightedMapReducePlanner.java index b4b1d56..15684be 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopWeightedMapReducePlanner.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/mapreduce/IgniteHadoopWeightedMapReducePlanner.java @@ -120,7 +120,7 @@ public class IgniteHadoopWeightedMapReducePlanner extends HadoopAbstractMapReduc for (HadoopInputSplit split : splits) { // Try getting affinity node IDs. - List<UUID> nodeIds = affinityNodesForSplit(split, top); + Collection<UUID> nodeIds = affinityNodesForSplit(split, top); // Get best node. UUID node = bestMapperNode(nodeIds, top); @@ -144,9 +144,9 @@ public class IgniteHadoopWeightedMapReducePlanner extends HadoopAbstractMapReduc * @return Affintiy nodes. * @throws IgniteCheckedException If failed. */ - private List<UUID> affinityNodesForSplit(HadoopInputSplit split, HadoopMapReducePlanTopology top) + private Collection<UUID> affinityNodesForSplit(HadoopInputSplit split, HadoopMapReducePlanTopology top) throws IgniteCheckedException { - List<UUID> igfsNodeIds = igfsAffinityNodesForSplit(split); + Collection<UUID> igfsNodeIds = igfsAffinityNodesForSplit(split); if (igfsNodeIds != null) return igfsNodeIds; @@ -167,7 +167,7 @@ public class IgniteHadoopWeightedMapReducePlanner extends HadoopAbstractMapReduc } } - return new ArrayList<>(res.values()); + return new LinkedHashSet<>(res.values()); } /** @@ -180,7 +180,7 @@ public class IgniteHadoopWeightedMapReducePlanner extends HadoopAbstractMapReduc * @return IGFS affinity or {@code null} if IGFS is not available. * @throws IgniteCheckedException If failed. */ - @Nullable private List<UUID> igfsAffinityNodesForSplit(HadoopInputSplit split) throws IgniteCheckedException { + @Nullable private Collection<UUID> igfsAffinityNodesForSplit(HadoopInputSplit split) throws IgniteCheckedException { if (split instanceof HadoopFileBlock) { HadoopFileBlock split0 = (HadoopFileBlock)split; @@ -209,7 +209,7 @@ public class IgniteHadoopWeightedMapReducePlanner extends HadoopAbstractMapReduc assert blocks != null; if (blocks.size() == 1) - return new ArrayList<>(blocks.iterator().next().nodeIds()); + return blocks.iterator().next().nodeIds(); else { // The most "local" nodes go first. Map<UUID, Long> idToLen = new HashMap<>(); @@ -231,7 +231,7 @@ public class IgniteHadoopWeightedMapReducePlanner extends HadoopAbstractMapReduc res.put(new NodeIdAndLength(id, idToLenEntry.getValue()), id); } - return new ArrayList<>(res.values()); + return new LinkedHashSet<>(res.values()); } } } @@ -248,7 +248,7 @@ public class IgniteHadoopWeightedMapReducePlanner extends HadoopAbstractMapReduc * @param top Topology. * @return Result. */ - private UUID bestMapperNode(@Nullable List<UUID> affIds, HadoopMapReducePlanTopology top) { + private UUID bestMapperNode(@Nullable Collection<UUID> affIds, HadoopMapReducePlanTopology top) { // Priority node. UUID prioAffId = F.first(affIds);
