You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2017/01/23 07:48:36 UTC

[1/3] commons-compress git commit: COMPRESS-271 correctly set inUncompressed

Repository: commons-compress
Updated Branches:
  refs/heads/master 9e7941135 -> 226489c0f


COMPRESS-271 correctly set inUncompressed

I don't understand why the readBla... tests have passed before, makes
me doubt the tests


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/06d76190
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/06d76190
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/06d76190

Branch: refs/heads/master
Commit: 06d761908b2567f292be102de36f88e230e5ffed
Parents: 9e79411
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Jan 23 08:44:46 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Jan 23 08:44:46 2017 +0100

----------------------------------------------------------------------
 .../compress/compressors/lz4/FramedLZ4CompressorInputStream.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/06d76190/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
index 8238a38..90d2da4 100644
--- a/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStream.java
@@ -176,7 +176,7 @@ public class FramedLZ4CompressorInputStream extends CompressorInputStream {
             inUncompressed = true;
             currentBlock = capped;
         } else {
-            inUncompressed = true;
+            inUncompressed = false;
             currentBlock = new BlockLZ4CompressorInputStream(capped);
         }
     }


[3/3] commons-compress git commit: COMPRESS-271 test for single-byte read and premature close

Posted by bo...@apache.org.
COMPRESS-271 test for single-byte read and premature close


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/226489c0
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/226489c0
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/226489c0

Branch: refs/heads/master
Commit: 226489c0f04d427f7a75468d12b7ccbdcf4c7ccf
Parents: 3f839db
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Jan 23 08:48:10 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Jan 23 08:48:10 2017 +0100

----------------------------------------------------------------------
 .../lz4/FramedLZ4CompressorInputStreamTest.java    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/226489c0/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
index 7d774d9..3727518 100644
--- a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
@@ -185,6 +185,23 @@ public final class FramedLZ4CompressorInputStreamTest
     }
 
     @Test
+    public void readsUncompressedBlocksUsingSingleByteRead() throws IOException {
+        byte[] input = new byte[] {
+            4, 0x22, 0x4d, 0x18, // signature
+            0x60, // flag - Version 01, block independent, no block checksum, no content size, no content checksum
+            0x70, // block size 4MB
+            0x00, // checksum, revisit once it gets validated
+            13, 0, 0, (byte) 0x80, // 13 bytes length and uncompressed bit set
+            'H', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd', '!', // content
+            0, 0, 0, 0, // empty block marker
+        };
+        try (InputStream a = new FramedLZ4CompressorInputStream(new ByteArrayInputStream(input))) {
+            int h = a.read();
+            assertEquals('H', h);
+        }
+    }
+
+    @Test
     public void rejectsBlocksWithoutChecksum() throws IOException {
         byte[] input = new byte[] {
             4, 0x22, 0x4d, 0x18, // signature


[2/3] commons-compress git commit: use the accessors for factory's constants

Posted by bo...@apache.org.
use the accessors for factory's constants


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/3f839db3
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/3f839db3
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/3f839db3

Branch: refs/heads/master
Commit: 3f839db3d391bb92b2ece5810b422ca1725f35ba
Parents: 06d7619
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon Jan 23 08:47:53 2017 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon Jan 23 08:47:53 2017 +0100

----------------------------------------------------------------------
 .../compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java  | 2 +-
 .../compressors/lz4/FramedLZ4CompressorInputStreamTest.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f839db3/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java b/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java
index 1ea69fe..fc28841 100644
--- a/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/lz4/BlockLZ4CompressorRoundtripTest.java
@@ -80,7 +80,7 @@ public final class BlockLZ4CompressorRoundtripTest extends AbstractTestCase {
         try (FileInputStream is = new FileInputStream(input);
              FileOutputStream os = new FileOutputStream(outputSz);
              OutputStream los = new CompressorStreamFactory()
-                 .createCompressorOutputStream(CompressorStreamFactory.LZ4_BLOCK, os)) {
+                 .createCompressorOutputStream(CompressorStreamFactory.getLZ4Block(), os)) {
             IOUtils.copy(is, los);
         }
         System.err.println(input.getName() + " written, uncompressed bytes: " + input.length()

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/3f839db3/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
index eddb501..7d774d9 100644
--- a/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
+++ b/src/test/java/org/apache/commons/compress/compressors/lz4/FramedLZ4CompressorInputStreamTest.java
@@ -62,7 +62,7 @@ public final class FramedLZ4CompressorInputStreamTest
     @Test
     public void readBlaLz4ViaFactory() throws Exception {
         try (InputStream a = new CompressorStreamFactory()
-                 .createCompressorInputStream(CompressorStreamFactory.LZ4_FRAMED,
+                 .createCompressorInputStream(CompressorStreamFactory.getLZ4Framed(),
                                               new FileInputStream(getFile("bla.tar.lz4")));
             FileInputStream e = new FileInputStream(getFile("bla.tar"))) {
             byte[] expected = IOUtils.toByteArray(e);