BlockChannel 短縮に対応

Author: okomeki

src/main/java/net/siisise/block/BlockChannel.java

@@ -64,18 +64,25 @@ public long size() throws IOException {
     }
 
     /**
-     * 詰める subブロックで茶を濁す
+     * 詰める.
+     * EditBlock は詰め.
+     * OverBlock の場合は subブロックで茶を濁す
      * @param size 全体のサイズ
      * @return 縮めたブロック
      * @throws IOException 
      */
     @Override
     public SeekableByteChannel truncate(long size) throws IOException {
-        long p = block.backLength();
-        block = block.sub(0, size);
-        block.seek(p);
+        if ( block.backLength() + block.length() > size ) {
+            long p = Math.min(block.backLength(), size);
+            if ( block instanceof EditBlock ) {
+                ((EditBlock)block).del(size, block.backLength() + block.length() - size);
+            } else {
+                block = block.sub(0, size);
+            }
+            block.seek(p);
+        }
         return this;
-    //    return new BlockChannel(block.sub(0, size));
     }
 
     @Override

src/main/java/net/siisise/block/EditBlock.java

@@ -28,7 +28,7 @@ public interface EditBlock extends OverBlock, IndexEdit {
 
     /**
      * 切り取る.
-     * 編集可能な場合のみ、不要なサイズを切り取る.
+     * 不要なサイズを切り取る.
      * del と類似.
      * 
      * @param length 長さ

src/test/java/net/siisise/block/ByteBlockTest.java

@@ -26,6 +26,10 @@ public class ByteBlockTest {
 
     public ByteBlockTest() {
     }
+    
+    ByteBlock block(byte[] src) {
+        return new ByteBlock(src);
+    }
 
     /**
      * Test of readBlock method, of class ByteBlock.
@@ -34,7 +38,7 @@ public ByteBlockTest() {
     public void testReadBlock() {
         System.out.println("readBlock");
         byte[] ss = "utca".getBytes(StandardCharsets.UTF_8);
-        ByteBlock block = new ByteBlock(ss);
+        ByteBlock block = block(ss);
         byte[] rd = new byte[1];
 
         assertEquals(4,block.size());

src/test/java/net/siisise/block/PacketBlockTest.java

@@ -15,17 +15,22 @@
  */
 package net.siisise.block;
 
+import net.siisise.io.IndexEditTest;
 import net.siisise.io.PacketA;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
 
 /**
  *
  */
-public class PacketBlockTest {
+public class PacketBlockTest extends IndexEditTest {
 
     public PacketBlockTest() {
     }
+    
+    PacketBlock block(byte[] src) {
+        return new PacketBlock(src);
+    }
 
     /**
      * Test of skip method, of class PacketBlock.
@@ -42,7 +47,7 @@ public void testSkip() {
         PacketA b = p.readPacket(length);
         assertEquals(expResult, b.size());
 
-        PacketBlock instance = new PacketBlock(data);
+        PacketBlock instance = block(data);
         assertEquals(10, instance.length());
         long result = instance.skip(length);
         assertEquals(expResult, result);

src/test/java/net/siisise/io/IndexEditTest.java

@@ -27,6 +27,10 @@ public class IndexEditTest {
 
     public IndexEditTest() {
     }
+    
+    EditBlock block(byte[] ar) {
+        return new SinglePacketBlock(ar);
+    }
 
     /**
      * Test of del method, of class IndexEdit.
@@ -35,7 +39,7 @@ public IndexEditTest() {
     public void testDel_long() {
         System.out.println("del");
         long index = 2L;
-        IndexEdit instance = new SinglePacketBlock(new byte[] {6,5,4,3,2,1});
+        IndexEdit instance = block(new byte[] {6,5,4,3,2,1});
         byte expResult = 4;
         byte result = instance.del(index);
         assertEquals(expResult, result);
@@ -49,7 +53,7 @@ public void testDel_long_long() {
         System.out.println("del");
         long index = 2L;
         long size = 3L;
-        EditBlock instance = new SinglePacketBlock(new byte[] {5,6,7,8,9,10});
+        EditBlock instance = block(new byte[] {5,6,7,8,9,10});
         instance.del(index, size);
         assertEquals(0, instance.backLength() );
         assertEquals(3, instance.length() );
@@ -65,7 +69,7 @@ public void testDel_long_byteArr() {
         System.out.println("del");
         long index = 1L;
         byte[] buf = new byte[3];
-        EditBlock instance = new SinglePacketBlock(new byte[] {5,6,7,8,9,10});
+        EditBlock instance = block(new byte[] {5,6,7,8,9,10});
         byte[] expResult = new byte[] {6,7,8};
         EditBlock result = instance.del(index, buf);
         assertArrayEquals(expResult, buf);
@@ -82,7 +86,7 @@ public void testDel_4args() {
         byte[] buf = new byte[4];
         int offset = 1;
         int length = 2;
-        EditBlock instance = new SinglePacketBlock(new byte[] {5,6,7,8,9,10});
+        EditBlock instance = block(new byte[] {5,6,7,8,9,10});
         byte[] expResult = new byte[] {0,8,9,0};
         EditBlock result = instance.del(index, buf, offset, length);
         assertEquals(result, instance);
@@ -98,7 +102,7 @@ public void testAdd_long_byte() {
         long index = 2L;
         byte src = 11;
         byte[] exr = new byte[] {5,6,11,7,8,9,10};
-        EditBlock instance = new SinglePacketBlock(new byte[] {5,6,7,8,9,10});
+        EditBlock instance = block(new byte[] {5,6,7,8,9,10});
         instance.add(index, src);
         assertArrayEquals(exr, instance.toByteArray());
     }
@@ -112,7 +116,7 @@ public void testAdd_long_byteArr() {
         long index = 4L;
         byte[] src = new byte[] {0,1,2};
         byte[] exr = new byte[] {5,6,7,8,0,1,2,9,10};
-        EditBlock instance = new SinglePacketBlock(new byte[] {5,6,7,8,9,10});
+        EditBlock instance = block(new byte[] {5,6,7,8,9,10});
         instance.add(index, src);
         assertArrayEquals(exr, instance.toByteArray());
     }
@@ -127,7 +131,7 @@ public void testAdd_4args() {
         byte[] src = new byte[] {9,8,7,6};
         int offset = 1;
         int length = 2;
-        EditBlock instance = new SinglePacketBlock(new byte[] {5,6,7,8,9,10});
+        EditBlock instance = block(new byte[] {5,6,7,8,9,10});
         instance.add(index, src, offset, length);
         byte[] exr = new byte[] {5,6,7,8,8,7,9,10};
         assertArrayEquals(exr, instance.toByteArray());