[FLINK-10189] Fix inefficient use of keySet iterators

laubersder · Aug 29, 2018 · 8a5271e · 8a5271e
1 parent 260f789
commit 8a5271e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...-connectors/flink-hbase/src/main/java/org/apache/flink/addons/hbase/HBaseTableSource.java b/...-connectors/flink-hbase/src/main/java/org/apache/flink/addons/hbase/HBaseTableSource.java
@@ -144,9 +144,10 @@ public HBaseTableSource projectFields(int[] fields) {
  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
@@ -68,8 +68,9 @@ public void putAll(Map<UK, UV> map) throws Exception {
  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);
  }