You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2016/03/24 22:22:35 UTC

[1/2] storm git commit: Revised wipeZeros() in SlotBasedCounter to avoid creating new hash set.

Repository: storm
Updated Branches:
  refs/heads/master cb2735c23 -> e19e75776


Revised wipeZeros() in SlotBasedCounter to avoid creating new hash set.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/de9f7b1e
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/de9f7b1e
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/de9f7b1e

Branch: refs/heads/master
Commit: de9f7b1ef57adfeaf03a63e4d7d992a91a1b2050
Parents: ab66003
Author: Kun Hu <ku...@amazon.com>
Authored: Mon Mar 21 11:28:48 2016 -0700
Committer: Kun Hu <ku...@amazon.com>
Committed: Mon Mar 21 11:28:48 2016 -0700

----------------------------------------------------------------------
 .../apache/storm/starter/tools/SlotBasedCounter.java    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/de9f7b1e/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/SlotBasedCounter.java
----------------------------------------------------------------------
diff --git a/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/SlotBasedCounter.java b/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/SlotBasedCounter.java
index b8ca15b..5bf66a5 100644
--- a/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/SlotBasedCounter.java
+++ b/examples/storm-starter/src/jvm/org/apache/storm/starter/tools/SlotBasedCounter.java
@@ -20,6 +20,7 @@ package org.apache.storm.starter.tools;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -104,15 +105,12 @@ public final class SlotBasedCounter<T> implements Serializable {
    * Remove any object from the counter whose total count is zero (to free up memory).
    */
   public void wipeZeros() {
-    Set<T> objToBeRemoved = new HashSet<T>();
-    for (T obj : objToCounts.keySet()) {
-      if (shouldBeRemovedFromCounter(obj)) {
-        objToBeRemoved.add(obj);
+    for(Iterator<Map.Entry<T, long[]>> it = objToCounts.entrySet().iterator(); it.hasNext(); ) {
+      Map.Entry<T, long[]> entry = it.next();
+      if (shouldBeRemovedFromCounter(entry.getKey())) {
+        it.remove();
       }
     }
-    for (T obj : objToBeRemoved) {
-      objToCounts.remove(obj);
-    }
   }
 
 }


[2/2] storm git commit: Merge branch 'master' of https://github.com/hukun01/storm

Posted by kn...@apache.org.
Merge branch 'master' of https://github.com/hukun01/storm


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e19e7577
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e19e7577
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e19e7577

Branch: refs/heads/master
Commit: e19e75776fdb1d3f4ed141855dee7e6f4b7091aa
Parents: cb2735c de9f7b1
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Thu Mar 24 16:20:38 2016 -0500
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Thu Mar 24 16:20:38 2016 -0500

----------------------------------------------------------------------
 .../apache/storm/starter/tools/SlotBasedCounter.java    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------