switch to io.airlift:aircompressor

2 files changed, 9 insertions, 7 deletions

diff --git a/vespajlib/pom.xml b/vespajlib/pom.xml
index 99924fe36c3..a0dea8b29fc 100644
--- a/vespajlib/pom.xml
+++ b/vespajlib/pom.xml
@@ -32,9 +32,9 @@
       <artifactId>jna</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.yahoo.vespa</groupId>
-      <artifactId>airlift-zstd</artifactId>
-      <version>${project.version}</version>
+      <groupId>io.airlift</groupId>
+      <artifactId>aircompressor</artifactId>
+      <version>${aircompress.vespa.version}</version>
     </dependency>
     <dependency>
       <groupId>net.openhft</groupId>
diff --git a/vespajlib/src/main/java/com/yahoo/compress/ZstdCompressor.java b/vespajlib/src/main/java/com/yahoo/compress/ZstdCompressor.java
index 5bec9aa4e8a..245a672de20 100644
--- a/vespajlib/src/main/java/com/yahoo/compress/ZstdCompressor.java
+++ b/vespajlib/src/main/java/com/yahoo/compress/ZstdCompressor.java
@@ -11,8 +11,8 @@ import java.util.Arrays;
  */
 public class ZstdCompressor {
 
-    private static final ai.vespa.airlift.zstd.ZstdCompressor compressor = new ai.vespa.airlift.zstd.ZstdCompressor();
-    private static final ai.vespa.airlift.zstd.ZstdDecompressor decompressor = new ai.vespa.airlift.zstd.ZstdDecompressor();
+    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();
 
     public byte[] compress(byte[] input, int inputOffset, int inputLength) {
         int maxCompressedLength = getMaxCompressedLength(inputLength);
@@ -41,12 +41,14 @@ public class ZstdCompressor {
         return decompressor.decompress(input, inputOffset, inputLength, output, outputOffset, maxOutputLength);
     }
 
+    private static final io.airlift.compress.Compressor threadUnsafe = new io.airlift.compress.zstd.ZstdCompressor();
+
     public static int getMaxCompressedLength(int uncompressedLength) {
-        return compressor.maxCompressedLength(uncompressedLength);
+        return threadUnsafe.maxCompressedLength(uncompressedLength);
     }
 
     public static int getDecompressedLength(byte[] input, int inputOffset, int inputLength) {
-        return (int) ai.vespa.airlift.zstd.ZstdDecompressor.getDecompressedSize(input, inputOffset, inputLength);
+        return (int) io.airlift.compress.zstd.ZstdDecompressor.getDecompressedSize(input, inputOffset, inputLength);
     }
 
 }