[GITFLOW]merging 'release/0.4' into 'master'

Author: snazy

CHANGES.txt

@@ -1,3 +1,8 @@
+0.4.0
+=====
+
+#15 Refactor serialization to use java.nio.ByteBuffer instead of streams
+
 0.3.6
 =====
 #11 add putIfAbsentDirect() and addOrReplaceDirect()

ohc-benchmark/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.caffinitas.ohc</groupId>
         <artifactId>ohc-parent</artifactId>
-        <version>0.3.6</version>
+        <version>0.4</version>
         <relativePath>..</relativePath>
     </parent>
 
     <artifactId>ohc-benchmark</artifactId>
-    <version>0.3.6</version>
+    <version>0.4</version>
 
     <name>OHC benchmark executable</name>
     <description>Off-Heap concurrent hash map intended to store GBs of serialized data</description>
@@ -76,12 +76,12 @@
         <dependency>
             <groupId>org.caffinitas.ohc</groupId>
             <artifactId>ohc-core</artifactId>
-            <version>0.3.6</version>
+            <version>0.4</version>
         </dependency>
         <dependency>
             <groupId>org.caffinitas.ohc</groupId>
             <artifactId>ohc-core-j8</artifactId>
-            <version>0.3.6</version>
+            <version>0.4</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>

ohc-benchmark/src/main/java/org/caffinitas/ohc/benchmark/BenchmarkUtils.java

@@ -18,19 +18,20 @@
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
+import java.nio.ByteBuffer;
 
 import org.caffinitas.ohc.CacheSerializer;
 
 public final class BenchmarkUtils {
     public static final CacheSerializer<byte[]> serializer = new CacheSerializer<byte[]>() {
-        public void serialize(byte[] bytes, DataOutput stream) throws IOException {
-            stream.writeInt(bytes.length);
-            stream.write(bytes);
+        public void serialize(byte[] bytes, ByteBuffer buf) {
+            buf.putInt(bytes.length);
+            buf.put(bytes);
         }
 
-        public byte[] deserialize(DataInput stream) throws IOException {
-            byte[] bytes = new byte[stream.readInt()];
-            stream.readFully(bytes);
+        public byte[] deserialize(ByteBuffer buf) {
+            byte[] bytes = new byte[buf.getInt()];
+            buf.get(bytes);
             return bytes;
         }
 
@@ -41,14 +42,14 @@ public int serializedSize(byte[] t) {
 
     public static final CacheSerializer<Long> longSerializer = new CacheSerializer<Long>()
     {
-        public void serialize(Long val, DataOutput out) throws IOException
+        public void serialize(Long val, ByteBuffer buf)
         {
-            out.writeLong(val);
+            buf.putLong(val);
         }
 
-        public Long deserialize(DataInput in) throws IOException
+        public Long deserialize(ByteBuffer buf)
         {
-            return in.readLong();
+            return buf.getLong();
         }
 
         public int serializedSize(Long value)
@@ -66,18 +67,18 @@ public KeySerializer(int keyLen)
             this.keyLen = keyLen;
         }
 
-        public void serialize(Long val, DataOutput out) throws IOException
+        public void serialize(Long val, ByteBuffer buf)
         {
-            out.writeLong(val);
+            buf.putLong(val);
             for (int i = 0; i < keyLen; i++)
-                out.write(0);
+                buf.put((byte)(0 & 0xff));
         }
 
-        public Long deserialize(DataInput in) throws IOException
+        public Long deserialize(ByteBuffer buf)
         {
-            long v = in.readLong();
+            long v = buf.getLong();
             for (int i = 0; i < keyLen; i++)
-                in.readByte();
+                buf.get();
             return v;
         }
 

ohc-core-j8/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.caffinitas.ohc</groupId>
         <artifactId>ohc-parent</artifactId>
-        <version>0.3.6</version>
+        <version>0.4</version>
         <relativePath>..</relativePath>
     </parent>
 
     <artifactId>ohc-core-j8</artifactId>
-    <version>0.3.6</version>
+    <version>0.4</version>
 
     <name>OHC core - Java8 optimization</name>
     <description>Off-Heap concurrent hash map intended to store GBs of serialized data</description>

ohc-core-j8/src/main/java/org/caffinitas/ohc/linked/UnsExt8.java

@@ -31,16 +31,6 @@ long getAndPutLong(long address, long offset, long value)
         return unsafe.getAndSetLong(null, address + offset, value);
     }
 
-    long getAndAddLong(long address, long offset, long value)
-    {
-        return unsafe.getAndAddLong(null, address + offset, value);
-    }
-
-    int getAndPutInt(long address, long offset, int value)
-    {
-        return unsafe.getAndSetInt(null, address + offset, value);
-    }
-
     int getAndAddInt(long address, long offset, int value)
     {
         return unsafe.getAndAddInt(null, address + offset, value);

ohc-core-j8/src/main/java/org/caffinitas/ohc/tables/UnsExt8.java

@@ -29,16 +29,6 @@ long getAndPutLong(long address, long offset, long value)
         return unsafe.getAndSetLong(null, address + offset, value);
     }
 
-    long getAndAddLong(long address, long offset, long value)
-    {
-        return unsafe.getAndAddLong(null, address + offset, value);
-    }
-
-    int getAndPutInt(long address, long offset, int value)
-    {
-        return unsafe.getAndSetInt(null, address + offset, value);
-    }
-
     int getAndAddInt(long address, long offset, int value)
     {
         return unsafe.getAndAddInt(null, address + offset, value);

ohc-core/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.caffinitas.ohc</groupId>
         <artifactId>ohc-parent</artifactId>
-        <version>0.3.6</version>
+        <version>0.4</version>
         <relativePath>..</relativePath>
     </parent>
 
     <artifactId>ohc-core</artifactId>
-    <version>0.3.6</version>
+    <version>0.4</version>
 
     <name>OHC core</name>
     <description>Off-Heap concurrent hash map intended to store GBs of serialized data</description>

ohc-core/src/main/java/org/caffinitas/ohc/CacheSerializer.java

@@ -15,38 +15,36 @@
  */
 package org.caffinitas.ohc;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
+import java.nio.ByteBuffer;
 
 /**
- * Serialize and deserialize cached data using {@link java.io.DataInput} and {@link java.io.DataOutput}.
+ * Serialize and deserialize cached data using {@link java.nio.ByteBuffer}
  */
 public interface CacheSerializer<T>
 {
     /**
-     * Serialize the specified type into the specified {@code DataOutput} instance.
+     * Serialize the specified type into the specified {@code ByteBuffer} instance.
      *
      * @param t   type that needs to be serialized
-     * @param out {@code DataOutput} into which serialization needs to happen.
+     * @param buf {@code ByteBuffer} into which serialization needs to happen.
      */
-    public void serialize(T t, DataOutput out) throws IOException;
+    void serialize(T t, ByteBuffer buf);
 
     /**
      * Deserialize from the specified {@code DataInput} instance.
      *
-     * @param in {@code DataInput} from which deserialization needs to happen.
+     * @param buf {@code ByteBuffer} from which deserialization needs to happen.
      * @return the type that was deserialized
      */
-    public T deserialize(DataInput in) throws IOException;
+    T deserialize(ByteBuffer buf);
 
     /**
-     * Calculate the number of bytes that will be produced by {@link #serialize(Object, java.io.DataOutput)}
+     * Calculate the number of bytes that will be produced by {@link #serialize(Object, java.nio.ByteBuffer)}
      * for given object {@code t}.
      *
      * @param t object to calculate serialized size for
      * @return serialized size of {@code t}
      */
-    public int serializedSize(T t);
+    int serializedSize(T t);
 }
 

ohc-core/src/main/java/org/caffinitas/ohc/DirectValueAccess.java

@@ -29,12 +29,4 @@
 public interface DirectValueAccess extends Closeable
 {
     ByteBuffer buffer();
-
-    void abort();
-
-    /**
-     * Similar to {@link #close()} but returns a success result for {@link OHCache#putIfAbsentDirect(Object, long)}
-     * and {@link OHCache#addOrReplaceDirect(Object, DirectValueAccess, long)}.
-     */
-    boolean commit();
 }

ohc-core/src/main/java/org/caffinitas/ohc/OHCache.java

@@ -63,35 +63,6 @@ public interface OHCache<K, V> extends Closeable
 
     boolean containsKey(K key);
 
-    // direct access support
-
-    /**
-     * Adds the key/value.
-     * If the entry size of key/value exceeds the configured maximum entry length, any previously existing entry
-     * for the key is removed.
-     * The entry is visible for other methods, when the returned {@link DirectValueAccess} is closed.
-     */
-    DirectValueAccess putDirect(K key, long valueLen);
-
-    /**
-     * Adds the key/value if no key is present at the time the method is invoked.
-     * If the entry size of key/value exceeds the configured maximum entry length, any previously existing entry
-     * for the key is removed.
-     * The entry is visible for other methods, when the returned {@link DirectValueAccess} is closed.
-     *
-     * @return the modifiable byte buffer or {@code null} if a matching key already exists
-     */
-    DirectValueAccess putIfAbsentDirect(K k, long valueLen);
-
-    /**
-     * Adds key/value if either the key is not present or the existing value matches parameter {@code old}.
-     * If the entry size of key/value exceeds the configured maximum entry length, the old value is removed.
-     * The entry is visible for other methods, when the returned {@link DirectValueAccess} is closed.
-     *
-     * @return the modifiable byte buffer or {@code null} if no matching key exists
-     */
-    DirectValueAccess addOrReplaceDirect(K k, DirectValueAccess old, long valueLen);
-
     /**
      * Returns a closeable byte buffer.
      * You must close the returned {@link DirectValueAccess} instance after use.
@@ -196,5 +167,5 @@ public interface OHCache<K, V> extends Closeable
      * disable the cache, it will continue to work but cannot add more data.
      * </p>
      */
-    public void setCapacity(long capacity);
+    void setCapacity(long capacity);
 }