added LinkedBufferInput#copyReferencedBuffer

frsyuki · frsyuki · commit 5c92d1dfb689 · 2011-11-17T08:33:05.000+09:00
diff --git a/src/main/java/org/msgpack/io/LinkedBufferInput.java b/src/main/java/org/msgpack/io/LinkedBufferInput.java
@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.io.EOFException;
 import java.util.LinkedList;
+import java.util.Iterator;
 import java.nio.ByteBuffer;
 
 public class LinkedBufferInput extends AbstractInput {
@@ -315,7 +316,7 @@ public void feed(ByteBuffer buf, boolean nocopy) {
     }
 
     public void clear() {
-        if (writable > 0) {
+        if (writable >= 0) {
             ByteBuffer bb = link.getLast();
             link.clear();
             bb.position(0);
@@ -328,6 +329,46 @@ public void clear() {
         }
     }
 
+    public void copyReferencedBuffer() {
+        if (link.isEmpty()) {
+            return;
+        }
+
+        int size = 0;
+        for(ByteBuffer bb : link) {
+            size += bb.remaining();
+        }
+        if (size == 0) {
+            return;
+        }
+
+        if (writable >= 0) {
+            ByteBuffer last = link.removeLast();
+            byte[] copy = new byte[size - last.remaining()];
+            int off = 0;
+            for(ByteBuffer bb : link) {
+                int len = bb.remaining();
+                bb.get(copy, off, len);
+                off += len;
+            }
+            link.clear();
+            link.add(ByteBuffer.wrap(copy));
+            link.add(last);
+
+        } else {
+            byte[] copy = new byte[size];
+            int off = 0;
+            for(ByteBuffer bb : link) {
+                int len = bb.remaining();
+                bb.get(copy, off, len);
+                off += len;
+            }
+            link.clear();
+            link.add(ByteBuffer.wrap(copy));
+            writable = 0;
+        }
+    }
+
     public void close() {
     }
 }
diff --git a/src/test/java/org/msgpack/io/TestLinkedBufferInput.java b/src/test/java/org/msgpack/io/TestLinkedBufferInput.java
@@ -439,6 +439,101 @@ public void testClear() throws IOException {
         }
     }
 
+    @Test
+    public void testClearRecycle() throws IOException {
+        byte[] data = new byte[8];
+        data[0] = (byte)1;
+        data[2] = (byte)1;
+        data[4] = (byte)1;
+
+        LinkedBufferInput b = new LinkedBufferInput(16);
+
+        b.feed(data);
+        assertEquals(1, b.link.size());
+        assertEquals(8, b.writable);
+        b.clear();
+        assertEquals(1, b.link.size());
+        assertEquals(16, b.writable);
+
+        b.feed(data);
+        b.feed(data);
+        assertEquals(1, b.link.size());
+        assertEquals(0, b.writable);
+        b.clear();
+        assertEquals(1, b.link.size());
+        assertEquals(16, b.writable);
+    }
+
+    @Test
+    public void testCopyReferencedBuffer() throws IOException {
+        byte[] data = new byte[16];
+        data[0] = (byte)4;
+        data[3] = (byte)5;
+        data[6] = (byte)6;
+        data[10] = (byte)7;
+
+        LinkedBufferInput b = new LinkedBufferInput(32);
+        int n;
+        byte[] buf = new byte[16];
+
+        b.feed(data, true);
+        b.feed(data, true);
+        b.feed(data, true);
+        assertEquals(3, b.link.size());
+        assertEquals(-1, b.writable);
+
+        b.copyReferencedBuffer();
+        assertEquals(1, b.link.size());
+        assertEquals(0, b.writable);
+
+        n = b.read(buf, 0, 16);
+        assertEquals(n, 16);
+        assertArrayEquals(data, buf);
+
+        n = b.read(buf, 0, 16);
+        assertEquals(n, 16);
+        assertArrayEquals(data, buf);
+
+        n = b.read(buf, 0, 16);
+        assertEquals(n, 16);
+        assertArrayEquals(data, buf);
+    }
+
+    @Test
+    public void testCopyReferencedBufferOptimized() throws IOException {
+        byte[] data = new byte[16];
+        data[0] = (byte)4;
+        data[3] = (byte)5;
+        data[6] = (byte)6;
+        data[10] = (byte)7;
+
+        LinkedBufferInput b = new LinkedBufferInput(32);
+        int n;
+        byte[] buf = new byte[16];
+
+        b.feed(data, true);
+        b.feed(data, true);
+        b.feed(data);  // buffer allocated
+        assertEquals(3, b.link.size());
+        assertEquals(16, b.writable);
+
+        b.copyReferencedBuffer();
+        assertEquals(2, b.link.size());
+        assertEquals(16, b.writable);
+
+        n = b.read(buf, 0, 16);
+        assertEquals(n, 16);
+        assertArrayEquals(data, buf);
+
+        n = b.read(buf, 0, 16);
+        assertEquals(n, 16);
+        assertArrayEquals(data, buf);
+
+        n = b.read(buf, 0, 16);
+        assertEquals(n, 16);
+        assertArrayEquals(data, buf);
+    }
+
     @Test
     public void testBufferRecycleByteArray() throws IOException {
         byte[] data = new byte[16];
