[01/50] [abbrv] flink git commit: [FLINK-4610] [core] Replace keySet/getValue with entrySet in UdfAnalyzerUtils [Forced Update!]

2016-09-21 Thread trohrmann 
Repository: flink
Updated Branches:
  refs/heads/flip-6 11cc6b95b -> a04c11c87 (forced update)


[FLINK-4610] [core] Replace keySet/getValue with entrySet in UdfAnalyzerUtils

This closes #2491


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

Branch: refs/heads/flip-6
Commit: 5901bf33bc38b2d0317d3322e26dd427c3319bef
Parents: 5066125
Author: Alexander Pivovarov 
Authored: Fri Sep 9 23:10:12 2016 -0700
Committer: Stephan Ewen 
Committed: Mon Sep 19 22:26:20 2016 +0200

--
 .../java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/5901bf33/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
--
diff --git 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
index ca00d54..a477a03 100644
--- 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
+++ 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
@@ -271,15 +271,15 @@ public final class UdfAnalyzerUtils {
}
 
// recursively merge contained mappings
-   Iterator it = resultMapping.keySet().iterator();
+   Iterator> it = 
resultMapping.entrySet().iterator();
while (it.hasNext()) {
-   String key = it.next();
-   TaggedValue value = 
mergeReturnValues(Collections.singletonList(resultMapping.get(key)));
+   Map.Entry entry = it.next();
+   TaggedValue value = 
mergeReturnValues(Collections.singletonList(entry.getValue()));
if (value == null) {
it.remove();
}
else {
-   resultMapping.put(key, value);
+   entry.setValue(value);
}
}

flink git commit: [FLINK-4610] [core] Replace keySet/getValue with entrySet in UdfAnalyzerUtils

2016-09-20 Thread sewen 
Repository: flink
Updated Branches:
  refs/heads/master 5066125f9 -> 5901bf33b


[FLINK-4610] [core] Replace keySet/getValue with entrySet in UdfAnalyzerUtils

This closes #2491


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

Branch: refs/heads/master
Commit: 5901bf33bc38b2d0317d3322e26dd427c3319bef
Parents: 5066125
Author: Alexander Pivovarov 
Authored: Fri Sep 9 23:10:12 2016 -0700
Committer: Stephan Ewen 
Committed: Mon Sep 19 22:26:20 2016 +0200

--
 .../java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/flink/blob/5901bf33/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
--
diff --git 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
index ca00d54..a477a03 100644
--- 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
+++ 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
@@ -271,15 +271,15 @@ public final class UdfAnalyzerUtils {
}
 
// recursively merge contained mappings
-   Iterator it = resultMapping.keySet().iterator();
+   Iterator> it = 
resultMapping.entrySet().iterator();
while (it.hasNext()) {
-   String key = it.next();
-   TaggedValue value = 
mergeReturnValues(Collections.singletonList(resultMapping.get(key)));
+   Map.Entry entry = it.next();
+   TaggedValue value = 
mergeReturnValues(Collections.singletonList(entry.getValue()));
if (value == null) {
it.remove();
}
else {
-   resultMapping.put(key, value);
+   entry.setValue(value);
}
}