Repository: incubator-reef Updated Branches: refs/heads/master 90e8e2b47 -> c7ba94c32
[REEF-791] Replace inefficient use of keySet iterator with entrySet iterator JIRA: [REEF-791](https://issues.apache.org/jira/browse/REEF-791) Pull Request: Closes #529 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/c7ba94c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/c7ba94c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/c7ba94c3 Branch: refs/heads/master Commit: c7ba94c32798a2bf1514d56cf10528074749a4b5 Parents: 90e8e2b Author: Dongjoon Hyun <[email protected]> Authored: Wed Sep 30 04:24:54 2015 +0900 Committer: Markus Weimer <[email protected]> Committed: Tue Sep 29 13:06:20 2015 -0700 ---------------------------------------------------------------------- .../org/apache/reef/io/storage/ram/CodecRamMap.java | 5 +++-- .../java/org/apache/reef/tang/formats/CommandLine.java | 6 ++++-- .../src/main/java/org/apache/reef/tang/util/Tint.java | 7 +++---- .../java/org/apache/reef/util/cache/CacheImpl.java | 13 ++++++------- .../org/apache/reef/wake/remote/impl/MultiCodec.java | 7 ++++--- 5 files changed, 20 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c7ba94c3/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/CodecRamMap.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/CodecRamMap.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/CodecRamMap.java index b4885a5..3af06a8 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/CodecRamMap.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/storage/ram/CodecRamMap.java @@ -27,6 +27,7 @@ import org.apache.reef.tang.annotations.Parameter; import javax.inject.Inject; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ConcurrentSkipListMap; @@ -67,8 +68,8 @@ public class CodecRamMap<T> implements ExternalMap<T> { @Override public void putAll(final Map<? extends CharSequence, ? extends T> m) { - for (final CharSequence x : m.keySet()) { - map.put(x, c.encode(m.get(x))); + for (final Entry<? extends CharSequence, ? extends T> entry : m.entrySet()) { + map.put(entry.getKey(), c.encode(entry.getValue())); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c7ba94c3/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/CommandLine.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/CommandLine.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/CommandLine.java index fd49512..ceff81d 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/CommandLine.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/formats/CommandLine.java @@ -33,6 +33,7 @@ import org.apache.reef.tang.util.ReflectionUtilities; import java.io.IOException; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; public final class CommandLine { @@ -86,8 +87,9 @@ public final class CommandLine { private Options getCommandLineOptions() { final Options opts = new Options(); - for (final String shortName : shortNames.keySet()) { - final String longName = shortNames.get(shortName); + for (final Entry<String, String> entry : shortNames.entrySet()) { + final String shortName = entry.getKey(); + final String longName = entry.getValue(); try { opts.addOption(OptionBuilder .withArgName(conf.classPrettyDefaultString(longName)).hasArg() http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c7ba94c3/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java index 3f72a8f..0c1b104 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/Tint.java @@ -211,10 +211,9 @@ public class Tint { } } - for (final Field f : modules.keySet()) { - final ConfigurationModule m = modules.get(f); - final String fS = ReflectionUtilities.getFullName(f); - final Set<NamedParameterNode<?>> nps = m.getBoundNamedParameters(); + for (final Entry<Field, ConfigurationModule> entry: modules.entrySet()) { + final String fS = ReflectionUtilities.getFullName(entry.getKey()); + final Set<NamedParameterNode<?>> nps = entry.getValue().getBoundNamedParameters(); for (final NamedParameterNode<?> np : nps) { final String npS = np.getFullName(); if (!setters.contains(npS, fS)) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c7ba94c3/lang/java/reef-utils/src/main/java/org/apache/reef/util/cache/CacheImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-utils/src/main/java/org/apache/reef/util/cache/CacheImpl.java b/lang/java/reef-utils/src/main/java/org/apache/reef/util/cache/CacheImpl.java index 36f01fd..8999a98 100644 --- a/lang/java/reef-utils/src/main/java/org/apache/reef/util/cache/CacheImpl.java +++ b/lang/java/reef-utils/src/main/java/org/apache/reef/util/cache/CacheImpl.java @@ -26,6 +26,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.Map.Entry; /** * Implementation that supports expire-after-write. @@ -106,13 +107,11 @@ public final class CacheImpl<K, V> implements Cache<K, V> { } private void expireEntriesAtTime(final long now) { - for (final K key : internalMap.keySet()) { - final WrappedValue<V> wrappedValue = internalMap.get(key); - if (wrappedValue != null) { - final Optional<Long> writeTime = wrappedValue.getWriteTime(); - if (writeTime.isPresent() && - writeTime.get() + timeoutMillis < now) { - invalidate(key); + for (final Entry<K, WrappedValue<V>> entry : internalMap.entrySet()) { + if (entry.getValue() != null) { + final Optional<Long> writeTime = entry.getValue().getWriteTime(); + if (writeTime.isPresent() && writeTime.get() + timeoutMillis < now) { + invalidate(entry.getKey()); } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/c7ba94c3/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiCodec.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiCodec.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiCodec.java index 440b241..d37cea1 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiCodec.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/impl/MultiCodec.java @@ -24,6 +24,7 @@ import org.apache.reef.wake.remote.Encoder; import java.util.HashMap; import java.util.Map; +import java.util.Map.Entry; /** * Codec using the WakeTuple protocol buffer. @@ -46,9 +47,9 @@ public class MultiCodec<T> implements Codec<T> { new HashMap<Class<? extends T>, Encoder<? extends T>>(); final Map<Class<? extends T>, Decoder<? extends T>> clazzToDecoderMap = new HashMap<Class<? extends T>, Decoder<? extends T>>(); - for (final Class<? extends T> clazz : clazzToCodecMap.keySet()) { - clazzToEncoderMap.put(clazz, clazzToCodecMap.get(clazz)); - clazzToDecoderMap.put(clazz, clazzToCodecMap.get(clazz)); + for (final Entry<Class<? extends T>, Codec<? extends T>> e : clazzToCodecMap.entrySet()) { + clazzToEncoderMap.put(e.getKey(), e.getValue()); + clazzToDecoderMap.put(e.getKey(), e.getValue()); } encoder = new MultiEncoder<T>(clazzToEncoderMap); decoder = new MultiDecoder<T>(clazzToDecoderMap);
