Merge v07-develop

xerial · xerial · commit a839b888e900 · 2015-11-16T23:20:43.000-08:00
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePack.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePack.java
@@ -66,6 +66,11 @@ public static class Config
         public final int stringDecoderBufferSize;
         public final int packerBufferSize;
         public final int packerRawDataCopyingThreshold;
+        /**
+         * Use String.getBytes() for strings smaller than this threshold.
+         * Note that this parameter is subject to change.
+         */
+        public final int packerSmallStringOptimizationThreshold;
 
         public Config(
                 boolean readStringAsBinary,
@@ -76,6 +81,7 @@ public Config(
                 int stringEncoderBufferSize,
                 int stringDecoderBufferSize,
                 int packerBufferSize,
+                int packerSmallStringOptimizationThreshold,
                 int packerRawDataCopyingThreshold)
         {
             checkArgument(packerBufferSize > 0, "packer buffer size must be larger than 0: " + packerBufferSize);
@@ -90,6 +96,7 @@ public Config(
             this.stringEncoderBufferSize = stringEncoderBufferSize;
             this.stringDecoderBufferSize = stringDecoderBufferSize;
             this.packerBufferSize = packerBufferSize;
+            this.packerSmallStringOptimizationThreshold = packerSmallStringOptimizationThreshold;
             this.packerRawDataCopyingThreshold = packerRawDataCopyingThreshold;
         }
     }
@@ -109,6 +116,7 @@ public static class ConfigBuilder
         private int stringEncoderBufferSize = 8192;
         private int stringDecoderBufferSize = 8192;
         private int packerBufferSize = 8192;
+        private int packerSmallStringOptimizationThreshold = 512; // This parameter is subject to change
         private int packerRawDataCopyingThreshold = 512;
 
         public Config build()
@@ -122,6 +130,7 @@ public Config build()
                     stringEncoderBufferSize,
                     stringDecoderBufferSize,
                     packerBufferSize,
+                    packerSmallStringOptimizationThreshold,
                     packerRawDataCopyingThreshold
             );
         }
@@ -174,6 +183,12 @@ public ConfigBuilder packerBufferSize(int size)
             return this;
         }
 
+        public ConfigBuilder packerSmallStringOptimizationThreshold(int threshold)
+        {
+            this.packerSmallStringOptimizationThreshold = threshold;
+            return this;
+        }
+
         public ConfigBuilder packerRawDataCopyingThreshold(int threshold)
         {
             this.packerRawDataCopyingThreshold = threshold;
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -442,6 +442,14 @@ public MessagePacker packDouble(double v)
         return this;
     }
 
+    private void packSmallString(String s)
+            throws IOException
+    {
+        byte[] bytes = s.getBytes(MessagePack.UTF8);
+        packRawStringHeader(bytes.length);
+        writePayload(bytes);
+    }
+
     /**
      * Pack the input String in UTF-8 encoding
      *
@@ -457,6 +465,12 @@ public MessagePacker packString(String s)
             return this;
         }
 
+        if (s.length() < config.packerSmallStringOptimizationThreshold) {
+            // Write the length and payload of small string to the buffer so that it avoids an extra flush of buffer
+            packSmallString(s);
+            return this;
+        }
+
         CharBuffer in = CharBuffer.wrap(s);
         prepareEncoder();
 
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessagePackerTest.scala
@@ -235,6 +235,32 @@ class MessagePackerTest
       up1.hasNext shouldBe false
       up1.close
     }
+
+    "pack a lot of String within expected time" in {
+      val count = 20000
+
+      def measureDuration(outputStream: java.io.OutputStream) = {
+        val packer = MessagePack.newDefaultPacker(outputStream)
+        var i = 0
+        while (i < count) {
+          packer.packString("0123456789ABCDEF")
+          i +=  1
+        }
+        packer.close
+      }
+
+      val t = time("packString into OutputStream", repeat = 10) {
+        block("byte-array-output-stream") {
+          measureDuration(new ByteArrayOutputStream())
+        }
+
+        block("file-output-stream") {
+          val (_, fileOutput) = createTempFileWithOutputStream
+          measureDuration(fileOutput)
+        }
+      }
+      t("file-output-stream").averageWithoutMinMax shouldBe < (t("byte-array-output-stream").averageWithoutMinMax * 4)
+    }
   }
 
   "compute totalWrittenBytes" in {
