FInalization.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/65d76a45 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/65d76a45 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/65d76a45 Branch: refs/heads/ignite-3414 Commit: 65d76a45dd6c8a12d2e1f98120bc3c2ebe1f39dc Parents: d75f55b Author: vozerov-gridgain <[email protected]> Authored: Tue Jul 19 09:56:46 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Jul 19 09:56:46 2016 +0300 ---------------------------------------------------------------------- .../mapreduce/IgniteHadoopWeightedMapReducePlanner.java | 8 ++++---- .../hadoop/planner/HadoopMapReducePlanGroup.java | 10 +--------- 2 files changed, 5 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/65d76a45/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 b869775..8f2a86c 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 @@ -17,7 +17,6 @@ package org.apache.ignite.hadoop.mapreduce; -import java.util.LinkedHashSet; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteFileSystem; @@ -46,6 +45,7 @@ import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.IdentityHashMap; +import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -116,7 +116,7 @@ public class IgniteHadoopWeightedMapReducePlanner extends HadoopAbstractMapReduc */ private Mappers assignMappers(Collection<HadoopInputSplit> splits, HadoopMapReducePlanTopology top) throws IgniteCheckedException { - Mappers bestSplitMapping = new Mappers(); + Mappers res = new Mappers(); for (HadoopInputSplit split : splits) { // Try getting IGFS affinity. Note that an empty collection may be returned @@ -128,10 +128,10 @@ public class IgniteHadoopWeightedMapReducePlanner extends HadoopAbstractMapReduc assert node != null; - bestSplitMapping.add(split, node); + res.add(split, node); } - return bestSplitMapping; + return res; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/65d76a45/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/HadoopMapReducePlanGroup.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/HadoopMapReducePlanGroup.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/HadoopMapReducePlanGroup.java index 8b9f5a3..2fe8682 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/HadoopMapReducePlanGroup.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/HadoopMapReducePlanGroup.java @@ -25,15 +25,7 @@ import java.util.ArrayList; import java.util.UUID; /** - * Map-reduce plan group of nodes. - * In fact, this class represents a physical machine in the cluster that may have zero or more Ignite nodes on board. - * Note that the machine may not be a Hadoop data node. - * - * <p/>The {@code weight} field is an artificial integer value that represents a load (mostly CPU load) assigned to this - * machine. It assumed to be non-negative. - * - * <p/>{@code node} field is a first added node (set in the constructor). If more nodes added, this field is nulled, - * and only {@code nodes} collection is used further. + * Map-reduce plan group of nodes on a single physical machine. */ public class HadoopMapReducePlanGroup { /** Node. */
