You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2018/03/06 21:40:47 UTC
[2/3] storm git commit: STORM-2762 use guava collection where ever it
is possible
STORM-2762 use guava collection where ever it is possible
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6a5f4b25
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6a5f4b25
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6a5f4b25
Branch: refs/heads/master
Commit: 6a5f4b256cfe956b9eeda5f3c45e2cfbd83cb723
Parents: 2189abf
Author: Gergely Hajos <ro...@gmail.com>
Authored: Tue Mar 6 18:29:49 2018 +0100
Committer: Gergely Hajos <ro...@gmail.com>
Committed: Tue Mar 6 18:29:49 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/6a5f4b25/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
index aac4c21..a1dedcd 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -470,7 +470,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
});
}
- private static <K, V> Map<K, V> mapValuesOnlyOnRight(Map<? extends K, ? extends V> first, Map<? extends K, ? extends V> second) {
+ private static <K, V> Map<K, V> mapDiff(Map<? extends K, ? extends V> first, Map<? extends K, ? extends V> second) {
Map<K, V> ret = new HashMap<>();
for (Entry<? extends K, ? extends V> entry: second.entrySet()) {
if (!entry.getValue().equals(first.get(entry.getKey()))) {
@@ -708,7 +708,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
value.sort((a, b) -> a.get(0).compareTo(b.get(0)));
newSlotAssigned.put(entry.getKey(), value);
}
- Map<List<Object>, List<List<Long>>> diff = mapValuesOnlyOnRight(slotAssigned, newSlotAssigned);
+ Map<List<Object>, List<List<Long>>> diff = mapDiff(slotAssigned, newSlotAssigned);
List<List<Long>> ret = new ArrayList<>();
for (List<List<Long>> val: diff.values()) {
ret.addAll(val);