Change the param name of configuration to packerSmallStringOptimizationThreshold

komamitsu · komamitsu · commit 5c80a861d928 · 2015-11-16T23:45:33.000+09: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
@@ -50,7 +50,7 @@ public static class Config
         private final int stringEncoderBufferSize;
         private final int stringDecoderBufferSize;
         private final int packerBufferSize;
-        private final int packerLargeStringThreshold;
+        private final int packerSmallStringOptimizationThreshold; // This parameter is subject to change
         private final int packerRawDataCopyingThreshold;
 
         public Config(
@@ -62,7 +62,7 @@ public Config(
                 int stringEncoderBufferSize,
                 int stringDecoderBufferSize,
                 int packerBufferSize,
-                int packerLargeStringLengthThreshold,
+                int packerSmallStringOptimizationThreshold,
                 int packerRawDataCopyingThreshold)
         {
             checkArgument(packerBufferSize > 0, "packer buffer size must be larger than 0: " + packerBufferSize);
@@ -77,7 +77,7 @@ public Config(
             this.stringEncoderBufferSize = stringEncoderBufferSize;
             this.stringDecoderBufferSize = stringDecoderBufferSize;
             this.packerBufferSize = packerBufferSize;
-            this.packerLargeStringThreshold = packerLargeStringLengthThreshold;
+            this.packerSmallStringOptimizationThreshold = packerSmallStringOptimizationThreshold;
             this.packerRawDataCopyingThreshold = packerRawDataCopyingThreshold;
         }
 
@@ -136,9 +136,9 @@ public int getPackerBufferSize()
             return packerBufferSize;
         }
 
-        public int getPackerLargeStringLengthThreshold()
+        public int getPackerSmallStringOptimizationThreshold()
         {
-            return packerLargeStringThreshold;
+            return packerSmallStringOptimizationThreshold;
         }
 
         public int getPackerRawDataCopyingThreshold()
@@ -162,7 +162,7 @@ public static class ConfigBuilder
         private int stringEncoderBufferSize = 8192;
         private int stringDecoderBufferSize = 8192;
         private int packerBufferSize = 8192;
-        private int packerLargeStringLengthThreshold = 512;
+        private int packerSmallStringOptimizationThreshold = 512; // This parameter is subject to change
         private int packerRawDataCopyingThreshold = 512;
 
         public Config build()
@@ -176,7 +176,7 @@ public Config build()
                     stringEncoderBufferSize,
                     stringDecoderBufferSize,
                     packerBufferSize,
-                    packerLargeStringLengthThreshold,
+                    packerSmallStringOptimizationThreshold,
                     packerRawDataCopyingThreshold
             );
         }
@@ -229,9 +229,9 @@ public ConfigBuilder packerBufferSize(int size)
             return this;
         }
 
-        public ConfigBuilder packerLargeStringThreshold(int threshold)
+        public ConfigBuilder packerSmallStringOptimizationThreshold(int threshold)
         {
-            this.packerLargeStringLengthThreshold = threshold;
+            this.packerSmallStringOptimizationThreshold = threshold;
             return this;
         }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -445,7 +445,7 @@ public MessagePacker packDouble(double v)
     private void packSmallString(String s)
             throws IOException
     {
-        byte[] bytes = s.getBytes("UTF-8");
+        byte[] bytes = s.getBytes(MessagePack.UTF8);
         packRawStringHeader(bytes.length);
         writePayload(bytes);
     }
@@ -465,7 +465,7 @@ public MessagePacker packString(String s)
             return this;
         }
 
-        if (s.length() < config.getPackerLargeStringLengthThreshold()) {
+        if (s.length() < config.getPackerSmallStringOptimizationThreshold()) {
             // Write the length and payload of small string to the buffer so that it avoids an extra flush of buffer
             packSmallString(s);
             return this;

Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ public MessagePacker packDouble(double v)`
`445`	`445`	`private void packSmallString(String s)`
`446`	`446`	`throws IOException`
`447`	`447`	`{`
`448`		`- byte[] bytes = s.getBytes("UTF-8");`
	`448`	`+ byte[] bytes = s.getBytes(MessagePack.UTF8);`
`449`	`449`	`packRawStringHeader(bytes.length);`
`450`	`450`	`writePayload(bytes);`
`451`	`451`	`}`
`@@ -465,7 +465,7 @@ public MessagePacker packString(String s)`
`465`	`465`	`return this;`
`466`	`466`	`}`
`467`	`467`
`468`		`- if (s.length() < config.getPackerLargeStringLengthThreshold()) {`
	`468`	`+ if (s.length() < config.getPackerSmallStringOptimizationThreshold()) {`
`469`	`469`	`// Write the length and payload of small string to the buffer so that it avoids an extra flush of buffer`
`470`	`470`	`packSmallString(s);`
`471`	`471`	`return this;`