Skip to content
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

Update dependency io.airlift:aircompressor to v2 #32130

Closed
wants to merge 2 commits into from
Closed

Update dependency io.airlift:aircompressor to v2 #32130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5a07e3
Update dependency io.airlift:aircompressor to v2
renovate[bot] Aug 12, 2024
b7a91e1
Use new v2 package.
baldersheim Aug 14, 2024
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
2 changes: 1 addition & 1 deletion dependency-versions/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@

<!-- Dependencies used internally in Vespa, not visible for users, or only visible in test classpath -->

<aircompressor.vespa.version>0.27</aircompressor.vespa.version>
<aircompressor.vespa.version>2.0</aircompressor.vespa.version>
<airline.vespa.version>0.9</airline.vespa.version>
<antlr.vespa.version>3.5.3</antlr.vespa.version>
<antlr4.vespa.version>4.13.2</antlr4.vespa.version>
Expand Down
8 changes: 4 additions & 4 deletions vespajlib/src/main/java/com/yahoo/compress/ZstdCompressor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
*/
public class ZstdCompressor {

private io.airlift.compress.zstd.ZstdCompressor compressor = new io.airlift.compress.zstd.ZstdCompressor();
private io.airlift.compress.zstd.ZstdDecompressor decompressor = new io.airlift.compress.zstd.ZstdDecompressor();
private io.airlift.compress.v2.zstd.ZstdCompressor compressor = new io.airlift.compress.v2.zstd.ZstdCompressor();
private io.airlift.compress.v2.zstd.ZstdDecompressor decompressor = new io.airlift.compress.v2.zstd.ZstdDecompressor();

public byte[] compress(byte[] input, int inputOffset, int inputLength) {
int maxCompressedLength = getMaxCompressedLength(inputLength);
Expand Down Expand Up @@ -41,14 +41,14 @@ public int decompress(byte[] input, int inputOffset, int inputLength, byte[] out
return decompressor.decompress(input, inputOffset, inputLength, output, outputOffset, maxOutputLength);
}

private static final io.airlift.compress.Compressor threadUnsafe = new io.airlift.compress.zstd.ZstdCompressor();
private static final io.airlift.compress.v2.Compressor threadUnsafe = new io.airlift.compress.v2.zstd.ZstdCompressor();

public static int getMaxCompressedLength(int uncompressedLength) {
return threadUnsafe.maxCompressedLength(uncompressedLength);
}

public static int getDecompressedLength(byte[] input, int inputOffset, int inputLength) {
return (int) io.airlift.compress.zstd.ZstdDecompressor.getDecompressedSize(input, inputOffset, inputLength);
return (int) io.airlift.compress.v2.zstd.ZstdDecompressor.getDecompressedSize(input, inputOffset, inputLength);
}

}