diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-01-16 13:26:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-16 13:26:42 +0100 |
commit | f44bfc89a746e7b6baaf81320024e6a5e988784a (patch) | |
tree | 7b3f523f6355eacf7ffc2b9ef842242d6c3567ec /filedistribution/src/main | |
parent | 5b93a02564c303b136591ad0cb59bc612456e523 (diff) | |
parent | 34df2a872569812a45c2b0d43cb3ac6f2662986e (diff) |
Merge pull request #25580 from vespa-engine/revert-25577-revert-25547-revert-25532-hmusum/support-zstd-for-compressed-file-references
Revert "Support zstd as compression type for file references, take 2"
Diffstat (limited to 'filedistribution/src/main')
-rw-r--r-- | filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java index 8d6f9ea1af3..2ea41a9fd8c 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java @@ -1,8 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.filedistribution; -import ai.vespa.airlift.zstd.ZstdInputStream; -import com.yahoo.compress.ZstdOutputStream; import net.jpountz.lz4.LZ4BlockInputStream; import net.jpountz.lz4.LZ4BlockOutputStream; import org.apache.commons.compress.archivers.ArchiveEntry; @@ -23,6 +21,7 @@ import java.util.List; import java.util.Objects; import java.util.logging.Level; import java.util.logging.Logger; +import java.util.stream.Collectors; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; @@ -125,7 +124,7 @@ public class FileReferenceCompressor { return switch (compressionType) { case gzip -> new GZIPOutputStream(new FileOutputStream(outputFile)); case lz4 -> new LZ4BlockOutputStream(new FileOutputStream(outputFile)); - case zstd -> new ZstdOutputStream(new FileOutputStream(outputFile)); + default -> throw new RuntimeException("Unknown compression type " + compressionType); }; case file: return new FileOutputStream(outputFile); @@ -141,7 +140,7 @@ public class FileReferenceCompressor { return switch (compressionType) { case gzip -> new GZIPInputStream(new FileInputStream(inputFile)); case lz4 -> new LZ4BlockInputStream(new FileInputStream(inputFile)); - case zstd -> new ZstdInputStream(new FileInputStream(inputFile)); + default -> throw new RuntimeException("Unknown compression type " + compressionType); }; case file: return new FileInputStream(inputFile); @@ -151,3 +150,4 @@ public class FileReferenceCompressor { } } + |