Move a configuration parameter to MessagePack.Config

xerial · xerial · commit edb9623a464a · 2014-05-23T10:39:07.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
@@ -36,6 +36,8 @@ public static class Config {
         public int STRING_DECODER_BUFFER_SIZE = 8192;
 
         public int PACKER_BUFFER_SIZE = 8192;
+
+        public int PACKER_FLUSH_THRESHOLD = 512;
     }
 
     /**
diff --git a/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java b/msgpack-core/src/main/java/org/msgpack/core/MessagePacker.java
@@ -99,6 +99,10 @@ public void flush() throws IOException {
         position = 0;
     }
 
+    private void flushBuffer(MessageBuffer b) throws IOException {
+        out.flush(b, 0, b.size());
+    }
+
     public void close() throws IOException {
         try {
             flush();
@@ -437,20 +441,18 @@ public MessagePacker packRawStringHeader(int len) throws IOException {
         return this;
     }
 
-    private final int FLUSH_THRESHOLD = 512;
 
     public MessagePacker writePayload(ByteBuffer src) throws IOException {
-        if(src.remaining() >= FLUSH_THRESHOLD) {
+        if(src.remaining() >= config.PACKER_FLUSH_THRESHOLD) {
             // Use the source ByteBuffer directly to avoid memory copy
 
             // First, flush the current buffer contents
             flush();
 
             // Wrap the input source as a MessageBuffer
-            // TODO Create MessageBuffer.wrap(ByteBuffer, offset, length);
-            MessageBuffer wrapped = MessageBuffer.wrap(src);
+            MessageBuffer wrapped = MessageBuffer.wrap(src).slice(src.position(), src.remaining());
             // Then, dump the source data to the output
-            out.flush(wrapped, src.position(), src.remaining());
+            flushBuffer(wrapped);
             src.position(src.limit());
         }
         else {
@@ -471,16 +473,16 @@ public MessagePacker writePayload(byte[] src) throws IOException {
     }
 
     public MessagePacker writePayload(byte[] src, int off, int len) throws IOException {
-        if(len >= FLUSH_THRESHOLD) {
+        if(len >= config.PACKER_FLUSH_THRESHOLD) {
             // Use the input array directory to avoid memory copy
 
             // Flush the current buffer contents
             flush();
 
             // Wrap the input array as a MessageBuffer
-            MessageBuffer wrapped = MessageBuffer.wrap(src);
+            MessageBuffer wrapped = MessageBuffer.wrap(src).slice(off, len);
             // Dump the source data to the output
-            out.flush(wrapped, off, len);
+            flushBuffer(wrapped);
         }
         else {
             int cursor = 0;
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferOutput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferOutput.java
@@ -19,7 +19,6 @@ public interface MessageBufferOutput extends Closeable {
 
     public void flush(MessageBuffer buf, int offset, int len) throws IOException;
 
-
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@ public static class Config {`
`36`	`36`	`public int STRING_DECODER_BUFFER_SIZE = 8192;`
`37`	`37`
`38`	`38`	`public int PACKER_BUFFER_SIZE = 8192;`
	`39`	`+`
	`40`	`+ public int PACKER_FLUSH_THRESHOLD = 512;`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public interface MessageBufferOutput extends Closeable {`
`19`	`19`
`20`	`20`	`public void flush(MessageBuffer buf, int offset, int len) throws IOException;`
`21`	`21`
`22`		`-`
`23`	`22`	`}`
`24`	`23`
`25`	`24`