From b612bc5678625667bd16a9199d6fd51a8e4ccabf Mon Sep 17 00:00:00 2001
From: Peter Lawrey <peter.lawrey@higherfrequencytrading.com>
Date: Sun, 9 Nov 2014 14:01:22 +0000
Subject: [PATCH] HCOLL-194 Code tidy.

---
 .../openhft/chronicle/hash/ChronicleHash.java    |  3 +--
 .../hash/serialization/BytesReader.java          |  2 +-
 .../map/AbstractChronicleMapBuilder.java         | 16 ++++++++++------
 .../map/OffHeapUpdatableChronicleMapBuilder.java | 14 ++++++++------
 .../net/openhft/chronicle/map/OSResizesMain.java |  2 +-
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/hash/ChronicleHash.java b/src/main/java/net/openhft/chronicle/hash/ChronicleHash.java
index 93b34eaa8..4ee1d92c1 100644
--- a/src/main/java/net/openhft/chronicle/hash/ChronicleHash.java
+++ b/src/main/java/net/openhft/chronicle/hash/ChronicleHash.java
@@ -37,8 +37,7 @@ public interface ChronicleHash extends Closeable {
      *
      * @return the file this {@link ChronicleMap} or {@link ChronicleSet} is mapped to,
      *         or {@code null} if it is not mapped to any file
-     * @see ChronicleHashBuilder#file(java.io.File)
-     * @see ChronicleHashBuilder#create()
+     * @see ChronicleHashBuilder#createPersistedTo(java.io.File)
      */
     File file();
 
diff --git a/src/main/java/net/openhft/chronicle/hash/serialization/BytesReader.java b/src/main/java/net/openhft/chronicle/hash/serialization/BytesReader.java
index b43ba57aa..05e9aa391 100644
--- a/src/main/java/net/openhft/chronicle/hash/serialization/BytesReader.java
+++ b/src/main/java/net/openhft/chronicle/hash/serialization/BytesReader.java
@@ -53,7 +53,7 @@ import java.io.Serializable;
  *         } else {
  *             res = new LongPair[resLen];
  *         }
- *         for (int i = 0; i < resLen; i++) {
+ *         for (int i = 0; i &lt; resLen; i++) {
  *             LongPair pair = res[i];
  *             if (pair == null)
  *                 res[i] = pair = new LongPair();
diff --git a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
index 44c578a79..7b77c10ac 100644
--- a/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/AbstractChronicleMapBuilder.java
@@ -390,16 +390,20 @@ public abstract class AbstractChronicleMapBuilder<K, V,
             if (entries <= power * power * power)
                 return power;
         }
-        long size = entrySize * entries;
-        if (size < 20L * 1000 * 1000) // 20 MB
+        long size = (entrySize + 32) * entries;
+        if (size < 10L * 1000 * 1000) // 10 MB
             return 64;
-        if (size < 200L * 1000 * 1000) // 200 MB
+        if (size < 100L * 1000 * 1000) // 100 MB
             return 128;
-        if (size < 800L * 1000 * 1000) // 800 MB
+        if (size < 400L * 1000 * 1000) // 400 MB
             return 256;
-        if (size < 2L * 1000 * 1000 * 1000) // 2 GB
+        if (size < 1L * 1000 * 1000 * 1000) // 1 GB
             return 512;
-        return 1024;
+        if (size < 10L * 1000 * 1000 * 1000) // 10 GB
+            return 1024;
+        if (size < 100L * 1000 * 1000 * 1000) // 100 GB
+            return 2048;
+        return 4096;
     }
 
     @Override
diff --git a/src/main/java/net/openhft/chronicle/map/OffHeapUpdatableChronicleMapBuilder.java b/src/main/java/net/openhft/chronicle/map/OffHeapUpdatableChronicleMapBuilder.java
index 0c7880724..41ef51679 100644
--- a/src/main/java/net/openhft/chronicle/map/OffHeapUpdatableChronicleMapBuilder.java
+++ b/src/main/java/net/openhft/chronicle/map/OffHeapUpdatableChronicleMapBuilder.java
@@ -25,13 +25,15 @@ public final class OffHeapUpdatableChronicleMapBuilder<K, V>
 
     public static <K, V> OffHeapUpdatableChronicleMapBuilder<K, V> of(
             @NotNull Class<K> keyClass, @NotNull Class<V> valueClass) {
-        if (!offHeapReference(valueClass)) {
-            if (!valueClass.isInterface()) {
-                throw new IllegalArgumentException(
-                        "Value class should be either Byteable subclass or interface," +
-                                "allowing direct Byteable implementation generation");
-            }
+        if (keyClass.isInterface() && keyClass != CharSequence.class) {
+            keyClass = DataValueClasses.directClassFor(keyClass);
+        }
+        if (valueClass.isInterface()) {
             valueClass = DataValueClasses.directClassFor(valueClass);
+        } else if (!offHeapReference(valueClass)) {
+            throw new IllegalArgumentException(
+                    "Value class should be either Byteable subclass or interface," +
+                            "allowing direct Byteable implementation generation");
         }
         return new OffHeapUpdatableChronicleMapBuilder<K, V>(keyClass, valueClass);
     }
diff --git a/src/test/java/net/openhft/chronicle/map/OSResizesMain.java b/src/test/java/net/openhft/chronicle/map/OSResizesMain.java
index da15a2848..814425eda 100644
--- a/src/test/java/net/openhft/chronicle/map/OSResizesMain.java
+++ b/src/test/java/net/openhft/chronicle/map/OSResizesMain.java
@@ -37,7 +37,7 @@ public class OSResizesMain {
         File file = File.createTempFile("over-sized", "deleteme");
         ChronicleMap<String, String> map = ChronicleMapBuilder.of(String.class, String.class)
                 .entrySize(100 * 1024 * 1024)
-                .entries(1000000).create();
+                .entries(1000 * 1000).create();
         for (int i = 0; i < 10000; i++) {
             char[] chars = new char[i];
             Arrays.fill(chars, '+');