Make buffer size of StreamBuffer{Input,Output} and ChannelBuffer{Input,Output}

frsyuki · frsyuki · commit e34df5995936 · 2016-01-05T14:06:34.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
@@ -239,6 +239,8 @@ public static class PackerConfig
 
         private int bufferFlushThreshold = 8192;
 
+        private int bufferSize = 8192;
+
         /**
          * Create a packer that outputs the packed data to a given output
          *
@@ -258,7 +260,7 @@ public MessagePacker newPacker(MessageBufferOutput out)
          */
         public MessagePacker newPacker(OutputStream out)
         {
-            return newPacker(new OutputStreamBufferOutput(out));
+            return newPacker(new OutputStreamBufferOutput(out, bufferSize));
         }
 
         /**
@@ -269,7 +271,7 @@ public MessagePacker newPacker(OutputStream out)
          */
         public MessagePacker newPacker(WritableByteChannel channel)
         {
-            return newPacker(new ChannelBufferOutput(channel));
+            return newPacker(new ChannelBufferOutput(channel, bufferSize));
         }
 
         /**
@@ -299,7 +301,7 @@ public int getSmallStringOptimizationThreshold()
 
         /**
          * When the next payload size exceeds this threshold, MessagePacker will call MessageBufferOutput.flush() before
-         * packing the data.
+         * packing the data (default: 8192).
          */
         public PackerConfig setBufferFlushThreshold(int bytes)
         {
@@ -311,6 +313,21 @@ public int getBufferFlushThreshold()
         {
             return bufferFlushThreshold;
         }
+
+        /**
+         * When a packer is created with newPacker(OutputStream) or newPacker(WritableByteChannel), the stream will be
+         * buffered with this size of buffer (default: 8192).
+         */
+        public PackerConfig setBufferSize(int bytes)
+        {
+            this.bufferSize = bytes;
+            return this;
+        }
+
+        public int getBufferSize()
+        {
+            return bufferSize;
+        }
     }
 
     /**
@@ -328,6 +345,8 @@ public static class UnpackerConfig
 
         private int stringSizeLimit = Integer.MAX_VALUE;
 
+        private int bufferSize = 8192;
+
         /**
          *
          */
@@ -352,7 +371,7 @@ public MessageUnpacker newUnpacker(MessageBufferInput in)
          */
         public MessageUnpacker newUnpacker(InputStream in)
         {
-            return newUnpacker(new InputStreamBufferInput(in));
+            return newUnpacker(new InputStreamBufferInput(in, bufferSize));
         }
 
         /**
@@ -363,7 +382,7 @@ public MessageUnpacker newUnpacker(InputStream in)
          */
         public MessageUnpacker newUnpacker(ReadableByteChannel channel)
         {
-            return newUnpacker(new ChannelBufferInput(channel));
+            return newUnpacker(new ChannelBufferInput(channel, bufferSize));
         }
 
         /**
@@ -389,7 +408,7 @@ public MessageUnpacker newUnpacker(byte[] contents, int offset, int length)
         }
 
         /**
-         * Allow unpackBinaryHeader to read str format family  (default:true)
+         * Allow unpackBinaryHeader to read str format family  (default: true)
          */
         public UnpackerConfig setAllowReadingStringAsBinary(boolean enable)
         {
@@ -445,7 +464,7 @@ public CodingErrorAction getActionOnUnmappableString()
         }
 
         /**
-         * unpackString size limit. (default: Integer.MAX_VALUE)
+         * unpackString size limit (default: Integer.MAX_VALUE).
          */
         public UnpackerConfig setStringSizeLimit(int bytes)
         {
@@ -471,5 +490,20 @@ public int getStringDecoderBufferSize()
         {
             return stringDecoderBufferSize;
         }
+
+        /**
+         * When a packer is created with newUnpacker(OutputStream) or newUnpacker(WritableByteChannel), the stream will be
+         * buffered with this size of buffer (default: 8192).
+         */
+        public UnpackerConfig setBufferSize(int bytes)
+        {
+            this.bufferSize = bytes;
+            return this;
+        }
+
+        public int getBufferSize()
+        {
+            return bufferSize;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,8 @@ public static class PackerConfig`
`239`	`239`
`240`	`240`	`private int bufferFlushThreshold = 8192;`
`241`	`241`
	`242`	`+ private int bufferSize = 8192;`
	`243`	`+`
`242`	`244`	`/**`
`243`	`245`	`* Create a packer that outputs the packed data to a given output`
`244`	`246`	`*`
`@@ -258,7 +260,7 @@ public MessagePacker newPacker(MessageBufferOutput out)`
`258`	`260`	`*/`
`259`	`261`	`public MessagePacker newPacker(OutputStream out)`
`260`	`262`	`{`
`261`		`- return newPacker(new OutputStreamBufferOutput(out));`
	`263`	`+ return newPacker(new OutputStreamBufferOutput(out, bufferSize));`
`262`	`264`	`}`
`263`	`265`
`264`	`266`	`/**`
`@@ -269,7 +271,7 @@ public MessagePacker newPacker(OutputStream out)`
`269`	`271`	`*/`
`270`	`272`	`public MessagePacker newPacker(WritableByteChannel channel)`
`271`	`273`	`{`
`272`		`- return newPacker(new ChannelBufferOutput(channel));`
	`274`	`+ return newPacker(new ChannelBufferOutput(channel, bufferSize));`
`273`	`275`	`}`
`274`	`276`
`275`	`277`	`/**`
`@@ -299,7 +301,7 @@ public int getSmallStringOptimizationThreshold()`
`299`	`301`
`300`	`302`	`/**`
`301`	`303`	`* When the next payload size exceeds this threshold, MessagePacker will call MessageBufferOutput.flush() before`
`302`		`- * packing the data.`
	`304`	`+ * packing the data (default: 8192).`
`303`	`305`	`*/`
`304`	`306`	`public PackerConfig setBufferFlushThreshold(int bytes)`
`305`	`307`	`{`
`@@ -311,6 +313,21 @@ public int getBufferFlushThreshold()`
`311`	`313`	`{`
`312`	`314`	`return bufferFlushThreshold;`
`313`	`315`	`}`
	`316`	`+`
	`317`	`+ /**`
	`318`	`+ * When a packer is created with newPacker(OutputStream) or newPacker(WritableByteChannel), the stream will be`
	`319`	`+ * buffered with this size of buffer (default: 8192).`
	`320`	`+ */`
	`321`	`+ public PackerConfig setBufferSize(int bytes)`
	`322`	`+ {`
	`323`	`+ this.bufferSize = bytes;`
	`324`	`+ return this;`
	`325`	`+ }`
	`326`	`+`
	`327`	`+ public int getBufferSize()`
	`328`	`+ {`
	`329`	`+ return bufferSize;`
	`330`	`+ }`
`314`	`331`	`}`
`315`	`332`
`316`	`333`	`/**`
`@@ -328,6 +345,8 @@ public static class UnpackerConfig`
`328`	`345`
`329`	`346`	`private int stringSizeLimit = Integer.MAX_VALUE;`
`330`	`347`
	`348`	`+ private int bufferSize = 8192;`
	`349`	`+`
`331`	`350`	`/**`
`332`	`351`	`*`
`333`	`352`	`*/`
`@@ -352,7 +371,7 @@ public MessageUnpacker newUnpacker(MessageBufferInput in)`
`352`	`371`	`*/`
`353`	`372`	`public MessageUnpacker newUnpacker(InputStream in)`
`354`	`373`	`{`
`355`		`- return newUnpacker(new InputStreamBufferInput(in));`
	`374`	`+ return newUnpacker(new InputStreamBufferInput(in, bufferSize));`
`356`	`375`	`}`
`357`	`376`
`358`	`377`	`/**`
`@@ -363,7 +382,7 @@ public MessageUnpacker newUnpacker(InputStream in)`
`363`	`382`	`*/`
`364`	`383`	`public MessageUnpacker newUnpacker(ReadableByteChannel channel)`
`365`	`384`	`{`
`366`		`- return newUnpacker(new ChannelBufferInput(channel));`
	`385`	`+ return newUnpacker(new ChannelBufferInput(channel, bufferSize));`
`367`	`386`	`}`
`368`	`387`
`369`	`388`	`/**`
`@@ -389,7 +408,7 @@ public MessageUnpacker newUnpacker(byte[] contents, int offset, int length)`
`389`	`408`	`}`
`390`	`409`
`391`	`410`	`/**`
`392`		`- * Allow unpackBinaryHeader to read str format family (default:true)`
	`411`	`+ * Allow unpackBinaryHeader to read str format family (default: true)`
`393`	`412`	`*/`
`394`	`413`	`public UnpackerConfig setAllowReadingStringAsBinary(boolean enable)`
`395`	`414`	`{`
`@@ -445,7 +464,7 @@ public CodingErrorAction getActionOnUnmappableString()`
`445`	`464`	`}`
`446`	`465`
`447`	`466`	`/**`
`448`		`- * unpackString size limit. (default: Integer.MAX_VALUE)`
	`467`	`+ * unpackString size limit (default: Integer.MAX_VALUE).`
`449`	`468`	`*/`
`450`	`469`	`public UnpackerConfig setStringSizeLimit(int bytes)`
`451`	`470`	`{`
`@@ -471,5 +490,20 @@ public int getStringDecoderBufferSize()`
`471`	`490`	`{`
`472`	`491`	`return stringDecoderBufferSize;`
`473`	`492`	`}`
	`493`	`+`
	`494`	`+ /**`
	`495`	`+ * When a packer is created with newUnpacker(OutputStream) or newUnpacker(WritableByteChannel), the stream will be`
	`496`	`+ * buffered with this size of buffer (default: 8192).`
	`497`	`+ */`
	`498`	`+ public UnpackerConfig setBufferSize(int bytes)`
	`499`	`+ {`
	`500`	`+ this.bufferSize = bytes;`
	`501`	`+ return this;`
	`502`	`+ }`
	`503`	`+`
	`504`	`+ public int getBufferSize()`
	`505`	`+ {`
	`506`	`+ return bufferSize;`
	`507`	`+ }`
`474`	`508`	`}`
`475`	`509`	`}`