diff options
author | Harald Musum <musum@verizonmedia.com> | 2023-01-16 13:40:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-16 13:40:35 +0100 |
commit | 156901bfa203b7b52c66b9fa362f2cb027fd553c (patch) | |
tree | 1aa898aa339135a332294dd9fb78537fe6f7b840 /filedistribution/src/main/java/com/yahoo/vespa | |
parent | f44bfc89a746e7b6baaf81320024e6a5e988784a (diff) |
Revert "Revert "Support zstd as compression type for file references, take 2""
Diffstat (limited to 'filedistribution/src/main/java/com/yahoo/vespa')
-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 2ea41a9fd8c..8d6f9ea1af3 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceCompressor.java @@ -1,6 +1,8 @@ // 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; @@ -21,7 +23,6 @@ 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; @@ -124,7 +125,7 @@ public class FileReferenceCompressor { return switch (compressionType) { case gzip -> new GZIPOutputStream(new FileOutputStream(outputFile)); case lz4 -> new LZ4BlockOutputStream(new FileOutputStream(outputFile)); - default -> throw new RuntimeException("Unknown compression type " + compressionType); + case zstd -> new ZstdOutputStream(new FileOutputStream(outputFile)); }; case file: return new FileOutputStream(outputFile); @@ -140,7 +141,7 @@ public class FileReferenceCompressor { return switch (compressionType) { case gzip -> new GZIPInputStream(new FileInputStream(inputFile)); case lz4 -> new LZ4BlockInputStream(new FileInputStream(inputFile)); - default -> throw new RuntimeException("Unknown compression type " + compressionType); + case zstd -> new ZstdInputStream(new FileInputStream(inputFile)); }; case file: return new FileInputStream(inputFile); @@ -150,4 +151,3 @@ public class FileReferenceCompressor { } } - |