MVStore: simplify the cache API a bit

h2/src/main/org/h2/mvstore/cache/CacheLongKeyLIRS.java

@@ -136,6 +136,17 @@ public class CacheLongKeyLIRS<V> {
         return e == null ? null : e.value;
     }
 
+    /**
+     * Add an entry to the cache using the average memory size.
+     *
+     * @param key the key (may not be null)
+     * @param value the value (may not be null)
+     * @return the old value, or null if there was no resident entry
+     */
+    public V put(long key, V value) {
+        return put(key, value, sizeOf(value));
+    }
+
     /**
      * Add an entry to the cache. The entry may or may not exist in the
      * cache yet. This method will usually mark unknown entries as cold and
@@ -152,14 +163,14 @@ public class CacheLongKeyLIRS<V> {
     }
 
     /**
-     * Add an entry to the cache using the average memory size.
+     * Get the size of the given value. The default implementation returns the
+     * average memory as configured for this cache.
      *
-     * @param key the key (may not be null)
-     * @param value the value (may not be null)
-     * @return the old value, or null if there was no resident entry
+     * @param value the value
+     * @return the size
      */
-    public V put(long key, V value) {
-        return put(key, value, averageMemory);
+    protected int sizeOf(V value) {
+        return averageMemory;
     }
 
     /**

h2/src/tools/org/h2/dev/cache/CacheLIRS.java

@@ -161,7 +161,19 @@ public class CacheLIRS<K, V> extends AbstractMap<K, V> implements Map<K, V> {
      * @return the old value, or null if there was no resident entry
      */
     public V put(K key, V value) {
-        return put(key, value, averageMemory);
+        return put(key, value, sizeOf(key, value));
+    }
+
+    /**
+     * Get the size of the given value. The default implementation returns the
+     * average memory as configured for this cache.
+     *
+     * @param key the key
+     * @param value the value
+     * @return the size
+     */
+    protected int sizeOf(K key, V value) {
+        return averageMemory;
     }
 
     /**