Skip to content

Replace Airlift Snappy with Apache Commons Compress #413

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
slachiewicz merged 1 commit into from
Jan 10, 2026
Merged

Replace Airlift Snappy with Apache Commons Compress #413

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 @@ -79,9 +79,9 @@
<version>${slf4jVersion}</version>
</dependency>
<dependency>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
<version>0.27</version>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.21.0</version>
</dependency>
<dependency>
<groupId>org.tukaani</groupId>
Expand Down
6 changes: 3 additions & 3 deletions 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,7 +18,7 @@

import java.io.IOException;

import io.airlift.compress.snappy.SnappyFramedOutputStream;
import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.util.Compressor;

Expand All @@ -30,15 +30,15 @@
*/
public class SnappyCompressor extends Compressor {

private SnappyFramedOutputStream zOut;
private FramedSnappyCompressorOutputStream zOut;

/**
* perform the Snappy compression operation.
*/
@Override
public void compress() throws ArchiverException {
try {
zOut = new SnappyFramedOutputStream(bufferedOutputStream(fileOutputStream(getDestFile())));
zOut = new FramedSnappyCompressorOutputStream(bufferedOutputStream(fileOutputStream(getDestFile())));
compress(getSource(), zOut);
} catch (IOException ioe) {
String msg = "Problem creating snappy " + ioe.getMessage();
Expand Down
7 changes: 4 additions & 3 deletions 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,7 +23,7 @@
import java.io.IOException;
import java.io.InputStream;

import io.airlift.compress.snappy.SnappyFramedInputStream;
import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream;
import org.codehaus.plexus.archiver.AbstractUnArchiver;
import org.codehaus.plexus.archiver.ArchiverException;

Expand Down Expand Up @@ -61,9 +61,10 @@ protected void execute() throws ArchiverException {
}
}

public static @Nonnull SnappyFramedInputStream getSnappyInputStream(InputStream bis) throws ArchiverException {
public static @Nonnull FramedSnappyCompressorInputStream getSnappyInputStream(InputStream bis)
throws ArchiverException {
try {
return new SnappyFramedInputStream(bis, true);
return new FramedSnappyCompressorInputStream(bis);
} catch (IOException e) {
throw new ArchiverException("Trouble creating Snappy compressor, invalid file ?", e);
}
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 @@ -24,10 +24,10 @@
import java.io.OutputStream;
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;
import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorOutputStream;
import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
import org.codehaus.plexus.archiver.AbstractArchiver;
Expand Down Expand Up @@ -425,7 +425,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 SnappyFramedOutputStream(bufferedOutputStream(ostream));
return new FramedSnappyCompressorOutputStream(bufferedOutputStream(ostream));
} else if (TarCompressionMethod.xz.equals(tarCompressionMethod)) {
return new XZCompressorOutputStream(bufferedOutputStream(ostream));
} else if (TarCompressionMethod.zstd.equals(tarCompressionMethod)) {
Expand Down
4 changes: 2 additions & 2 deletions 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,10 +23,10 @@
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;
import org.apache.commons.compress.compressors.snappy.FramedSnappyCompressorInputStream;
import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
import org.codehaus.plexus.archiver.AbstractUnArchiver;
Expand Down Expand Up @@ -137,7 +137,7 @@ private InputStream decompress(UntarCompressionMethod compression, final File fi
} else if (compression == UntarCompressionMethod.BZIP2) {
return new BZip2CompressorInputStream(istream);
} else if (compression == UntarCompressionMethod.SNAPPY) {
return new SnappyFramedInputStream(istream, true);
return new FramedSnappyCompressorInputStream(istream);
} else if (compression == UntarCompressionMethod.XZ) {
return new XZCompressorInputStream(istream);
} else if (compression == UntarCompressionMethod.ZSTD) {
Expand Down