Move to kryo 2

jkubrynski · Aug 5, 2012 · 3a39da6 · 3a39da6
1 parent eb5bc14
commit 3a39da6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,16 +49,18 @@
       <version>0.5-rc1</version>
     </dependency>
 
+<!--
     <dependency>
       <groupId>com.googlecode</groupId>
       <artifactId>kryo</artifactId>
       <version>1.04</version>
     </dependency>
+-->
 
-<!--    <dependency>
+    <dependency>
       <groupId>com.esotericsoftware.kryo</groupId>
       <artifactId>kryo</artifactId>
       <version>2.19</version>
-    </dependency>-->
+    </dependency>
   </dependencies>
 </project>
diff --git a/src/main/java/com/kubrynski/poc/serial/ObjectWriteTest.java b/src/main/java/com/kubrynski/poc/serial/ObjectWriteTest.java
@@ -1,9 +1,10 @@
 package com.kubrynski.poc.serial;
 
 import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
 
 import java.io.*;
-import java.nio.ByteBuffer;
 
 /**
  * @author Jakub Kubrynski <jkubrynski@gmail.com>
@@ -16,9 +17,15 @@ public class ObjectWriteTest {
   public static final String FILE_MODE_RW = "rw";
   public static final String FILE_MODE_R = "r";
 
+/*
   public static SerializationTest buildKryoSerialization() {
     return new KryoSerialization();
   }
+*/
+
+  public static SerializationTest buildKryo2Serialization() {
+    return new Kryo2Serialization();
+  }
 
   public static SerializationTest buildDirectSerialization() {
     return new DirectSerialization();
@@ -122,6 +129,7 @@ public TestObject testReadBuffered(String fileName) throws IOException {
     }
   }
 
+/*
   private static class KryoSerialization implements SerializationTest {
 
     private static Kryo kryo = new Kryo();
@@ -150,6 +158,7 @@ public TestObject testReadBuffered(String fileName) throws IOException {
       try {
         raf = new RandomAccessFile(fileName, FILE_MODE_R);
         ByteBuffer byteBuffer = ByteBuffer.allocate(MAX_BUFFER_SIZE);
+        raf.read(byteBuffer.array());
         return kryo.readObject(byteBuffer, TestObject.class);
       } finally {
         if (raf != null) {
@@ -158,8 +167,8 @@ public TestObject testReadBuffered(String fileName) throws IOException {
       }
     }
   }
+*/
 
-/*
   private static class Kryo2Serialization implements SerializationTest {
 
     private static Kryo kryo = new Kryo();
@@ -191,7 +200,6 @@ public TestObject testReadBuffered(String fileName) throws IOException {
 
     }
   }
-*/
 
 
 }
diff --git a/src/main/java/com/kubrynski/poc/serial/ObjectWriterBenchmark.java b/src/main/java/com/kubrynski/poc/serial/ObjectWriterBenchmark.java
@@ -66,10 +66,10 @@ SerializationTest create() {
       }
     },
 
-    KRYO {
+    KRYO2 {
       @Override
       SerializationTest create() {
-        return ObjectWriteTest.buildKryoSerialization();
+        return ObjectWriteTest.buildKryo2Serialization();
       }
     },