Add msgpack v6 to compare the performance

xerial · xerial · commit 14177600fe8f · 2014-02-24T16:23:41.000+09:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessageUnpacker.java
@@ -26,8 +26,7 @@ public static class Options {
         //// upcast raw type  // default:true : getNextType returns RAW?
         // allow readBinary and readBinaryLength to read str types  // default:true
         // string decode malformed input action  // default:report
-        // string decode unmappable character action  // default:report
-        // byte buffer bulk allocation cache size
+        // string decode unmappable character action  // default:report        // byte buffer bulk allocation cache size
         // byte buffer allocator
         // allow byte buffer reference : advanced option
         // raw size limit
diff --git a/msgpack-core/src/test/java/org/msgpack/core/Person.java b/msgpack-core/src/test/java/org/msgpack/core/Person.java
@@ -0,0 +1,17 @@
+package org.msgpack.core;
+
+import org.msgpack.annotation.Message;
+
+@Message
+public class Person {
+    public int id;
+    public String name;
+
+    public Person() {}
+
+
+    public Person(int id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+}
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala
@@ -1,8 +1,19 @@
 package org.msgpack.core
 import org.scalatest.prop.PropertyChecks._
+import org.msgpack.MessagePack
+import org.msgpack.annotation.Message
 
 
+object MessagePackTest {
+
+
+
+}
+
 class MessagePackerTest extends MessagePackSpec {
+
+  import MessagePackTest._
+
   "MessagePacker" should {
 
     "serialize primitives" in {
@@ -17,7 +28,12 @@ class MessagePackerTest extends MessagePackSpec {
     }
 
     "be used with 0.6.x" in {
+      val p = new Person(1, "leo")
+      val v6 = new MessagePack()
+      v6.setClassLoader(classOf[Message].getClassLoader())
 
+      //v6.register(classOf[Person])
+      val packed = v6.write(p)
 
 
     }
diff --git a/project/Build.scala b/project/Build.scala
@@ -36,6 +36,7 @@ object Build extends Build {
     crossPaths := false,
     // Since sbt-0.13.2
     incOptions := incOptions.value.withNameHashing(true),
+    //resolvers += Resolver.mavenLocal,
     scalacOptions ++= Seq("-encoding", "UTF-8", "-deprecation", "-unchecked", "-target:jvm-1.6", "-feature"),
     pomExtra := {
       <url>http://msgpack.org/</url>
@@ -92,7 +93,7 @@ object Build extends Build {
       "org.scalatest" % "scalatest_2.10" % "2.1.0-RC2" % "test",
       "org.scalacheck" % "scalacheck_2.10" % "1.11.3" % "test",
       "org.xerial" % "xerial-core" % "3.2.3" % "test",
-      "org.msgpack" % "msgpack-java" % "0.6.9" % "test"
+      "org.msgpack" % "msgpack" % "0.6.9" % "test"
     )
   }
 
@@ -104,4 +105,4 @@ object Build extends Build {
 
 
 
- 
+
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,3 +3,4 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.7.1")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.0")
 
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")

Original file line number	Diff line number	Diff line change
`@@ -3,3 +3,4 @@ addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.7.1")`
`3`	`3`
`4`	`4`	`addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.0")`
`5`	`5`
	`6`	`+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")`