[flink] branch master updated: [FLINK-10189] Fix inefficient use of keySet iterators

[chesnay]

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 8a5271e  [FLINK-10189] Fix inefficient use of keySet iterators
8a5271e is described below

commit 8a5271e29f664dac27c95eb8e7df2ae9be76b592
Author: Hiroaki Yoshida <hyosh...@us.fujitsu.com>
AuthorDate: Wed Aug 29 08:13:39 2018 -0700

    [FLINK-10189] Fix inefficient use of keySet iterators
---
 .../main/java/org/apache/flink/addons/hbase/HBaseTableSource.java    | 5 +++--
 .../main/java/org/apache/flink/runtime/state/ttl/TtlMapState.java    | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git 
a/flink-connectors/flink-hbase/src/main/java/org/apache/flink/addons/hbase/HBaseTableSource.java
 
b/flink-connectors/flink-hbase/src/main/java/org/apache/flink/addons/hbase/HBaseTableSource.java
index 1e090d4..27b75d4 100644
--- 
a/flink-connectors/flink-hbase/src/main/java/org/apache/flink/addons/hbase/HBaseTableSource.java
+++ 
b/flink-connectors/flink-hbase/src/main/java/org/apache/flink/addons/hbase/HBaseTableSource.java
@@ -144,9 +144,10 @@ public class HBaseTableSource implements 
BatchTableSource<Row>, ProjectableTable
                for (int field : fields) {
                        String family = famNames[field];
                        Map<String, TypeInformation<?>> familyInfo = 
hBaseSchema.getFamilyInfo(family);
-                       for (String qualifier : familyInfo.keySet()) {
+                       for (Map.Entry<String, TypeInformation<?>> entry : 
familyInfo.entrySet()) {
                                // create the newSchema
-                               newTableSource.addColumn(family, qualifier, 
familyInfo.get(qualifier).getTypeClass());
+                               String qualifier = entry.getKey();
+                               newTableSource.addColumn(family, qualifier, 
entry.getValue().getTypeClass());
                        }
                }
                return newTableSource;
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlMapState.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlMapState.java
index f6f81ff..f92e8e4 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlMapState.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/state/ttl/TtlMapState.java
@@ -68,8 +68,9 @@ class TtlMapState<K, N, UK, UV>
                        return;
                }
                Map<UK, TtlValue<UV>> ttlMap = new HashMap<>(map.size());
-               for (UK key : map.keySet()) {
-                       ttlMap.put(key, wrapWithTs(map.get(key)));
+               for (Map.Entry<UK, UV> entry : map.entrySet()) {
+                       UK key = entry.getKey();
+                       ttlMap.put(key, wrapWithTs(entry.getValue()));
                }
                original.putAll(ttlMap);
        }