Skip to content

Change Snappy compressor to io.airlift:aircompressor #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2024
Merged

Change Snappy compressor to io.airlift:aircompressor #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@
<version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>org.iq80.snappy</groupId>
<artifactId>snappy</artifactId>
<version>0.4</version>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
<version>0.27</version>
</dependency>
<dependency>
<groupId>org.tukaani</groupId>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codehaus/plexus/archiver/snappy/SnappyCompressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

import java.io.IOException;

import io.airlift.compress.snappy.SnappyFramedOutputStream;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.util.Compressor;
import org.iq80.snappy.SnappyFramedOutputStream;

import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
import static org.codehaus.plexus.archiver.util.Streams.fileOutputStream;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codehaus/plexus/archiver/snappy/SnappyUnArchiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import java.io.IOException;
import java.io.InputStream;

import io.airlift.compress.snappy.SnappyFramedInputStream;
import org.codehaus.plexus.archiver.AbstractUnArchiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.iq80.snappy.SnappyFramedInputStream;

import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream;
import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.nio.file.Files;
import java.util.zip.GZIPOutputStream;

import io.airlift.compress.snappy.SnappyFramedOutputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
Expand All @@ -42,7 +43,6 @@
import org.codehaus.plexus.components.io.resources.PlexusIoResource;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.iq80.snappy.SnappyOutputStream;

import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;

Expand Down Expand Up @@ -426,7 +426,7 @@ private OutputStream compress(TarCompressionMethod tarCompressionMethod, final O
} else if (TarCompressionMethod.bzip2.equals(tarCompressionMethod)) {
return new BZip2CompressorOutputStream(bufferedOutputStream(ostream));
} else if (TarCompressionMethod.snappy.equals(tarCompressionMethod)) {
return new SnappyOutputStream(bufferedOutputStream(ostream));
return new SnappyFramedOutputStream(bufferedOutputStream(ostream));
} else if (TarCompressionMethod.xz.equals(tarCompressionMethod)) {
return new XZCompressorOutputStream(bufferedOutputStream(ostream));
} else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.io.InputStream;
import java.util.zip.GZIPInputStream;

import io.airlift.compress.snappy.SnappyFramedInputStream;
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
Expand All @@ -32,7 +33,6 @@
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.util.Streams;
import org.codehaus.plexus.components.io.filemappers.FileMapper;
import org.iq80.snappy.SnappyFramedInputStream;

import static org.codehaus.plexus.archiver.util.Streams.bufferedInputStream;
import static org.codehaus.plexus.archiver.util.Streams.fileInputStream;
Expand Down