Remove release method from MessageBufferInput

xerial · xerial · commit b182ed2ee4d0 · 2015-12-22T18:18:42.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
@@ -204,9 +204,6 @@ private void nextBuffer()
             throw new MessageInsufficientBufferException();
         }
         totalReadBytes += buffer.size();
-        if (buffer != EMPTY_BUFFER) {
-            in.release(buffer);
-        }
         buffer = next;
         position = 0;
     }
@@ -233,9 +230,6 @@ private MessageBuffer readCastBuffer(int length)
             castBuffer.putBytes(remaining, next.getArray(), next.offset(), length - remaining);
 
             totalReadBytes += buffer.size();
-            if (buffer != EMPTY_BUFFER) {
-                in.release(buffer);
-            }
 
             buffer = next;
             position = length - remaining;
@@ -266,9 +260,6 @@ public boolean hasNext()
                 return false;
             }
             totalReadBytes += buffer.size();
-            if (buffer != EMPTY_BUFFER) {
-                in.release(buffer);
-            }
             buffer = next;
             position = 0;
         }
@@ -1429,11 +1420,8 @@ private int readNextLength32()
     public void close()
             throws IOException
     {
-        if (buffer != EMPTY_BUFFER) {
-            in.release(buffer);
-            buffer = EMPTY_BUFFER;
-            position = 0;
-        }
+        buffer = EMPTY_BUFFER;
+        position = 0;
         in.close();
     }
 
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ArrayBufferInput.java
@@ -88,8 +88,4 @@ public void close()
         isRead = false;
     }
 
-    // TODO
-    public void release(MessageBuffer buffer)
-    {
-    }
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ByteBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ByteBufferInput.java
@@ -67,8 +67,4 @@ public void close()
         // Nothing to do
     }
 
-    // TODO
-    public void release(MessageBuffer buffer)
-    {
-    }
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/ChannelBufferInput.java
@@ -29,8 +29,7 @@ public class ChannelBufferInput
         implements MessageBufferInput
 {
     private ReadableByteChannel channel;
-    private boolean reachedEOF = false;
-    private final int bufferSize;
+    private final MessageBuffer m;
 
     public ChannelBufferInput(ReadableByteChannel channel)
     {
@@ -41,7 +40,7 @@ public ChannelBufferInput(ReadableByteChannel channel, int bufferSize)
     {
         this.channel = checkNotNull(channel, "input channel is null");
         checkArgument(bufferSize > 0, "buffer size must be > 0: " + bufferSize);
-        this.bufferSize = bufferSize;
+        this.m = MessageBuffer.newBuffer(bufferSize);
     }
 
     /**
@@ -55,24 +54,18 @@ public ReadableByteChannel reset(ReadableByteChannel channel)
     {
         ReadableByteChannel old = this.channel;
         this.channel = channel;
-        this.reachedEOF = false;
         return old;
     }
 
     @Override
     public MessageBuffer next()
             throws IOException
     {
-        if (reachedEOF) {
-            return null;
-        }
-
-        MessageBuffer m = MessageBuffer.newBuffer(bufferSize);
         ByteBuffer b = m.toByteBuffer();
-        while (!reachedEOF && b.remaining() > 0) {
+        while (b.remaining() > 0) {
             int ret = channel.read(b);
             if (ret == -1) {
-                reachedEOF = true;
+                break;
             }
         }
         b.flip();
@@ -86,8 +79,4 @@ public void close()
         channel.close();
     }
 
-    // TODO
-    public void release(MessageBuffer buffer)
-    {
-    }
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/InputStreamBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/InputStreamBufferInput.java
@@ -29,8 +29,7 @@ public class InputStreamBufferInput
         implements MessageBufferInput
 {
     private InputStream in;
-    private final int bufferSize;
-    private boolean reachedEOF = false;
+    private final byte[] buffer;
 
     public static MessageBufferInput newBufferInput(InputStream in)
     {
@@ -52,7 +51,7 @@ public InputStreamBufferInput(InputStream in)
     public InputStreamBufferInput(InputStream in, int bufferSize)
     {
         this.in = checkNotNull(in, "input is null");
-        this.bufferSize = bufferSize;
+        this.buffer = new byte[bufferSize];
     }
 
     /**
@@ -66,22 +65,15 @@ public InputStream reset(InputStream in)
     {
         InputStream old = this.in;
         this.in = in;
-        reachedEOF = false;
         return old;
     }
 
     @Override
     public MessageBuffer next()
             throws IOException
     {
-        if (reachedEOF) {
-            return null;
-        }
-
-        byte[] buffer = new byte[bufferSize];
         int readLen = in.read(buffer);
         if (readLen == -1) {
-            reachedEOF = true;
             return null;
         }
         return MessageBuffer.wrap(buffer).slice(0, readLen);
@@ -93,9 +85,4 @@ public void close()
     {
         in.close();
     }
-
-    // TODO
-    public void release(MessageBuffer buffer)
-    {
-    }
 }
diff --git a/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferInput.java b/msgpack-core/src/main/java/org/msgpack/core/buffer/MessageBufferInput.java
@@ -27,14 +27,12 @@ public interface MessageBufferInput
     /**
      * Get a next buffer to read.
      *
+     * When this method is called twice, the formally allocated buffer can be safely discarded.
+     *
      * @return the next MessageBuffer, or return null if no more buffer is available.
      * @throws IOException when error occurred when reading the data
      */
     public MessageBuffer next()
             throws IOException;
 
-    /**
-     * Release an unused buffer formerly returned by next() method.
-     */
-    public void release(MessageBuffer buffer);
 }
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/MessageUnpackerTest.scala
@@ -261,8 +261,6 @@ class MessageUnpackerTest extends MessagePackSpec {
         }
       }
 
-      override def release(buffer: MessageBuffer): Unit = {}
-
       override def close(): Unit = {}
     }
 
diff --git a/msgpack-core/src/test/scala/org/msgpack/core/buffer/ByteStringTest.scala b/msgpack-core/src/test/scala/org/msgpack/core/buffer/ByteStringTest.scala
@@ -38,9 +38,6 @@ class ByteStringTest
           isRead = true
           messageBuffer
         }
-
-      override def release(buffer: MessageBuffer): Unit = {}
-
       override def close(): Unit = {}
     }
 

Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,4 @@ public void close()`
`88`	`88`	`isRead = false;`
`89`	`89`	`}`
`90`	`90`
`91`		`- // TODO`
`92`		`- public void release(MessageBuffer buffer)`
`93`		`- {`
`94`		`- }`
`95`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,4 @@ public void close()`
`67`	`67`	`// Nothing to do`
`68`	`68`	`}`
`69`	`69`
`70`		`- // TODO`
`71`		`- public void release(MessageBuffer buffer)`
`72`		`- {`
`73`		`- }`
`74`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ public class ChannelBufferInput`
`29`	`29`	`implements MessageBufferInput`
`30`	`30`	`{`
`31`	`31`	`private ReadableByteChannel channel;`
`32`		`- private boolean reachedEOF = false;`
`33`		`- private final int bufferSize;`
	`32`	`+ private final MessageBuffer m;`
`34`	`33`
`35`	`34`	`public ChannelBufferInput(ReadableByteChannel channel)`
`36`	`35`	`{`
`@@ -41,7 +40,7 @@ public ChannelBufferInput(ReadableByteChannel channel, int bufferSize)`
`41`	`40`	`{`
`42`	`41`	`this.channel = checkNotNull(channel, "input channel is null");`
`43`	`42`	`checkArgument(bufferSize > 0, "buffer size must be > 0: " + bufferSize);`
`44`		`- this.bufferSize = bufferSize;`
	`43`	`+ this.m = MessageBuffer.newBuffer(bufferSize);`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`/**`
`@@ -55,24 +54,18 @@ public ReadableByteChannel reset(ReadableByteChannel channel)`
`55`	`54`	`{`
`56`	`55`	`ReadableByteChannel old = this.channel;`
`57`	`56`	`this.channel = channel;`
`58`		`- this.reachedEOF = false;`
`59`	`57`	`return old;`
`60`	`58`	`}`
`61`	`59`
`62`	`60`	`@Override`
`63`	`61`	`public MessageBuffer next()`
`64`	`62`	`throws IOException`
`65`	`63`	`{`
`66`		`- if (reachedEOF) {`
`67`		`- return null;`
`68`		`- }`
`69`		`-`
`70`		`- MessageBuffer m = MessageBuffer.newBuffer(bufferSize);`
`71`	`64`	`ByteBuffer b = m.toByteBuffer();`
`72`		`- while (!reachedEOF && b.remaining() > 0) {`
	`65`	`+ while (b.remaining() > 0) {`
`73`	`66`	`int ret = channel.read(b);`
`74`	`67`	`if (ret == -1) {`
`75`		`- reachedEOF = true;`
	`68`	`+ break;`
`76`	`69`	`}`
`77`	`70`	`}`
`78`	`71`	`b.flip();`
`@@ -86,8 +79,4 @@ public void close()`
`86`	`79`	`channel.close();`
`87`	`80`	`}`
`88`	`81`
`89`		`- // TODO`
`90`		`- public void release(MessageBuffer buffer)`
`91`		`- {`
`92`		`- }`
`93`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ public class InputStreamBufferInput`
`29`	`29`	`implements MessageBufferInput`
`30`	`30`	`{`
`31`	`31`	`private InputStream in;`
`32`		`- private final int bufferSize;`
`33`		`- private boolean reachedEOF = false;`
	`32`	`+ private final byte[] buffer;`
`34`	`33`
`35`	`34`	`public static MessageBufferInput newBufferInput(InputStream in)`
`36`	`35`	`{`
`@@ -52,7 +51,7 @@ public InputStreamBufferInput(InputStream in)`
`52`	`51`	`public InputStreamBufferInput(InputStream in, int bufferSize)`
`53`	`52`	`{`
`54`	`53`	`this.in = checkNotNull(in, "input is null");`
`55`		`- this.bufferSize = bufferSize;`
	`54`	`+ this.buffer = new byte[bufferSize];`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`/**`
`@@ -66,22 +65,15 @@ public InputStream reset(InputStream in)`
`66`	`65`	`{`
`67`	`66`	`InputStream old = this.in;`
`68`	`67`	`this.in = in;`
`69`		`- reachedEOF = false;`
`70`	`68`	`return old;`
`71`	`69`	`}`
`72`	`70`
`73`	`71`	`@Override`
`74`	`72`	`public MessageBuffer next()`
`75`	`73`	`throws IOException`
`76`	`74`	`{`
`77`		`- if (reachedEOF) {`
`78`		`- return null;`
`79`		`- }`
`80`		`-`
`81`		`- byte[] buffer = new byte[bufferSize];`
`82`	`75`	`int readLen = in.read(buffer);`
`83`	`76`	`if (readLen == -1) {`
`84`		`- reachedEOF = true;`
`85`	`77`	`return null;`
`86`	`78`	`}`
`87`	`79`	`return MessageBuffer.wrap(buffer).slice(0, readLen);`
`@@ -93,9 +85,4 @@ public void close()`
`93`	`85`	`{`
`94`	`86`	`in.close();`
`95`	`87`	`}`
`96`		`-`
`97`		`- // TODO`
`98`		`- public void release(MessageBuffer buffer)`
`99`		`- {`
`100`		`- }`
`101`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,8 +261,6 @@ class MessageUnpackerTest extends MessagePackSpec {`
`261`	`261`	`}`
`262`	`262`	`}`
`263`	`263`
`264`		`- override def release(buffer: MessageBuffer): Unit = {}`
`265`		`-`
`266`	`264`	`override def close(): Unit = {}`
`267`	`265`	`}`
`268`	`266`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,6 @@ class ByteStringTest`
`38`	`38`	`isRead = true`
`39`	`39`	`messageBuffer`
`40`	`40`	`}`
`41`		`-`
`42`		`- override def release(buffer: MessageBuffer): Unit = {}`
`43`		`-`
`44`	`41`	`override def close(): Unit = {}`
`45`	`42`	`}`
`46`	`43`