Return iterable instead of ArrayList from ValueHashMap.keys()

h2/src/main/org/h2/util/ValueHashMap.java

@@ -179,18 +179,22 @@ public class ValueHashMap<V> extends HashBase {
     }
 
     /**
-     * Get the list of keys.
+     * Get the keys.
      *
      * @return all keys
      */
-    public ArrayList<Value> keys() {
-        ArrayList<Value> list = new ArrayList<>(size);
-        for (Value k : keys) {
-            if (k != null && k != ValueNull.DELETED) {
-                list.add(k);
-            }
+    public Iterable<Value> keys() {
+        return new KeyIterable();
+    }
+
+    private final class KeyIterable implements Iterable<Value> {
+        KeyIterable() {
+        }
+
+        @Override
+        public Iterator<Value> iterator() {
+            return new UnifiedIterator<>(false);
         }
-        return list;
     }
 
     public Iterable<Map.Entry<Value, V>> entries() {
@@ -203,15 +207,18 @@ public class ValueHashMap<V> extends HashBase {
 
         @Override
         public Iterator<Map.Entry<Value, V>> iterator() {
-            return new EntryIterator();
+            return new UnifiedIterator<>(true);
         }
     }
 
-    private final class EntryIterator implements Iterator<Map.Entry<Value, V>> {
-        private int keysIndex = -1;
-        private int left = size;
+    final class UnifiedIterator<T> implements Iterator<T> {
+        int keysIndex = -1;
+        int left = size;
 
-        EntryIterator() {
+        private final boolean forEntries;
+
+        UnifiedIterator(boolean forEntries) {
+            this.forEntries = forEntries;
         }
 
         @Override
@@ -219,16 +226,18 @@ public class ValueHashMap<V> extends HashBase {
             return left > 0;
         }
 
+        @SuppressWarnings("unchecked")
         @Override
-        public Map.Entry<Value, V> next() {
+        public T next() {
             if (left <= 0)
                 throw new NoSuchElementException();
             left--;
             for (;;) {
                 keysIndex++;
                 Value key = keys[keysIndex];
-                if (key != null && key != ValueNull.DELETED)
-                    return new AbstractMap.SimpleImmutableEntry<>(key, values[keysIndex]);
+                if (key != null && key != ValueNull.DELETED) {
+                    return (T) (forEntries ? new AbstractMap.SimpleImmutableEntry<>(key, values[keysIndex]) : key);
+                }
             }
         }
 

h2/src/test/org/h2/test/unit/TestValueHashMap.java

@@ -85,7 +85,10 @@ public class TestValueHashMap extends TestBase implements DataHandler {
                 assertTrue(v1 == null ? v2 == null : v1.equals(v2));
                 break;
             case 3: {
-                ArrayList<Value> a1 = map.keys();
+                ArrayList<Value> a1 = new ArrayList<>();
+                for (Value v : map.keys()) {
+                    a1.add(v);
+                }
                 ArrayList<Value> a2 = new ArrayList<>(hash.keySet());
                 assertEquals(a1.size(), a2.size());
                 Collections.sort(a1, vc);