You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/11/22 14:46:49 UTC
ignite git commit: Reverted sorted map -> hash map switch.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.6.10-hadoop-debug 84b23474b -> ed3237642
Reverted sorted map -> hash map switch.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ed323764
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ed323764
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ed323764
Branch: refs/heads/ignite-1.6.10-hadoop-debug
Commit: ed323764236b91561b522d64aded3c9e7cf86039
Parents: 84b2347
Author: devozerov <vo...@gridgain.com>
Authored: Tue Nov 22 17:46:36 2016 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Nov 22 17:46:36 2016 +0300
----------------------------------------------------------------------
.../processors/hadoop/shuffle/HadoopShuffleJob.java | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ed323764/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
index adca7b9..f586234 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffleJob.java
@@ -211,16 +211,13 @@ public class HadoopShuffleJob<T> implements AutoCloseable {
/**
* @param maps Maps.
* @param idx Index.
- * @param mapper If map is requested by mapper.
* @return Map.
*/
- private HadoopMultimap getOrCreateMap(AtomicReferenceArray<HadoopMultimap> maps, int idx, boolean mapper) {
+ private HadoopMultimap getOrCreateMap(AtomicReferenceArray<HadoopMultimap> maps, int idx) {
HadoopMultimap map = maps.get(idx);
if (map == null) { // Create new map.
- boolean hash = mapper || get(job.info(), SHUFFLE_REDUCER_NO_SORTING, false);
-
- map = hash ?
+ map = get(job.info(), SHUFFLE_REDUCER_NO_SORTING, false) ?
new HadoopConcurrentHashMultimap(job.info(), mem, get(job.info(), PARTITION_HASHMAP_SIZE, 8 * 1024)):
new HadoopSkipList(job.info(), mem);
@@ -248,7 +245,7 @@ public class HadoopShuffleJob<T> implements AutoCloseable {
perfCntr.onShuffleMessage(msg.reducer(), U.currentTimeMillis());
- HadoopMultimap map = getOrCreateMap(maps, msg.reducer(), false);
+ HadoopMultimap map = getOrCreateMap(maps, msg.reducer());
// Add data from message to the map.
try (HadoopMultimap.Adder adder = map.startAdding(taskCtx)) {
@@ -615,7 +612,7 @@ public class HadoopShuffleJob<T> implements AutoCloseable {
HadoopTaskOutput out = adders[part];
if (out == null)
- adders[part] = out = getOrCreateMap(maps, part, true).startAdding(taskCtx);
+ adders[part] = out = getOrCreateMap(maps, part).startAdding(taskCtx);
out.write(key, val);
}