diff --git a/README.md b/README.md index d90a90a8..1784ff54 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Compression for Java -[![Maven Central](https://img.shields.io/maven-central/v/io.airlift/aircompressor.svg?label=Maven%20Central)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.airlift%22%20AND%20a%3A%22aircompressor%22) +[![Maven Central](https://img.shields.io/maven-central/v/io.airlift/aircompressor-v3.svg?label=Maven%20Central)](https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22io.airlift%22%20AND%20a%3A%22aircompressor-v3%22) This library provides a set of compression algorithms implemented in pure Java and where possible native implementations. The Java implementations use `sun.misc.Unsafe` @@ -8,8 +8,8 @@ to interact directly with native libraries without the need for JNI. # Usage -Each algorithm provides a simple block compression API using the `io.airlift.compress.v2.Compressor` -and `io.airlift.compress.v2.Decompressor` classes. Block compression is the simplest form of +Each algorithm provides a simple block compression API using the `io.airlift.compress.v3.Compressor` +and `io.airlift.compress.v3.Decompressor` classes. Block compression is the simplest form of which simply compresses a small block of data provided as a `byte[]`, or more generally a `java.lang.foreign.MemorySegment`. Each algorithm may have one or more streaming format which typically produces a sequence of block compressed chunks. @@ -109,7 +109,7 @@ This library requires a Java 22+ virtual machine containing the `sun.misc.Unsafe Temporary directory used to unpack and load native libraries can be configured using the `aircompressor.tmpdir` system property, with a default value of `java.io.tmpdir`. This is useful when the default temporary directory is mounted as `noexec`. -Loading of native libraries can be disabled entirely by setting the `io.airlift.compress.v2.disable-native` system property. +Loading of native libraries can be disabled entirely by setting the `io.airlift.compress.v3.disable-native` system property. # Users diff --git a/pom.xml b/pom.xml index e64d9e7c..a2d1f529 100644 --- a/pom.xml +++ b/pom.xml @@ -10,8 +10,8 @@ io.airlift - aircompressor - 2.1-SNAPSHOT + aircompressor-v3 + 3.0-SNAPSHOT jar aircompressor diff --git a/src/main/java/io/airlift/compress/v2/Compressor.java b/src/main/java/io/airlift/compress/v3/Compressor.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/Compressor.java rename to src/main/java/io/airlift/compress/v3/Compressor.java index 89c3f91b..d47c4d2e 100644 --- a/src/main/java/io/airlift/compress/v2/Compressor.java +++ b/src/main/java/io/airlift/compress/v3/Compressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2; +package io.airlift.compress.v3; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/Decompressor.java b/src/main/java/io/airlift/compress/v3/Decompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/Decompressor.java rename to src/main/java/io/airlift/compress/v3/Decompressor.java index 39e932c3..938152c3 100644 --- a/src/main/java/io/airlift/compress/v2/Decompressor.java +++ b/src/main/java/io/airlift/compress/v3/Decompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2; +package io.airlift.compress.v3; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/IncompatibleJvmException.java b/src/main/java/io/airlift/compress/v3/IncompatibleJvmException.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/IncompatibleJvmException.java rename to src/main/java/io/airlift/compress/v3/IncompatibleJvmException.java index 0149f26f..ab0462a8 100644 --- a/src/main/java/io/airlift/compress/v2/IncompatibleJvmException.java +++ b/src/main/java/io/airlift/compress/v3/IncompatibleJvmException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2; +package io.airlift.compress.v3; public class IncompatibleJvmException extends RuntimeException diff --git a/src/main/java/io/airlift/compress/v2/MalformedInputException.java b/src/main/java/io/airlift/compress/v3/MalformedInputException.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/MalformedInputException.java rename to src/main/java/io/airlift/compress/v3/MalformedInputException.java index ff3c3a4b..e3e9c163 100644 --- a/src/main/java/io/airlift/compress/v2/MalformedInputException.java +++ b/src/main/java/io/airlift/compress/v3/MalformedInputException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2; +package io.airlift.compress.v3; public class MalformedInputException extends RuntimeException diff --git a/src/main/java/io/airlift/compress/v2/bzip2/BZip2Codec.java b/src/main/java/io/airlift/compress/v3/bzip2/BZip2Codec.java similarity index 88% rename from src/main/java/io/airlift/compress/v2/bzip2/BZip2Codec.java rename to src/main/java/io/airlift/compress/v3/bzip2/BZip2Codec.java index f2d7f140..393bbebe 100644 --- a/src/main/java/io/airlift/compress/v2/bzip2/BZip2Codec.java +++ b/src/main/java/io/airlift/compress/v3/bzip2/BZip2Codec.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.bzip2; +package io.airlift.compress.v3.bzip2; -import io.airlift.compress.v2.hadoop.CodecAdapter; +import io.airlift.compress.v3.hadoop.CodecAdapter; public class BZip2Codec extends CodecAdapter diff --git a/src/main/java/io/airlift/compress/v2/bzip2/BZip2Constants.java b/src/main/java/io/airlift/compress/v3/bzip2/BZip2Constants.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/bzip2/BZip2Constants.java rename to src/main/java/io/airlift/compress/v3/bzip2/BZip2Constants.java index c77a19fb..c68bbe60 100644 --- a/src/main/java/io/airlift/compress/v2/bzip2/BZip2Constants.java +++ b/src/main/java/io/airlift/compress/v3/bzip2/BZip2Constants.java @@ -16,7 +16,7 @@ * to whom the Ant project is very grateful for his * great code. */ -package io.airlift.compress.v2.bzip2; +package io.airlift.compress.v3.bzip2; /** * Base class for both the compress and decompress classes. Holds common arrays, diff --git a/src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopInputStream.java b/src/main/java/io/airlift/compress/v3/bzip2/BZip2HadoopInputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopInputStream.java rename to src/main/java/io/airlift/compress/v3/bzip2/BZip2HadoopInputStream.java index 1dc0643a..b18b635a 100644 --- a/src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v3/bzip2/BZip2HadoopInputStream.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.bzip2; +package io.airlift.compress.v3.bzip2; -import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopInputStream; import java.io.BufferedInputStream; import java.io.IOException; diff --git a/src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopOutputStream.java b/src/main/java/io/airlift/compress/v3/bzip2/BZip2HadoopOutputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopOutputStream.java rename to src/main/java/io/airlift/compress/v3/bzip2/BZip2HadoopOutputStream.java index d55b961b..18dbd57e 100644 --- a/src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/bzip2/BZip2HadoopOutputStream.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.bzip2; +package io.airlift.compress.v3.bzip2; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopStreams.java b/src/main/java/io/airlift/compress/v3/bzip2/BZip2HadoopStreams.java similarity index 86% rename from src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopStreams.java rename to src/main/java/io/airlift/compress/v3/bzip2/BZip2HadoopStreams.java index eebe1087..dd248f41 100644 --- a/src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopStreams.java +++ b/src/main/java/io/airlift/compress/v3/bzip2/BZip2HadoopStreams.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.bzip2; +package io.airlift.compress.v3.bzip2; -import io.airlift.compress.v2.hadoop.HadoopInputStream; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; -import io.airlift.compress.v2.hadoop.HadoopStreams; +import io.airlift.compress.v3.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopStreams; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/v2/bzip2/CBZip2InputStream.java b/src/main/java/io/airlift/compress/v3/bzip2/CBZip2InputStream.java similarity index 99% rename from src/main/java/io/airlift/compress/v2/bzip2/CBZip2InputStream.java rename to src/main/java/io/airlift/compress/v3/bzip2/CBZip2InputStream.java index 4ea56c4f..3e6b64c2 100644 --- a/src/main/java/io/airlift/compress/v2/bzip2/CBZip2InputStream.java +++ b/src/main/java/io/airlift/compress/v3/bzip2/CBZip2InputStream.java @@ -16,18 +16,18 @@ * to whom the Ant project is very grateful for his * great code. */ -package io.airlift.compress.v2.bzip2; +package io.airlift.compress.v3.bzip2; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; -import static io.airlift.compress.v2.bzip2.BZip2Constants.G_SIZE; -import static io.airlift.compress.v2.bzip2.BZip2Constants.MAX_ALPHA_SIZE; -import static io.airlift.compress.v2.bzip2.BZip2Constants.MAX_SELECTORS; -import static io.airlift.compress.v2.bzip2.BZip2Constants.N_GROUPS; -import static io.airlift.compress.v2.bzip2.BZip2Constants.RUN_A; -import static io.airlift.compress.v2.bzip2.BZip2Constants.RUN_B; +import static io.airlift.compress.v3.bzip2.BZip2Constants.G_SIZE; +import static io.airlift.compress.v3.bzip2.BZip2Constants.MAX_ALPHA_SIZE; +import static io.airlift.compress.v3.bzip2.BZip2Constants.MAX_SELECTORS; +import static io.airlift.compress.v3.bzip2.BZip2Constants.N_GROUPS; +import static io.airlift.compress.v3.bzip2.BZip2Constants.RUN_A; +import static io.airlift.compress.v3.bzip2.BZip2Constants.RUN_B; /** * An input stream that decompresses from the BZip2 format (without the file diff --git a/src/main/java/io/airlift/compress/v2/bzip2/CBZip2OutputStream.java b/src/main/java/io/airlift/compress/v3/bzip2/CBZip2OutputStream.java similarity index 99% rename from src/main/java/io/airlift/compress/v2/bzip2/CBZip2OutputStream.java rename to src/main/java/io/airlift/compress/v3/bzip2/CBZip2OutputStream.java index 97abe819..0adb6b93 100644 --- a/src/main/java/io/airlift/compress/v2/bzip2/CBZip2OutputStream.java +++ b/src/main/java/io/airlift/compress/v3/bzip2/CBZip2OutputStream.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.bzip2; +package io.airlift.compress.v3.bzip2; import java.io.IOException; import java.io.OutputStream; -import static io.airlift.compress.v2.bzip2.BZip2Constants.G_SIZE; -import static io.airlift.compress.v2.bzip2.BZip2Constants.MAX_ALPHA_SIZE; -import static io.airlift.compress.v2.bzip2.BZip2Constants.MAX_SELECTORS; -import static io.airlift.compress.v2.bzip2.BZip2Constants.N_GROUPS; -import static io.airlift.compress.v2.bzip2.BZip2Constants.RUN_A; -import static io.airlift.compress.v2.bzip2.BZip2Constants.RUN_B; +import static io.airlift.compress.v3.bzip2.BZip2Constants.G_SIZE; +import static io.airlift.compress.v3.bzip2.BZip2Constants.MAX_ALPHA_SIZE; +import static io.airlift.compress.v3.bzip2.BZip2Constants.MAX_SELECTORS; +import static io.airlift.compress.v3.bzip2.BZip2Constants.N_GROUPS; +import static io.airlift.compress.v3.bzip2.BZip2Constants.RUN_A; +import static io.airlift.compress.v3.bzip2.BZip2Constants.RUN_B; /** * An output stream that compresses into the BZip2 format (without the file diff --git a/src/main/java/io/airlift/compress/v2/bzip2/Crc32.java b/src/main/java/io/airlift/compress/v3/bzip2/Crc32.java similarity index 99% rename from src/main/java/io/airlift/compress/v2/bzip2/Crc32.java rename to src/main/java/io/airlift/compress/v3/bzip2/Crc32.java index 83a21208..263dc435 100644 --- a/src/main/java/io/airlift/compress/v2/bzip2/Crc32.java +++ b/src/main/java/io/airlift/compress/v3/bzip2/Crc32.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.bzip2; +package io.airlift.compress.v3.bzip2; // forked from Apache Hadoop final class Crc32 diff --git a/src/main/java/io/airlift/compress/v2/deflate/DeflateCompressor.java b/src/main/java/io/airlift/compress/v3/deflate/DeflateCompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/deflate/DeflateCompressor.java rename to src/main/java/io/airlift/compress/v3/deflate/DeflateCompressor.java index 37a9209e..808f8338 100644 --- a/src/main/java/io/airlift/compress/v2/deflate/DeflateCompressor.java +++ b/src/main/java/io/airlift/compress/v3/deflate/DeflateCompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.deflate; +package io.airlift.compress.v3.deflate; -import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v3.Compressor; import java.lang.foreign.MemorySegment; import java.util.zip.Deflater; diff --git a/src/main/java/io/airlift/compress/v2/deflate/DeflateDecompressor.java b/src/main/java/io/airlift/compress/v3/deflate/DeflateDecompressor.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/deflate/DeflateDecompressor.java rename to src/main/java/io/airlift/compress/v3/deflate/DeflateDecompressor.java index 1d5a82d1..bd1e8682 100644 --- a/src/main/java/io/airlift/compress/v2/deflate/DeflateDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/deflate/DeflateDecompressor.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.deflate; +package io.airlift.compress.v3.deflate; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.MalformedInputException; import java.lang.foreign.MemorySegment; import java.nio.ByteBuffer; diff --git a/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateCodec.java b/src/main/java/io/airlift/compress/v3/deflate/JdkDeflateCodec.java similarity index 88% rename from src/main/java/io/airlift/compress/v2/deflate/JdkDeflateCodec.java rename to src/main/java/io/airlift/compress/v3/deflate/JdkDeflateCodec.java index 4535c3c2..31794498 100644 --- a/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateCodec.java +++ b/src/main/java/io/airlift/compress/v3/deflate/JdkDeflateCodec.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.deflate; +package io.airlift.compress.v3.deflate; -import io.airlift.compress.v2.hadoop.CodecAdapter; +import io.airlift.compress.v3.hadoop.CodecAdapter; public class JdkDeflateCodec extends CodecAdapter diff --git a/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopInputStream.java b/src/main/java/io/airlift/compress/v3/deflate/JdkDeflateHadoopInputStream.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopInputStream.java rename to src/main/java/io/airlift/compress/v3/deflate/JdkDeflateHadoopInputStream.java index 185a0c9e..21fed93d 100644 --- a/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v3/deflate/JdkDeflateHadoopInputStream.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.deflate; +package io.airlift.compress.v3.deflate; -import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopInputStream; import java.io.EOFException; import java.io.IOException; diff --git a/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopOutputStream.java b/src/main/java/io/airlift/compress/v3/deflate/JdkDeflateHadoopOutputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v3/deflate/JdkDeflateHadoopOutputStream.java index 931f698e..be4fa715 100644 --- a/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/deflate/JdkDeflateHadoopOutputStream.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.deflate; +package io.airlift.compress.v3.deflate; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopStreams.java b/src/main/java/io/airlift/compress/v3/deflate/JdkDeflateHadoopStreams.java similarity index 87% rename from src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopStreams.java rename to src/main/java/io/airlift/compress/v3/deflate/JdkDeflateHadoopStreams.java index 35fe29fa..7be0f5f1 100644 --- a/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v3/deflate/JdkDeflateHadoopStreams.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.deflate; +package io.airlift.compress.v3.deflate; -import io.airlift.compress.v2.hadoop.HadoopInputStream; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; -import io.airlift.compress.v2.hadoop.HadoopStreams; +import io.airlift.compress.v3.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopStreams; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/v2/gzip/JdkGzipCodec.java b/src/main/java/io/airlift/compress/v3/gzip/JdkGzipCodec.java similarity index 89% rename from src/main/java/io/airlift/compress/v2/gzip/JdkGzipCodec.java rename to src/main/java/io/airlift/compress/v3/gzip/JdkGzipCodec.java index 96db6084..215a7e43 100644 --- a/src/main/java/io/airlift/compress/v2/gzip/JdkGzipCodec.java +++ b/src/main/java/io/airlift/compress/v3/gzip/JdkGzipCodec.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.gzip; +package io.airlift.compress.v3.gzip; -import io.airlift.compress.v2.hadoop.CodecAdapter; +import io.airlift.compress.v3.hadoop.CodecAdapter; public class JdkGzipCodec extends CodecAdapter diff --git a/src/main/java/io/airlift/compress/v2/gzip/JdkGzipConstants.java b/src/main/java/io/airlift/compress/v3/gzip/JdkGzipConstants.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/gzip/JdkGzipConstants.java rename to src/main/java/io/airlift/compress/v3/gzip/JdkGzipConstants.java index b09da66a..87a52e77 100644 --- a/src/main/java/io/airlift/compress/v2/gzip/JdkGzipConstants.java +++ b/src/main/java/io/airlift/compress/v3/gzip/JdkGzipConstants.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.gzip; +package io.airlift.compress.v3.gzip; final class JdkGzipConstants { diff --git a/src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopInputStream.java b/src/main/java/io/airlift/compress/v3/gzip/JdkGzipHadoopInputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopInputStream.java rename to src/main/java/io/airlift/compress/v3/gzip/JdkGzipHadoopInputStream.java index 96538a7f..8ad4c946 100644 --- a/src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v3/gzip/JdkGzipHadoopInputStream.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.gzip; +package io.airlift.compress.v3.gzip; -import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopInputStream; import java.io.BufferedInputStream; import java.io.IOException; diff --git a/src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopOutputStream.java b/src/main/java/io/airlift/compress/v3/gzip/JdkGzipHadoopOutputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v3/gzip/JdkGzipHadoopOutputStream.java index 8a1c69b0..1f24d2cb 100644 --- a/src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/gzip/JdkGzipHadoopOutputStream.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.gzip; +package io.airlift.compress.v3.gzip; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopStreams.java b/src/main/java/io/airlift/compress/v3/gzip/JdkGzipHadoopStreams.java similarity index 87% rename from src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopStreams.java rename to src/main/java/io/airlift/compress/v3/gzip/JdkGzipHadoopStreams.java index 36e7de4b..15204473 100644 --- a/src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v3/gzip/JdkGzipHadoopStreams.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.gzip; +package io.airlift.compress.v3.gzip; -import io.airlift.compress.v2.hadoop.HadoopInputStream; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; -import io.airlift.compress.v2.hadoop.HadoopStreams; +import io.airlift.compress.v3.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopStreams; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/v2/hadoop/CodecAdapter.java b/src/main/java/io/airlift/compress/v3/hadoop/CodecAdapter.java similarity index 98% rename from src/main/java/io/airlift/compress/v2/hadoop/CodecAdapter.java rename to src/main/java/io/airlift/compress/v3/hadoop/CodecAdapter.java index 8fbbeb39..b0fec706 100644 --- a/src/main/java/io/airlift/compress/v2/hadoop/CodecAdapter.java +++ b/src/main/java/io/airlift/compress/v3/hadoop/CodecAdapter.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.hadoop; +package io.airlift.compress.v3.hadoop; -import io.airlift.compress.v2.hadoop.CompressionInputStreamAdapter.PositionSupplier; +import io.airlift.compress.v3.hadoop.CompressionInputStreamAdapter.PositionSupplier; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Seekable; diff --git a/src/main/java/io/airlift/compress/v2/hadoop/CompressionInputStreamAdapter.java b/src/main/java/io/airlift/compress/v3/hadoop/CompressionInputStreamAdapter.java similarity index 98% rename from src/main/java/io/airlift/compress/v2/hadoop/CompressionInputStreamAdapter.java rename to src/main/java/io/airlift/compress/v3/hadoop/CompressionInputStreamAdapter.java index ec113a12..59a87011 100644 --- a/src/main/java/io/airlift/compress/v2/hadoop/CompressionInputStreamAdapter.java +++ b/src/main/java/io/airlift/compress/v3/hadoop/CompressionInputStreamAdapter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.hadoop; +package io.airlift.compress.v3.hadoop; import org.apache.hadoop.io.compress.CompressionInputStream; diff --git a/src/main/java/io/airlift/compress/v2/hadoop/CompressionOutputStreamAdapter.java b/src/main/java/io/airlift/compress/v3/hadoop/CompressionOutputStreamAdapter.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/hadoop/CompressionOutputStreamAdapter.java rename to src/main/java/io/airlift/compress/v3/hadoop/CompressionOutputStreamAdapter.java index 8f81ef59..79540492 100644 --- a/src/main/java/io/airlift/compress/v2/hadoop/CompressionOutputStreamAdapter.java +++ b/src/main/java/io/airlift/compress/v3/hadoop/CompressionOutputStreamAdapter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.hadoop; +package io.airlift.compress.v3.hadoop; import org.apache.hadoop.io.compress.CompressionOutputStream; diff --git a/src/main/java/io/airlift/compress/v2/hadoop/HadoopInputStream.java b/src/main/java/io/airlift/compress/v3/hadoop/HadoopInputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/hadoop/HadoopInputStream.java rename to src/main/java/io/airlift/compress/v3/hadoop/HadoopInputStream.java index fbb99a7a..961695fa 100644 --- a/src/main/java/io/airlift/compress/v2/hadoop/HadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v3/hadoop/HadoopInputStream.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.hadoop; +package io.airlift.compress.v3.hadoop; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/v2/hadoop/HadoopOutputStream.java b/src/main/java/io/airlift/compress/v3/hadoop/HadoopOutputStream.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/hadoop/HadoopOutputStream.java rename to src/main/java/io/airlift/compress/v3/hadoop/HadoopOutputStream.java index b4ec39ba..a61e64a8 100644 --- a/src/main/java/io/airlift/compress/v2/hadoop/HadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/hadoop/HadoopOutputStream.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.hadoop; +package io.airlift.compress.v3.hadoop; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/v2/hadoop/HadoopStreams.java b/src/main/java/io/airlift/compress/v3/hadoop/HadoopStreams.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/hadoop/HadoopStreams.java rename to src/main/java/io/airlift/compress/v3/hadoop/HadoopStreams.java index 6e265d49..f3d69ec4 100644 --- a/src/main/java/io/airlift/compress/v2/hadoop/HadoopStreams.java +++ b/src/main/java/io/airlift/compress/v3/hadoop/HadoopStreams.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.hadoop; +package io.airlift.compress.v3.hadoop; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/v2/internal/NativeLoader.java b/src/main/java/io/airlift/compress/v3/internal/NativeLoader.java similarity index 98% rename from src/main/java/io/airlift/compress/v2/internal/NativeLoader.java rename to src/main/java/io/airlift/compress/v3/internal/NativeLoader.java index 793b3082..0c44b6a4 100644 --- a/src/main/java/io/airlift/compress/v2/internal/NativeLoader.java +++ b/src/main/java/io/airlift/compress/v3/internal/NativeLoader.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.internal; +package io.airlift.compress.v3.internal; import java.io.File; import java.io.IOException; @@ -155,7 +155,7 @@ private static ValueLayout getMemoryLayout(Class type) public static SymbolLookup loadLibrary(String name) throws LinkageError { - if (System.getProperty("io.airlift.compress.v2.disable-native") != null) { + if (System.getProperty("io.airlift.compress.v3.disable-native") != null) { throw new LinkageError("Native library loading is disabled"); } diff --git a/src/main/java/io/airlift/compress/v2/internal/NativeSignature.java b/src/main/java/io/airlift/compress/v3/internal/NativeSignature.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/internal/NativeSignature.java rename to src/main/java/io/airlift/compress/v3/internal/NativeSignature.java index cb5fabb6..55d70b92 100644 --- a/src/main/java/io/airlift/compress/v2/internal/NativeSignature.java +++ b/src/main/java/io/airlift/compress/v3/internal/NativeSignature.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.internal; +package io.airlift.compress.v3.internal; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4Codec.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4Codec.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4Codec.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4Codec.java index 4da4aa7c..0deb974c 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4Codec.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4Codec.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.hadoop.CodecAdapter; +import io.airlift.compress.v3.hadoop.CodecAdapter; import org.apache.hadoop.conf.Configuration; import java.util.Optional; diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4Compressor.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4Compressor.java similarity index 92% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4Compressor.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4Compressor.java index fc8c41fa..4fc31024 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4Compressor.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4Compressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v3.Compressor; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4Constants.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4Constants.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4Constants.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4Constants.java index 934adc10..1c42be76 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4Constants.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4Constants.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; final class Lz4Constants { diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4Decompressor.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4Decompressor.java similarity index 92% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4Decompressor.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4Decompressor.java index 0dcd1ebc..cdc8c263 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4Decompressor.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4Decompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v3.Decompressor; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopInputStream.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4HadoopInputStream.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopInputStream.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4HadoopInputStream.java index bca87f29..28784640 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4HadoopInputStream.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopInputStream; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import static io.airlift.compress.v2.lz4.Lz4Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.lz4.Lz4Constants.SIZE_OF_LONG; import static java.util.Objects.requireNonNull; class Lz4HadoopInputStream diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopOutputStream.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4HadoopOutputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopOutputStream.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4HadoopOutputStream.java index bf7af671..3c09ecca 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4HadoopOutputStream.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; -import static io.airlift.compress.v2.lz4.Lz4Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.lz4.Lz4Constants.SIZE_OF_LONG; import static java.util.Objects.requireNonNull; class Lz4HadoopOutputStream diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopStreams.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4HadoopStreams.java similarity index 90% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopStreams.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4HadoopStreams.java index ac735131..2183f414 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopStreams.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4HadoopStreams.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.hadoop.HadoopInputStream; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; -import io.airlift.compress.v2.hadoop.HadoopStreams; +import io.airlift.compress.v3.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopStreams; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4JavaCompressor.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4JavaCompressor.java similarity index 92% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4JavaCompressor.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4JavaCompressor.java index 9e372b75..70888431 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4JavaCompressor.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4JavaCompressor.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.v2.lz4.Lz4RawCompressor.MAX_TABLE_SIZE; -import static io.airlift.compress.v2.lz4.UnsafeUtil.getAddress; -import static io.airlift.compress.v2.lz4.UnsafeUtil.getBase; +import static io.airlift.compress.v3.lz4.Lz4RawCompressor.MAX_TABLE_SIZE; +import static io.airlift.compress.v3.lz4.UnsafeUtil.getAddress; +import static io.airlift.compress.v3.lz4.UnsafeUtil.getBase; import static java.lang.Math.toIntExact; import static java.lang.String.format; import static java.lang.ref.Reference.reachabilityFence; diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4JavaDecompressor.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4JavaDecompressor.java similarity index 92% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4JavaDecompressor.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4JavaDecompressor.java index 4c52e5c5..4c807ccc 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4JavaDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4JavaDecompressor.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.v2.lz4.UnsafeUtil.getAddress; -import static io.airlift.compress.v2.lz4.UnsafeUtil.getBase; +import static io.airlift.compress.v3.lz4.UnsafeUtil.getAddress; +import static io.airlift.compress.v3.lz4.UnsafeUtil.getBase; import static java.lang.Math.addExact; import static java.lang.String.format; import static java.lang.ref.Reference.reachabilityFence; diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4Native.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4Native.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4Native.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4Native.java index 3a567358..df9e6585 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4Native.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4Native.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.internal.NativeLoader.Symbols; -import io.airlift.compress.v2.internal.NativeSignature; +import io.airlift.compress.v3.internal.NativeLoader.Symbols; +import io.airlift.compress.v3.internal.NativeSignature; import java.lang.foreign.MemorySegment; import java.lang.invoke.MethodHandle; import java.util.Optional; -import static io.airlift.compress.v2.internal.NativeLoader.loadSymbols; +import static io.airlift.compress.v3.internal.NativeLoader.loadSymbols; import static java.lang.invoke.MethodHandles.lookup; final class Lz4Native diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4NativeCompressor.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4NativeCompressor.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4NativeCompressor.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4NativeCompressor.java index 2e82c861..6b6253a1 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4NativeCompressor.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4NativeCompressor.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.v2.lz4.Lz4Native.DEFAULT_ACCELERATION; +import static io.airlift.compress.v3.lz4.Lz4Native.DEFAULT_ACCELERATION; import static java.lang.Math.toIntExact; public final class Lz4NativeCompressor diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4NativeDecompressor.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4NativeDecompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4NativeDecompressor.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4NativeDecompressor.java index e76b9850..ed5304f5 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4NativeDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4NativeDecompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4RawCompressor.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4RawCompressor.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4RawCompressor.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4RawCompressor.java index 1f9e9373..79f550c5 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4RawCompressor.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4RawCompressor.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; import java.util.Arrays; -import static io.airlift.compress.v2.lz4.Lz4Constants.LAST_LITERAL_SIZE; -import static io.airlift.compress.v2.lz4.Lz4Constants.MIN_MATCH; -import static io.airlift.compress.v2.lz4.Lz4Constants.SIZE_OF_LONG; -import static io.airlift.compress.v2.lz4.Lz4Constants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.lz4.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.lz4.Lz4Constants.LAST_LITERAL_SIZE; +import static io.airlift.compress.v3.lz4.Lz4Constants.MIN_MATCH; +import static io.airlift.compress.v3.lz4.Lz4Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.lz4.Lz4Constants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.lz4.UnsafeUtil.UNSAFE; final class Lz4RawCompressor { diff --git a/src/main/java/io/airlift/compress/v2/lz4/Lz4RawDecompressor.java b/src/main/java/io/airlift/compress/v3/lz4/Lz4RawDecompressor.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/lz4/Lz4RawDecompressor.java rename to src/main/java/io/airlift/compress/v3/lz4/Lz4RawDecompressor.java index c7141a0b..8cb036e1 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/Lz4RawDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/lz4/Lz4RawDecompressor.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; -import static io.airlift.compress.v2.lz4.Lz4Constants.LAST_LITERAL_SIZE; -import static io.airlift.compress.v2.lz4.Lz4Constants.MIN_MATCH; -import static io.airlift.compress.v2.lz4.Lz4Constants.SIZE_OF_INT; -import static io.airlift.compress.v2.lz4.Lz4Constants.SIZE_OF_LONG; -import static io.airlift.compress.v2.lz4.Lz4Constants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.lz4.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.lz4.Lz4Constants.LAST_LITERAL_SIZE; +import static io.airlift.compress.v3.lz4.Lz4Constants.MIN_MATCH; +import static io.airlift.compress.v3.lz4.Lz4Constants.SIZE_OF_INT; +import static io.airlift.compress.v3.lz4.Lz4Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.lz4.Lz4Constants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.lz4.UnsafeUtil.UNSAFE; final class Lz4RawDecompressor { diff --git a/src/main/java/io/airlift/compress/v2/lz4/UnsafeUtil.java b/src/main/java/io/airlift/compress/v3/lz4/UnsafeUtil.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/lz4/UnsafeUtil.java rename to src/main/java/io/airlift/compress/v3/lz4/UnsafeUtil.java index c2b51abc..2deac082 100644 --- a/src/main/java/io/airlift/compress/v2/lz4/UnsafeUtil.java +++ b/src/main/java/io/airlift/compress/v3/lz4/UnsafeUtil.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.IncompatibleJvmException; +import io.airlift.compress.v3.IncompatibleJvmException; import sun.misc.Unsafe; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzoCodec.java b/src/main/java/io/airlift/compress/v3/lzo/LzoCodec.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/lzo/LzoCodec.java rename to src/main/java/io/airlift/compress/v3/lzo/LzoCodec.java index 073b2bfe..a2284b84 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzoCodec.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzoCodec.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.hadoop.CodecAdapter; +import io.airlift.compress.v3.hadoop.CodecAdapter; import org.apache.hadoop.conf.Configuration; import java.util.Optional; diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzoCompressor.java b/src/main/java/io/airlift/compress/v3/lzo/LzoCompressor.java similarity index 90% rename from src/main/java/io/airlift/compress/v2/lzo/LzoCompressor.java rename to src/main/java/io/airlift/compress/v3/lzo/LzoCompressor.java index 4cf9e05b..29c7bc52 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzoCompressor.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzoCompressor.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v3.Compressor; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.v2.lzo.LzoRawCompressor.MAX_TABLE_SIZE; -import static io.airlift.compress.v2.lzo.UnsafeUtil.getAddress; -import static io.airlift.compress.v2.lzo.UnsafeUtil.getBase; +import static io.airlift.compress.v3.lzo.LzoRawCompressor.MAX_TABLE_SIZE; +import static io.airlift.compress.v3.lzo.UnsafeUtil.getAddress; +import static io.airlift.compress.v3.lzo.UnsafeUtil.getBase; import static java.lang.Math.toIntExact; import static java.lang.String.format; import static java.lang.ref.Reference.reachabilityFence; diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzoConstants.java b/src/main/java/io/airlift/compress/v3/lzo/LzoConstants.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/lzo/LzoConstants.java rename to src/main/java/io/airlift/compress/v3/lzo/LzoConstants.java index 30c3816f..c54bd958 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzoConstants.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzoConstants.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; final class LzoConstants { diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzoDecompressor.java b/src/main/java/io/airlift/compress/v3/lzo/LzoDecompressor.java similarity index 91% rename from src/main/java/io/airlift/compress/v2/lzo/LzoDecompressor.java rename to src/main/java/io/airlift/compress/v3/lzo/LzoDecompressor.java index e61b8651..6d9ffe50 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzoDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzoDecompressor.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.MalformedInputException; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.v2.lzo.UnsafeUtil.getAddress; -import static io.airlift.compress.v2.lzo.UnsafeUtil.getBase; +import static io.airlift.compress.v3.lzo.UnsafeUtil.getAddress; +import static io.airlift.compress.v3.lzo.UnsafeUtil.getBase; import static java.lang.Math.addExact; import static java.lang.String.format; import static java.lang.ref.Reference.reachabilityFence; diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzoHadoopInputStream.java b/src/main/java/io/airlift/compress/v3/lzo/LzoHadoopInputStream.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/lzo/LzoHadoopInputStream.java rename to src/main/java/io/airlift/compress/v3/lzo/LzoHadoopInputStream.java index 8a32b101..6dae8ebb 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzoHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzoHadoopInputStream.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopInputStream; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_LONG; +import static io.airlift.compress.v3.lzo.LzoConstants.SIZE_OF_LONG; import static java.util.Objects.requireNonNull; class LzoHadoopInputStream diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzoHadoopOutputStream.java b/src/main/java/io/airlift/compress/v3/lzo/LzoHadoopOutputStream.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/lzo/LzoHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v3/lzo/LzoHadoopOutputStream.java index 4d344222..0d15e88f 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzoHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzoHadoopOutputStream.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; -import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_LONG; +import static io.airlift.compress.v3.lzo.LzoConstants.SIZE_OF_LONG; import static java.util.Objects.requireNonNull; class LzoHadoopOutputStream diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzoHadoopStreams.java b/src/main/java/io/airlift/compress/v3/lzo/LzoHadoopStreams.java similarity index 89% rename from src/main/java/io/airlift/compress/v2/lzo/LzoHadoopStreams.java rename to src/main/java/io/airlift/compress/v3/lzo/LzoHadoopStreams.java index d1896e2f..b3f74fc8 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzoHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzoHadoopStreams.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.hadoop.HadoopInputStream; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; -import io.airlift.compress.v2.hadoop.HadoopStreams; +import io.airlift.compress.v3.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopStreams; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzoRawCompressor.java b/src/main/java/io/airlift/compress/v3/lzo/LzoRawCompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/lzo/LzoRawCompressor.java rename to src/main/java/io/airlift/compress/v3/lzo/LzoRawCompressor.java index e6a8fcd7..d991d454 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzoRawCompressor.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzoRawCompressor.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; import java.util.Arrays; -import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_INT; -import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_LONG; -import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.lzo.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.lzo.LzoConstants.SIZE_OF_INT; +import static io.airlift.compress.v3.lzo.LzoConstants.SIZE_OF_LONG; +import static io.airlift.compress.v3.lzo.LzoConstants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.lzo.UnsafeUtil.UNSAFE; final class LzoRawCompressor { diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzoRawDecompressor.java b/src/main/java/io/airlift/compress/v3/lzo/LzoRawDecompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/lzo/LzoRawDecompressor.java rename to src/main/java/io/airlift/compress/v3/lzo/LzoRawDecompressor.java index f6f0e436..34d2100e 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzoRawDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzoRawDecompressor.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; -import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_INT; -import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_LONG; -import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.lzo.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.lzo.LzoConstants.SIZE_OF_INT; +import static io.airlift.compress.v3.lzo.LzoConstants.SIZE_OF_LONG; +import static io.airlift.compress.v3.lzo.LzoConstants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.lzo.UnsafeUtil.UNSAFE; import static java.lang.Integer.toBinaryString; final class LzoRawDecompressor diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzopCodec.java b/src/main/java/io/airlift/compress/v3/lzo/LzopCodec.java similarity index 83% rename from src/main/java/io/airlift/compress/v2/lzo/LzopCodec.java rename to src/main/java/io/airlift/compress/v3/lzo/LzopCodec.java index 7bdfc00c..50f6a14f 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzopCodec.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzopCodec.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.hadoop.CodecAdapter; +import io.airlift.compress.v3.hadoop.CodecAdapter; -import static io.airlift.compress.v2.lzo.LzoCodec.getBufferSize; +import static io.airlift.compress.v3.lzo.LzoCodec.getBufferSize; public class LzopCodec extends CodecAdapter diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzopHadoopInputStream.java b/src/main/java/io/airlift/compress/v3/lzo/LzopHadoopInputStream.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/lzo/LzopHadoopInputStream.java rename to src/main/java/io/airlift/compress/v3/lzo/LzopHadoopInputStream.java index f3055210..e67882d8 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzopHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzopHadoopInputStream.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopInputStream; import java.io.ByteArrayInputStream; import java.io.EOFException; @@ -24,9 +24,9 @@ import java.util.zip.CRC32; import java.util.zip.Checksum; -import static io.airlift.compress.v2.lzo.LzoConstants.LZOP_MAGIC; -import static io.airlift.compress.v2.lzo.LzoConstants.LZO_1X_VARIANT; -import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_LONG; +import static io.airlift.compress.v3.lzo.LzoConstants.LZOP_MAGIC; +import static io.airlift.compress.v3.lzo.LzoConstants.LZO_1X_VARIANT; +import static io.airlift.compress.v3.lzo.LzoConstants.SIZE_OF_LONG; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzopHadoopOutputStream.java b/src/main/java/io/airlift/compress/v3/lzo/LzopHadoopOutputStream.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/lzo/LzopHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v3/lzo/LzopHadoopOutputStream.java index f68f7139..b337d989 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzopHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzopHadoopOutputStream.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; @@ -21,9 +21,9 @@ import java.io.OutputStream; import java.util.zip.Adler32; -import static io.airlift.compress.v2.lzo.LzoConstants.LZOP_MAGIC; -import static io.airlift.compress.v2.lzo.LzoConstants.LZO_1X_VARIANT; -import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_LONG; +import static io.airlift.compress.v3.lzo.LzoConstants.LZOP_MAGIC; +import static io.airlift.compress.v3.lzo.LzoConstants.LZO_1X_VARIANT; +import static io.airlift.compress.v3.lzo.LzoConstants.SIZE_OF_LONG; import static java.util.Objects.requireNonNull; class LzopHadoopOutputStream diff --git a/src/main/java/io/airlift/compress/v2/lzo/LzopHadoopStreams.java b/src/main/java/io/airlift/compress/v3/lzo/LzopHadoopStreams.java similarity index 89% rename from src/main/java/io/airlift/compress/v2/lzo/LzopHadoopStreams.java rename to src/main/java/io/airlift/compress/v3/lzo/LzopHadoopStreams.java index 5e72bf27..3e19f52b 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/LzopHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v3/lzo/LzopHadoopStreams.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.hadoop.HadoopInputStream; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; -import io.airlift.compress.v2.hadoop.HadoopStreams; +import io.airlift.compress.v3.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopStreams; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/v2/lzo/UnsafeUtil.java b/src/main/java/io/airlift/compress/v3/lzo/UnsafeUtil.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/lzo/UnsafeUtil.java rename to src/main/java/io/airlift/compress/v3/lzo/UnsafeUtil.java index dec67892..44468537 100644 --- a/src/main/java/io/airlift/compress/v2/lzo/UnsafeUtil.java +++ b/src/main/java/io/airlift/compress/v3/lzo/UnsafeUtil.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.IncompatibleJvmException; +import io.airlift.compress.v3.IncompatibleJvmException; import sun.misc.Unsafe; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/snappy/Crc32C.java b/src/main/java/io/airlift/compress/v3/snappy/Crc32C.java similarity index 99% rename from src/main/java/io/airlift/compress/v2/snappy/Crc32C.java rename to src/main/java/io/airlift/compress/v3/snappy/Crc32C.java index 3058b699..6f8014dd 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/Crc32C.java +++ b/src/main/java/io/airlift/compress/v3/snappy/Crc32C.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; import java.util.zip.Checksum; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyCodec.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyCodec.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyCodec.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyCodec.java index c29f46f8..9997b77f 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyCodec.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyCodec.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.hadoop.CodecAdapter; +import io.airlift.compress.v3.hadoop.CodecAdapter; import org.apache.hadoop.conf.Configuration; import java.util.Optional; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyCompressor.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyCompressor.java similarity index 92% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyCompressor.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyCompressor.java index 8d544257..3f283baa 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyCompressor.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyCompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v3.Compressor; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyConstants.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyConstants.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyConstants.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyConstants.java index e6ad808c..f39c715f 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyConstants.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyConstants.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; final class SnappyConstants { diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyDecompressor.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyDecompressor.java similarity index 92% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyDecompressor.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyDecompressor.java index 6a20ec94..7984bd67 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyDecompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v3.Decompressor; public sealed interface SnappyDecompressor extends Decompressor diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyFramed.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyFramed.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyFramed.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyFramed.java index 4686547d..2d9c81d9 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyFramed.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyFramed.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; /** * Constants for implementing x-snappy-framed. diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyFramedInputStream.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyFramedInputStream.java similarity index 98% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyFramedInputStream.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyFramedInputStream.java index 49cee35b..60e4774d 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyFramedInputStream.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyFramedInputStream.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; -import static io.airlift.compress.v2.snappy.SnappyFramedOutputStream.MAX_BLOCK_SIZE; +import static io.airlift.compress.v3.snappy.SnappyFramedOutputStream.MAX_BLOCK_SIZE; import static java.lang.Math.min; import static java.util.Objects.requireNonNull; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyFramedOutputStream.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyFramedOutputStream.java similarity index 99% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyFramedOutputStream.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyFramedOutputStream.java index 8b3210ae..b9f5ef00 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyFramedOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyFramedOutputStream.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopInputStream.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyHadoopInputStream.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopInputStream.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyHadoopInputStream.java index dedb2311..c39e3f75 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyHadoopInputStream.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopInputStream; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import static io.airlift.compress.v2.snappy.SnappyConstants.SIZE_OF_LONG; +import static io.airlift.compress.v3.snappy.SnappyConstants.SIZE_OF_LONG; class SnappyHadoopInputStream extends HadoopInputStream diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopOutputStream.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyHadoopOutputStream.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyHadoopOutputStream.java index 1321ee3a..9401de29 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyHadoopOutputStream.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; -import static io.airlift.compress.v2.snappy.SnappyConstants.SIZE_OF_LONG; +import static io.airlift.compress.v3.snappy.SnappyConstants.SIZE_OF_LONG; import static java.util.Objects.requireNonNull; class SnappyHadoopOutputStream diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopStreams.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyHadoopStreams.java similarity index 90% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopStreams.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyHadoopStreams.java index d69dd907..badb03d3 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyHadoopStreams.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.hadoop.HadoopInputStream; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; -import io.airlift.compress.v2.hadoop.HadoopStreams; +import io.airlift.compress.v3.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopStreams; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyInternalUtils.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyInternalUtils.java similarity index 99% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyInternalUtils.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyInternalUtils.java index 7d03b294..eb50048f 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyInternalUtils.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyInternalUtils.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyJavaCompressor.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyJavaCompressor.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyJavaCompressor.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyJavaCompressor.java index 5d059c00..3411966f 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyJavaCompressor.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyJavaCompressor.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.v2.snappy.UnsafeUtil.getAddress; -import static io.airlift.compress.v2.snappy.UnsafeUtil.getBase; +import static io.airlift.compress.v3.snappy.UnsafeUtil.getAddress; +import static io.airlift.compress.v3.snappy.UnsafeUtil.getBase; import static java.lang.Math.addExact; import static java.lang.String.format; import static java.lang.ref.Reference.reachabilityFence; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyJavaDecompressor.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyJavaDecompressor.java similarity index 93% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyJavaDecompressor.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyJavaDecompressor.java index 3e1cca90..ca7b015c 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyJavaDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyJavaDecompressor.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.v2.snappy.UnsafeUtil.getAddress; -import static io.airlift.compress.v2.snappy.UnsafeUtil.getBase; +import static io.airlift.compress.v3.snappy.UnsafeUtil.getAddress; +import static io.airlift.compress.v3.snappy.UnsafeUtil.getBase; import static java.lang.Math.addExact; import static java.lang.String.format; import static java.lang.ref.Reference.reachabilityFence; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyNative.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyNative.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyNative.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyNative.java index eb54468b..8457a5b0 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyNative.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyNative.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.MalformedInputException; -import io.airlift.compress.v2.internal.NativeLoader.Symbols; -import io.airlift.compress.v2.internal.NativeSignature; +import io.airlift.compress.v3.MalformedInputException; +import io.airlift.compress.v3.internal.NativeLoader.Symbols; +import io.airlift.compress.v3.internal.NativeSignature; import java.lang.foreign.MemorySegment; import java.lang.invoke.MethodHandle; import java.util.Optional; -import static io.airlift.compress.v2.internal.NativeLoader.loadSymbols; +import static io.airlift.compress.v3.internal.NativeLoader.loadSymbols; import static java.lang.foreign.ValueLayout.JAVA_LONG; import static java.lang.invoke.MethodHandles.lookup; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyNativeCompressor.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyNativeCompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyNativeCompressor.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyNativeCompressor.java index c7142aa6..ca0d57de 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyNativeCompressor.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyNativeCompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyNativeDecompressor.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyNativeDecompressor.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyNativeDecompressor.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyNativeDecompressor.java index 2f97ba42..d00015b8 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyNativeDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyNativeDecompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyRawCompressor.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyRawCompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyRawCompressor.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyRawCompressor.java index df61a3eb..b2edf392 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyRawCompressor.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyRawCompressor.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; import java.util.Arrays; -import static io.airlift.compress.v2.snappy.SnappyConstants.COPY_1_BYTE_OFFSET; -import static io.airlift.compress.v2.snappy.SnappyConstants.COPY_2_BYTE_OFFSET; -import static io.airlift.compress.v2.snappy.SnappyConstants.SIZE_OF_INT; -import static io.airlift.compress.v2.snappy.SnappyConstants.SIZE_OF_LONG; -import static io.airlift.compress.v2.snappy.SnappyConstants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.snappy.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.snappy.SnappyConstants.COPY_1_BYTE_OFFSET; +import static io.airlift.compress.v3.snappy.SnappyConstants.COPY_2_BYTE_OFFSET; +import static io.airlift.compress.v3.snappy.SnappyConstants.SIZE_OF_INT; +import static io.airlift.compress.v3.snappy.SnappyConstants.SIZE_OF_LONG; +import static io.airlift.compress.v3.snappy.SnappyConstants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.snappy.UnsafeUtil.UNSAFE; final class SnappyRawCompressor { diff --git a/src/main/java/io/airlift/compress/v2/snappy/SnappyRawDecompressor.java b/src/main/java/io/airlift/compress/v3/snappy/SnappyRawDecompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/snappy/SnappyRawDecompressor.java rename to src/main/java/io/airlift/compress/v3/snappy/SnappyRawDecompressor.java index cbdefc11..00728c23 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/SnappyRawDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/snappy/SnappyRawDecompressor.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; -import static io.airlift.compress.v2.snappy.SnappyConstants.LITERAL; -import static io.airlift.compress.v2.snappy.SnappyConstants.SIZE_OF_INT; -import static io.airlift.compress.v2.snappy.SnappyConstants.SIZE_OF_LONG; -import static io.airlift.compress.v2.snappy.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.snappy.SnappyConstants.LITERAL; +import static io.airlift.compress.v3.snappy.SnappyConstants.SIZE_OF_INT; +import static io.airlift.compress.v3.snappy.SnappyConstants.SIZE_OF_LONG; +import static io.airlift.compress.v3.snappy.UnsafeUtil.UNSAFE; final class SnappyRawDecompressor { diff --git a/src/main/java/io/airlift/compress/v2/snappy/UnsafeUtil.java b/src/main/java/io/airlift/compress/v3/snappy/UnsafeUtil.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/snappy/UnsafeUtil.java rename to src/main/java/io/airlift/compress/v3/snappy/UnsafeUtil.java index 68f96c53..9854336e 100644 --- a/src/main/java/io/airlift/compress/v2/snappy/UnsafeUtil.java +++ b/src/main/java/io/airlift/compress/v3/snappy/UnsafeUtil.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.IncompatibleJvmException; +import io.airlift.compress.v3.IncompatibleJvmException; import sun.misc.Unsafe; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/zstd/BitInputStream.java b/src/main/java/io/airlift/compress/v3/zstd/BitInputStream.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/zstd/BitInputStream.java rename to src/main/java/io/airlift/compress/v3/zstd/BitInputStream.java index 87cb0064..5ac42778 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/BitInputStream.java +++ b/src/main/java/io/airlift/compress/v3/zstd/BitInputStream.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.v2.zstd.Util.highestBit; -import static io.airlift.compress.v2.zstd.Util.verify; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Util.highestBit; +import static io.airlift.compress.v3.zstd.Util.verify; /** * Bit streams are encoded as a byte-aligned little-endian stream. Thus, bits are laid out diff --git a/src/main/java/io/airlift/compress/v2/zstd/BitOutputStream.java b/src/main/java/io/airlift/compress/v3/zstd/BitOutputStream.java similarity index 91% rename from src/main/java/io/airlift/compress/v2/zstd/BitOutputStream.java rename to src/main/java/io/airlift/compress/v3/zstd/BitOutputStream.java index 078f79e7..fd30ffcd 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/BitOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/zstd/BitOutputStream.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.v2.zstd.Util.checkArgument; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Util.checkArgument; class BitOutputStream { diff --git a/src/main/java/io/airlift/compress/v2/zstd/BlockCompressionState.java b/src/main/java/io/airlift/compress/v3/zstd/BlockCompressionState.java similarity index 98% rename from src/main/java/io/airlift/compress/v2/zstd/BlockCompressionState.java rename to src/main/java/io/airlift/compress/v3/zstd/BlockCompressionState.java index ada65a1b..c611f0a2 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/BlockCompressionState.java +++ b/src/main/java/io/airlift/compress/v3/zstd/BlockCompressionState.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.util.Arrays; diff --git a/src/main/java/io/airlift/compress/v2/zstd/BlockCompressor.java b/src/main/java/io/airlift/compress/v3/zstd/BlockCompressor.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/zstd/BlockCompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/BlockCompressor.java index 149af817..ee2e2ac7 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/BlockCompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/BlockCompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; interface BlockCompressor { diff --git a/src/main/java/io/airlift/compress/v2/zstd/CompressionContext.java b/src/main/java/io/airlift/compress/v3/zstd/CompressionContext.java similarity index 92% rename from src/main/java/io/airlift/compress/v2/zstd/CompressionContext.java rename to src/main/java/io/airlift/compress/v3/zstd/CompressionContext.java index 16c0b17a..894751f7 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/CompressionContext.java +++ b/src/main/java/io/airlift/compress/v3/zstd/CompressionContext.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import static io.airlift.compress.v2.zstd.Constants.MAX_BLOCK_SIZE; -import static io.airlift.compress.v2.zstd.Util.checkArgument; +import static io.airlift.compress.v3.zstd.Constants.MAX_BLOCK_SIZE; +import static io.airlift.compress.v3.zstd.Util.checkArgument; class CompressionContext { diff --git a/src/main/java/io/airlift/compress/v2/zstd/CompressionParameters.java b/src/main/java/io/airlift/compress/v3/zstd/CompressionParameters.java similarity index 98% rename from src/main/java/io/airlift/compress/v2/zstd/CompressionParameters.java rename to src/main/java/io/airlift/compress/v3/zstd/CompressionParameters.java index 210f067e..98d37847 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/CompressionParameters.java +++ b/src/main/java/io/airlift/compress/v3/zstd/CompressionParameters.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import static io.airlift.compress.v2.zstd.Constants.MAX_BLOCK_SIZE; -import static io.airlift.compress.v2.zstd.Constants.MAX_WINDOW_LOG; -import static io.airlift.compress.v2.zstd.Constants.MIN_WINDOW_LOG; -import static io.airlift.compress.v2.zstd.Util.cycleLog; -import static io.airlift.compress.v2.zstd.Util.highestBit; +import static io.airlift.compress.v3.zstd.Constants.MAX_BLOCK_SIZE; +import static io.airlift.compress.v3.zstd.Constants.MAX_WINDOW_LOG; +import static io.airlift.compress.v3.zstd.Constants.MIN_WINDOW_LOG; +import static io.airlift.compress.v3.zstd.Util.cycleLog; +import static io.airlift.compress.v3.zstd.Util.highestBit; class CompressionParameters { diff --git a/src/main/java/io/airlift/compress/v2/zstd/Constants.java b/src/main/java/io/airlift/compress/v3/zstd/Constants.java similarity index 98% rename from src/main/java/io/airlift/compress/v2/zstd/Constants.java rename to src/main/java/io/airlift/compress/v3/zstd/Constants.java index 0b164e79..ecd52ec3 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/Constants.java +++ b/src/main/java/io/airlift/compress/v3/zstd/Constants.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; final class Constants { diff --git a/src/main/java/io/airlift/compress/v2/zstd/DoubleFastBlockCompressor.java b/src/main/java/io/airlift/compress/v3/zstd/DoubleFastBlockCompressor.java similarity index 98% rename from src/main/java/io/airlift/compress/v2/zstd/DoubleFastBlockCompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/DoubleFastBlockCompressor.java index bcc7cf2b..a5229884 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/DoubleFastBlockCompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/DoubleFastBlockCompressor.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_INT; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; class DoubleFastBlockCompressor implements BlockCompressor diff --git a/src/main/java/io/airlift/compress/v2/zstd/FiniteStateEntropy.java b/src/main/java/io/airlift/compress/v3/zstd/FiniteStateEntropy.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/zstd/FiniteStateEntropy.java rename to src/main/java/io/airlift/compress/v3/zstd/FiniteStateEntropy.java index 4e033916..a31a7706 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/FiniteStateEntropy.java +++ b/src/main/java/io/airlift/compress/v3/zstd/FiniteStateEntropy.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; - -import static io.airlift.compress.v2.zstd.BitInputStream.peekBits; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.v2.zstd.Util.checkArgument; -import static io.airlift.compress.v2.zstd.Util.verify; +package io.airlift.compress.v3.zstd; + +import static io.airlift.compress.v3.zstd.BitInputStream.peekBits; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_INT; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Util.checkArgument; +import static io.airlift.compress.v3.zstd.Util.verify; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; final class FiniteStateEntropy diff --git a/src/main/java/io/airlift/compress/v2/zstd/FrameHeader.java b/src/main/java/io/airlift/compress/v3/zstd/FrameHeader.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/zstd/FrameHeader.java rename to src/main/java/io/airlift/compress/v3/zstd/FrameHeader.java index e109f5e7..6967057d 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/FrameHeader.java +++ b/src/main/java/io/airlift/compress/v3/zstd/FrameHeader.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.util.Objects; import java.util.StringJoiner; -import static io.airlift.compress.v2.zstd.Util.checkState; +import static io.airlift.compress.v3.zstd.Util.checkState; import static java.lang.Math.min; import static java.lang.Math.toIntExact; diff --git a/src/main/java/io/airlift/compress/v2/zstd/FseCompressionTable.java b/src/main/java/io/airlift/compress/v3/zstd/FseCompressionTable.java similarity index 98% rename from src/main/java/io/airlift/compress/v2/zstd/FseCompressionTable.java rename to src/main/java/io/airlift/compress/v3/zstd/FseCompressionTable.java index 1e5ea032..aed4a3b7 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/FseCompressionTable.java +++ b/src/main/java/io/airlift/compress/v3/zstd/FseCompressionTable.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import static io.airlift.compress.v2.zstd.FiniteStateEntropy.MAX_SYMBOL; +import static io.airlift.compress.v3.zstd.FiniteStateEntropy.MAX_SYMBOL; class FseCompressionTable { diff --git a/src/main/java/io/airlift/compress/v2/zstd/FseTableReader.java b/src/main/java/io/airlift/compress/v3/zstd/FseTableReader.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/zstd/FseTableReader.java rename to src/main/java/io/airlift/compress/v3/zstd/FseTableReader.java index b1ac0417..00d829a3 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/FseTableReader.java +++ b/src/main/java/io/airlift/compress/v3/zstd/FseTableReader.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import static io.airlift.compress.v2.zstd.FiniteStateEntropy.MAX_SYMBOL; -import static io.airlift.compress.v2.zstd.FiniteStateEntropy.MIN_TABLE_LOG; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.v2.zstd.Util.highestBit; -import static io.airlift.compress.v2.zstd.Util.verify; +import static io.airlift.compress.v3.zstd.FiniteStateEntropy.MAX_SYMBOL; +import static io.airlift.compress.v3.zstd.FiniteStateEntropy.MIN_TABLE_LOG; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Util.highestBit; +import static io.airlift.compress.v3.zstd.Util.verify; class FseTableReader { diff --git a/src/main/java/io/airlift/compress/v2/zstd/Histogram.java b/src/main/java/io/airlift/compress/v3/zstd/Histogram.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/zstd/Histogram.java rename to src/main/java/io/airlift/compress/v3/zstd/Histogram.java index 0362e7d6..e05a1f10 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/Histogram.java +++ b/src/main/java/io/airlift/compress/v3/zstd/Histogram.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.util.Arrays; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; final class Histogram diff --git a/src/main/java/io/airlift/compress/v2/zstd/Huffman.java b/src/main/java/io/airlift/compress/v3/zstd/Huffman.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/zstd/Huffman.java rename to src/main/java/io/airlift/compress/v3/zstd/Huffman.java index 7612bfb5..3316e57e 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/Huffman.java +++ b/src/main/java/io/airlift/compress/v3/zstd/Huffman.java @@ -11,17 +11,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.util.Arrays; -import static io.airlift.compress.v2.zstd.BitInputStream.isEndOfStream; -import static io.airlift.compress.v2.zstd.BitInputStream.peekBitsFast; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.v2.zstd.Util.isPowerOf2; -import static io.airlift.compress.v2.zstd.Util.verify; +import static io.airlift.compress.v3.zstd.BitInputStream.isEndOfStream; +import static io.airlift.compress.v3.zstd.BitInputStream.peekBitsFast; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_INT; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Util.isPowerOf2; +import static io.airlift.compress.v3.zstd.Util.verify; class Huffman { diff --git a/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionContext.java b/src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressionContext.java similarity index 98% rename from src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionContext.java rename to src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressionContext.java index 21151c47..2675daa6 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionContext.java +++ b/src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressionContext.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; class HuffmanCompressionContext { diff --git a/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionTable.java b/src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressionTable.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionTable.java rename to src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressionTable.java index 20e43916..07eddd49 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionTable.java +++ b/src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressionTable.java @@ -11,18 +11,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.util.Arrays; -import static io.airlift.compress.v2.zstd.Huffman.MAX_FSE_TABLE_LOG; -import static io.airlift.compress.v2.zstd.Huffman.MAX_SYMBOL; -import static io.airlift.compress.v2.zstd.Huffman.MAX_SYMBOL_COUNT; -import static io.airlift.compress.v2.zstd.Huffman.MAX_TABLE_LOG; -import static io.airlift.compress.v2.zstd.Huffman.MIN_TABLE_LOG; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.v2.zstd.Util.checkArgument; -import static io.airlift.compress.v2.zstd.Util.minTableLog; +import static io.airlift.compress.v3.zstd.Huffman.MAX_FSE_TABLE_LOG; +import static io.airlift.compress.v3.zstd.Huffman.MAX_SYMBOL; +import static io.airlift.compress.v3.zstd.Huffman.MAX_SYMBOL_COUNT; +import static io.airlift.compress.v3.zstd.Huffman.MAX_TABLE_LOG; +import static io.airlift.compress.v3.zstd.Huffman.MIN_TABLE_LOG; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Util.checkArgument; +import static io.airlift.compress.v3.zstd.Util.minTableLog; final class HuffmanCompressionTable { diff --git a/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionTableWorkspace.java b/src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressionTableWorkspace.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionTableWorkspace.java rename to src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressionTableWorkspace.java index 9ca6c2fe..9b70264f 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionTableWorkspace.java +++ b/src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressionTableWorkspace.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.util.Arrays; diff --git a/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressor.java b/src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressor.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressor.java index 519e1643..ae25549e 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/HuffmanCompressor.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; final class HuffmanCompressor { diff --git a/src/main/java/io/airlift/compress/v2/zstd/HuffmanTableWriterWorkspace.java b/src/main/java/io/airlift/compress/v3/zstd/HuffmanTableWriterWorkspace.java similarity index 81% rename from src/main/java/io/airlift/compress/v2/zstd/HuffmanTableWriterWorkspace.java rename to src/main/java/io/airlift/compress/v3/zstd/HuffmanTableWriterWorkspace.java index fee6dc71..7bcfa2fb 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/HuffmanTableWriterWorkspace.java +++ b/src/main/java/io/airlift/compress/v3/zstd/HuffmanTableWriterWorkspace.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import static io.airlift.compress.v2.zstd.Huffman.MAX_FSE_TABLE_LOG; -import static io.airlift.compress.v2.zstd.Huffman.MAX_SYMBOL; -import static io.airlift.compress.v2.zstd.Huffman.MAX_TABLE_LOG; +import static io.airlift.compress.v3.zstd.Huffman.MAX_FSE_TABLE_LOG; +import static io.airlift.compress.v3.zstd.Huffman.MAX_SYMBOL; +import static io.airlift.compress.v3.zstd.Huffman.MAX_TABLE_LOG; class HuffmanTableWriterWorkspace { diff --git a/src/main/java/io/airlift/compress/v2/zstd/NodeTable.java b/src/main/java/io/airlift/compress/v3/zstd/NodeTable.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/zstd/NodeTable.java rename to src/main/java/io/airlift/compress/v3/zstd/NodeTable.java index 0c14de1f..9e225eef 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/NodeTable.java +++ b/src/main/java/io/airlift/compress/v3/zstd/NodeTable.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.util.Arrays; diff --git a/src/main/java/io/airlift/compress/v2/zstd/RepeatedOffsets.java b/src/main/java/io/airlift/compress/v3/zstd/RepeatedOffsets.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/zstd/RepeatedOffsets.java rename to src/main/java/io/airlift/compress/v3/zstd/RepeatedOffsets.java index 1c4efee9..1fc6a821 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/RepeatedOffsets.java +++ b/src/main/java/io/airlift/compress/v3/zstd/RepeatedOffsets.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; class RepeatedOffsets { diff --git a/src/main/java/io/airlift/compress/v2/zstd/SequenceEncoder.java b/src/main/java/io/airlift/compress/v3/zstd/SequenceEncoder.java similarity index 93% rename from src/main/java/io/airlift/compress/v2/zstd/SequenceEncoder.java rename to src/main/java/io/airlift/compress/v3/zstd/SequenceEncoder.java index 97907ae6..ba9f64f3 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/SequenceEncoder.java +++ b/src/main/java/io/airlift/compress/v3/zstd/SequenceEncoder.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; - -import static io.airlift.compress.v2.zstd.Constants.DEFAULT_MAX_OFFSET_CODE_SYMBOL; -import static io.airlift.compress.v2.zstd.Constants.LITERALS_LENGTH_BITS; -import static io.airlift.compress.v2.zstd.Constants.LITERAL_LENGTH_TABLE_LOG; -import static io.airlift.compress.v2.zstd.Constants.LONG_NUMBER_OF_SEQUENCES; -import static io.airlift.compress.v2.zstd.Constants.MATCH_LENGTH_BITS; -import static io.airlift.compress.v2.zstd.Constants.MATCH_LENGTH_TABLE_LOG; -import static io.airlift.compress.v2.zstd.Constants.MAX_LITERALS_LENGTH_SYMBOL; -import static io.airlift.compress.v2.zstd.Constants.MAX_MATCH_LENGTH_SYMBOL; -import static io.airlift.compress.v2.zstd.Constants.MAX_OFFSET_CODE_SYMBOL; -import static io.airlift.compress.v2.zstd.Constants.OFFSET_TABLE_LOG; -import static io.airlift.compress.v2.zstd.Constants.SEQUENCE_ENCODING_BASIC; -import static io.airlift.compress.v2.zstd.Constants.SEQUENCE_ENCODING_COMPRESSED; -import static io.airlift.compress.v2.zstd.Constants.SEQUENCE_ENCODING_RLE; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.zstd.FiniteStateEntropy.optimalTableLog; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.v2.zstd.Util.checkArgument; +package io.airlift.compress.v3.zstd; + +import static io.airlift.compress.v3.zstd.Constants.DEFAULT_MAX_OFFSET_CODE_SYMBOL; +import static io.airlift.compress.v3.zstd.Constants.LITERALS_LENGTH_BITS; +import static io.airlift.compress.v3.zstd.Constants.LITERAL_LENGTH_TABLE_LOG; +import static io.airlift.compress.v3.zstd.Constants.LONG_NUMBER_OF_SEQUENCES; +import static io.airlift.compress.v3.zstd.Constants.MATCH_LENGTH_BITS; +import static io.airlift.compress.v3.zstd.Constants.MATCH_LENGTH_TABLE_LOG; +import static io.airlift.compress.v3.zstd.Constants.MAX_LITERALS_LENGTH_SYMBOL; +import static io.airlift.compress.v3.zstd.Constants.MAX_MATCH_LENGTH_SYMBOL; +import static io.airlift.compress.v3.zstd.Constants.MAX_OFFSET_CODE_SYMBOL; +import static io.airlift.compress.v3.zstd.Constants.OFFSET_TABLE_LOG; +import static io.airlift.compress.v3.zstd.Constants.SEQUENCE_ENCODING_BASIC; +import static io.airlift.compress.v3.zstd.Constants.SEQUENCE_ENCODING_COMPRESSED; +import static io.airlift.compress.v3.zstd.Constants.SEQUENCE_ENCODING_RLE; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.zstd.FiniteStateEntropy.optimalTableLog; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Util.checkArgument; final class SequenceEncoder { diff --git a/src/main/java/io/airlift/compress/v2/zstd/SequenceEncodingContext.java b/src/main/java/io/airlift/compress/v3/zstd/SequenceEncodingContext.java similarity index 85% rename from src/main/java/io/airlift/compress/v2/zstd/SequenceEncodingContext.java rename to src/main/java/io/airlift/compress/v3/zstd/SequenceEncodingContext.java index 765bf028..507d477a 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/SequenceEncodingContext.java +++ b/src/main/java/io/airlift/compress/v3/zstd/SequenceEncodingContext.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import static io.airlift.compress.v2.zstd.Constants.MAX_LITERALS_LENGTH_SYMBOL; -import static io.airlift.compress.v2.zstd.Constants.MAX_MATCH_LENGTH_SYMBOL; -import static io.airlift.compress.v2.zstd.Constants.MAX_OFFSET_CODE_SYMBOL; +import static io.airlift.compress.v3.zstd.Constants.MAX_LITERALS_LENGTH_SYMBOL; +import static io.airlift.compress.v3.zstd.Constants.MAX_MATCH_LENGTH_SYMBOL; +import static io.airlift.compress.v3.zstd.Constants.MAX_OFFSET_CODE_SYMBOL; class SequenceEncodingContext { diff --git a/src/main/java/io/airlift/compress/v2/zstd/SequenceStore.java b/src/main/java/io/airlift/compress/v3/zstd/SequenceStore.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/zstd/SequenceStore.java rename to src/main/java/io/airlift/compress/v3/zstd/SequenceStore.java index aeabdcf4..6b6f4e0a 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/SequenceStore.java +++ b/src/main/java/io/airlift/compress/v3/zstd/SequenceStore.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; final class SequenceStore diff --git a/src/main/java/io/airlift/compress/v2/zstd/UnsafeUtil.java b/src/main/java/io/airlift/compress/v3/zstd/UnsafeUtil.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/zstd/UnsafeUtil.java rename to src/main/java/io/airlift/compress/v3/zstd/UnsafeUtil.java index cd774bc3..bf3a3975 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/UnsafeUtil.java +++ b/src/main/java/io/airlift/compress/v3/zstd/UnsafeUtil.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.IncompatibleJvmException; +import io.airlift.compress.v3.IncompatibleJvmException; import sun.misc.Unsafe; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/zstd/Util.java b/src/main/java/io/airlift/compress/v3/zstd/Util.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/zstd/Util.java rename to src/main/java/io/airlift/compress/v3/zstd/Util.java index 9ac4dfd4..3059924f 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/Util.java +++ b/src/main/java/io/airlift/compress/v3/zstd/Util.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; final class Util { diff --git a/src/main/java/io/airlift/compress/v2/zstd/XxHash64.java b/src/main/java/io/airlift/compress/v3/zstd/XxHash64.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/zstd/XxHash64.java rename to src/main/java/io/airlift/compress/v3/zstd/XxHash64.java index bd9349a7..136442d1 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/XxHash64.java +++ b/src/main/java/io/airlift/compress/v3/zstd/XxHash64.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.io.IOException; import java.io.InputStream; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.v2.zstd.Util.checkPositionIndexes; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Util.checkPositionIndexes; import static java.lang.Long.rotateLeft; import static java.lang.Math.min; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdCodec.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdCodec.java similarity index 89% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdCodec.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdCodec.java index b57cd6cf..cd9633b6 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdCodec.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdCodec.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.hadoop.CodecAdapter; +import io.airlift.compress.v3.hadoop.CodecAdapter; public class ZstdCodec extends CodecAdapter diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdCompressor.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdCompressor.java similarity index 92% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdCompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdCompressor.java index 74e8deac..afd53160 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdCompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdCompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v3.Compressor; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdDecompressor.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdDecompressor.java similarity index 91% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdDecompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdDecompressor.java index e54420f3..6ceda931 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdDecompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v3.Decompressor; public interface ZstdDecompressor extends Decompressor diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdFrameCompressor.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdFrameCompressor.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdFrameCompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdFrameCompressor.java index 9fd80882..995bd435 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdFrameCompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdFrameCompressor.java @@ -11,25 +11,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; - -import static io.airlift.compress.v2.zstd.Constants.COMPRESSED_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.COMPRESSED_LITERALS_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.MAGIC_NUMBER; -import static io.airlift.compress.v2.zstd.Constants.MIN_BLOCK_SIZE; -import static io.airlift.compress.v2.zstd.Constants.MIN_WINDOW_LOG; -import static io.airlift.compress.v2.zstd.Constants.RAW_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.RAW_LITERALS_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.RLE_LITERALS_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_BLOCK_HEADER; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.zstd.Constants.TREELESS_LITERALS_BLOCK; -import static io.airlift.compress.v2.zstd.Huffman.MAX_SYMBOL; -import static io.airlift.compress.v2.zstd.Huffman.MAX_SYMBOL_COUNT; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.v2.zstd.Util.checkArgument; -import static io.airlift.compress.v2.zstd.Util.put24BitLittleEndian; +package io.airlift.compress.v3.zstd; + +import static io.airlift.compress.v3.zstd.Constants.COMPRESSED_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.COMPRESSED_LITERALS_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.MAGIC_NUMBER; +import static io.airlift.compress.v3.zstd.Constants.MIN_BLOCK_SIZE; +import static io.airlift.compress.v3.zstd.Constants.MIN_WINDOW_LOG; +import static io.airlift.compress.v3.zstd.Constants.RAW_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.RAW_LITERALS_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.RLE_LITERALS_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_BLOCK_HEADER; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_INT; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.zstd.Constants.TREELESS_LITERALS_BLOCK; +import static io.airlift.compress.v3.zstd.Huffman.MAX_SYMBOL; +import static io.airlift.compress.v3.zstd.Huffman.MAX_SYMBOL_COUNT; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Util.checkArgument; +import static io.airlift.compress.v3.zstd.Util.put24BitLittleEndian; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; final class ZstdFrameCompressor diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdFrameDecompressor.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdFrameDecompressor.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdFrameDecompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdFrameDecompressor.java index 4c8c3b84..ec806df9 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdFrameDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdFrameDecompressor.java @@ -11,48 +11,48 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; import java.util.Arrays; -import static io.airlift.compress.v2.zstd.BitInputStream.peekBits; -import static io.airlift.compress.v2.zstd.Constants.COMPRESSED_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.COMPRESSED_LITERALS_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.DEFAULT_MAX_OFFSET_CODE_SYMBOL; -import static io.airlift.compress.v2.zstd.Constants.LITERALS_LENGTH_BITS; -import static io.airlift.compress.v2.zstd.Constants.LITERAL_LENGTH_TABLE_LOG; -import static io.airlift.compress.v2.zstd.Constants.LONG_NUMBER_OF_SEQUENCES; -import static io.airlift.compress.v2.zstd.Constants.MAGIC_NUMBER; -import static io.airlift.compress.v2.zstd.Constants.MATCH_LENGTH_BITS; -import static io.airlift.compress.v2.zstd.Constants.MATCH_LENGTH_TABLE_LOG; -import static io.airlift.compress.v2.zstd.Constants.MAX_BLOCK_SIZE; -import static io.airlift.compress.v2.zstd.Constants.MAX_LITERALS_LENGTH_SYMBOL; -import static io.airlift.compress.v2.zstd.Constants.MAX_MATCH_LENGTH_SYMBOL; -import static io.airlift.compress.v2.zstd.Constants.MIN_BLOCK_SIZE; -import static io.airlift.compress.v2.zstd.Constants.MIN_SEQUENCES_SIZE; -import static io.airlift.compress.v2.zstd.Constants.MIN_WINDOW_LOG; -import static io.airlift.compress.v2.zstd.Constants.OFFSET_TABLE_LOG; -import static io.airlift.compress.v2.zstd.Constants.RAW_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.RAW_LITERALS_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.RLE_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.RLE_LITERALS_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.SEQUENCE_ENCODING_BASIC; -import static io.airlift.compress.v2.zstd.Constants.SEQUENCE_ENCODING_COMPRESSED; -import static io.airlift.compress.v2.zstd.Constants.SEQUENCE_ENCODING_REPEAT; -import static io.airlift.compress.v2.zstd.Constants.SEQUENCE_ENCODING_RLE; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_BLOCK_HEADER; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_BYTE; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.v2.zstd.Constants.TREELESS_LITERALS_BLOCK; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.v2.zstd.Util.fail; -import static io.airlift.compress.v2.zstd.Util.get24BitLittleEndian; -import static io.airlift.compress.v2.zstd.Util.mask; -import static io.airlift.compress.v2.zstd.Util.verify; +import static io.airlift.compress.v3.zstd.BitInputStream.peekBits; +import static io.airlift.compress.v3.zstd.Constants.COMPRESSED_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.COMPRESSED_LITERALS_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.DEFAULT_MAX_OFFSET_CODE_SYMBOL; +import static io.airlift.compress.v3.zstd.Constants.LITERALS_LENGTH_BITS; +import static io.airlift.compress.v3.zstd.Constants.LITERAL_LENGTH_TABLE_LOG; +import static io.airlift.compress.v3.zstd.Constants.LONG_NUMBER_OF_SEQUENCES; +import static io.airlift.compress.v3.zstd.Constants.MAGIC_NUMBER; +import static io.airlift.compress.v3.zstd.Constants.MATCH_LENGTH_BITS; +import static io.airlift.compress.v3.zstd.Constants.MATCH_LENGTH_TABLE_LOG; +import static io.airlift.compress.v3.zstd.Constants.MAX_BLOCK_SIZE; +import static io.airlift.compress.v3.zstd.Constants.MAX_LITERALS_LENGTH_SYMBOL; +import static io.airlift.compress.v3.zstd.Constants.MAX_MATCH_LENGTH_SYMBOL; +import static io.airlift.compress.v3.zstd.Constants.MIN_BLOCK_SIZE; +import static io.airlift.compress.v3.zstd.Constants.MIN_SEQUENCES_SIZE; +import static io.airlift.compress.v3.zstd.Constants.MIN_WINDOW_LOG; +import static io.airlift.compress.v3.zstd.Constants.OFFSET_TABLE_LOG; +import static io.airlift.compress.v3.zstd.Constants.RAW_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.RAW_LITERALS_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.RLE_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.RLE_LITERALS_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.SEQUENCE_ENCODING_BASIC; +import static io.airlift.compress.v3.zstd.Constants.SEQUENCE_ENCODING_COMPRESSED; +import static io.airlift.compress.v3.zstd.Constants.SEQUENCE_ENCODING_REPEAT; +import static io.airlift.compress.v3.zstd.Constants.SEQUENCE_ENCODING_RLE; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_BLOCK_HEADER; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_BYTE; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_INT; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_SHORT; +import static io.airlift.compress.v3.zstd.Constants.TREELESS_LITERALS_BLOCK; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Util.fail; +import static io.airlift.compress.v3.zstd.Util.get24BitLittleEndian; +import static io.airlift.compress.v3.zstd.Util.mask; +import static io.airlift.compress.v3.zstd.Util.verify; import static java.lang.String.format; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopInputStream.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdHadoopInputStream.java similarity index 94% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopInputStream.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdHadoopInputStream.java index 4332a93e..d8f91ddd 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdHadoopInputStream.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopOutputStream.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdHadoopOutputStream.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdHadoopOutputStream.java index e49a0f41..724d0805 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdHadoopOutputStream.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopStreams.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdHadoopStreams.java similarity index 87% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopStreams.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdHadoopStreams.java index 6516ae1e..dc302ac4 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdHadoopStreams.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.hadoop.HadoopInputStream; -import io.airlift.compress.v2.hadoop.HadoopOutputStream; -import io.airlift.compress.v2.hadoop.HadoopStreams; +import io.airlift.compress.v3.hadoop.HadoopInputStream; +import io.airlift.compress.v3.hadoop.HadoopOutputStream; +import io.airlift.compress.v3.hadoop.HadoopStreams; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdIncrementalFrameDecompressor.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdIncrementalFrameDecompressor.java similarity index 93% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdIncrementalFrameDecompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdIncrementalFrameDecompressor.java index 41cd8bfd..753bf8f6 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdIncrementalFrameDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdIncrementalFrameDecompressor.java @@ -11,28 +11,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; import java.util.Arrays; -import static io.airlift.compress.v2.zstd.Constants.COMPRESSED_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.MAX_BLOCK_SIZE; -import static io.airlift.compress.v2.zstd.Constants.RAW_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.RLE_BLOCK; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_BLOCK_HEADER; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.v2.zstd.Util.checkArgument; -import static io.airlift.compress.v2.zstd.Util.checkState; -import static io.airlift.compress.v2.zstd.Util.fail; -import static io.airlift.compress.v2.zstd.Util.verify; -import static io.airlift.compress.v2.zstd.ZstdFrameDecompressor.MAX_WINDOW_SIZE; -import static io.airlift.compress.v2.zstd.ZstdFrameDecompressor.decodeRawBlock; -import static io.airlift.compress.v2.zstd.ZstdFrameDecompressor.decodeRleBlock; -import static io.airlift.compress.v2.zstd.ZstdFrameDecompressor.readFrameHeader; -import static io.airlift.compress.v2.zstd.ZstdFrameDecompressor.verifyMagic; +import static io.airlift.compress.v3.zstd.Constants.COMPRESSED_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.MAX_BLOCK_SIZE; +import static io.airlift.compress.v3.zstd.Constants.RAW_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.RLE_BLOCK; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_BLOCK_HEADER; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_INT; +import static io.airlift.compress.v3.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v3.zstd.Util.checkArgument; +import static io.airlift.compress.v3.zstd.Util.checkState; +import static io.airlift.compress.v3.zstd.Util.fail; +import static io.airlift.compress.v3.zstd.Util.verify; +import static io.airlift.compress.v3.zstd.ZstdFrameDecompressor.MAX_WINDOW_SIZE; +import static io.airlift.compress.v3.zstd.ZstdFrameDecompressor.decodeRawBlock; +import static io.airlift.compress.v3.zstd.ZstdFrameDecompressor.decodeRleBlock; +import static io.airlift.compress.v3.zstd.ZstdFrameDecompressor.readFrameHeader; +import static io.airlift.compress.v3.zstd.ZstdFrameDecompressor.verifyMagic; import static java.lang.Math.max; import static java.lang.Math.min; import static java.lang.Math.toIntExact; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdInputStream.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdInputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdInputStream.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdInputStream.java index edfd834c..799168da 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdInputStream.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdInputStream.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; -import static io.airlift.compress.v2.zstd.Util.checkPositionIndexes; -import static io.airlift.compress.v2.zstd.Util.checkState; +import static io.airlift.compress.v3.zstd.Util.checkPositionIndexes; +import static io.airlift.compress.v3.zstd.Util.checkState; import static java.lang.Math.max; import static java.util.Objects.requireNonNull; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdJavaCompressor.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdJavaCompressor.java similarity index 93% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdJavaCompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdJavaCompressor.java index 6b5ae3a3..a26ba47d 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdJavaCompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdJavaCompressor.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.v2.zstd.Constants.MAX_BLOCK_SIZE; -import static io.airlift.compress.v2.zstd.UnsafeUtil.getAddress; -import static io.airlift.compress.v2.zstd.UnsafeUtil.getBase; +import static io.airlift.compress.v3.zstd.Constants.MAX_BLOCK_SIZE; +import static io.airlift.compress.v3.zstd.UnsafeUtil.getAddress; +import static io.airlift.compress.v3.zstd.UnsafeUtil.getBase; import static java.lang.Math.addExact; import static java.lang.String.format; import static java.lang.ref.Reference.reachabilityFence; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdJavaDecompressor.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdJavaDecompressor.java similarity index 93% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdJavaDecompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdJavaDecompressor.java index 992e93a5..8655a19f 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdJavaDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdJavaDecompressor.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.v2.zstd.UnsafeUtil.getAddress; -import static io.airlift.compress.v2.zstd.UnsafeUtil.getBase; +import static io.airlift.compress.v3.zstd.UnsafeUtil.getAddress; +import static io.airlift.compress.v3.zstd.UnsafeUtil.getBase; import static java.lang.Math.addExact; import static java.lang.String.format; import static java.lang.ref.Reference.reachabilityFence; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdNative.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdNative.java similarity index 97% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdNative.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdNative.java index 58ce52d4..37631a88 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdNative.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdNative.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.internal.NativeLoader; -import io.airlift.compress.v2.internal.NativeSignature; +import io.airlift.compress.v3.internal.NativeLoader; +import io.airlift.compress.v3.internal.NativeSignature; import java.lang.foreign.MemorySegment; import java.lang.invoke.MethodHandle; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdNativeCompressor.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdNativeCompressor.java similarity index 95% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdNativeCompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdNativeCompressor.java index 5bdf5e12..f9b26cfd 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdNativeCompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdNativeCompressor.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.v2.zstd.ZstdNative.DEFAULT_COMPRESSION_LEVEL; +import static io.airlift.compress.v3.zstd.ZstdNative.DEFAULT_COMPRESSION_LEVEL; import static java.lang.Math.toIntExact; public class ZstdNativeCompressor diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdNativeDecompressor.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdNativeDecompressor.java similarity index 98% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdNativeDecompressor.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdNativeDecompressor.java index 7ebd14b0..f816da75 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdNativeDecompressor.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdNativeDecompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/v2/zstd/ZstdOutputStream.java b/src/main/java/io/airlift/compress/v3/zstd/ZstdOutputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/v2/zstd/ZstdOutputStream.java rename to src/main/java/io/airlift/compress/v3/zstd/ZstdOutputStream.java index a6e22332..82668284 100644 --- a/src/main/java/io/airlift/compress/v2/zstd/ZstdOutputStream.java +++ b/src/main/java/io/airlift/compress/v3/zstd/ZstdOutputStream.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.io.IOException; import java.io.OutputStream; import java.util.Arrays; -import static io.airlift.compress.v2.zstd.CompressionParameters.DEFAULT_COMPRESSION_LEVEL; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_BLOCK_HEADER; -import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.v2.zstd.Util.checkState; +import static io.airlift.compress.v3.zstd.CompressionParameters.DEFAULT_COMPRESSION_LEVEL; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_BLOCK_HEADER; +import static io.airlift.compress.v3.zstd.Constants.SIZE_OF_LONG; +import static io.airlift.compress.v3.zstd.Util.checkState; import static java.lang.Math.max; import static java.lang.Math.min; import static java.util.Objects.requireNonNull; diff --git a/src/test/java/io/airlift/compress/v2/AbstractTestCompression.java b/src/test/java/io/airlift/compress/v3/AbstractTestCompression.java similarity index 99% rename from src/test/java/io/airlift/compress/v2/AbstractTestCompression.java rename to src/test/java/io/airlift/compress/v3/AbstractTestCompression.java index 90fa559d..57ff0ac2 100644 --- a/src/test/java/io/airlift/compress/v2/AbstractTestCompression.java +++ b/src/test/java/io/airlift/compress/v3/AbstractTestCompression.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2; +package io.airlift.compress.v3; import com.google.common.primitives.Bytes; -import io.airlift.compress.v2.benchmark.DataSet; +import io.airlift.compress.v3.benchmark.DataSet; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/airlift/compress/v2/HadoopCodecCompressor.java b/src/test/java/io/airlift/compress/v3/HadoopCodecCompressor.java similarity index 96% rename from src/test/java/io/airlift/compress/v2/HadoopCodecCompressor.java rename to src/test/java/io/airlift/compress/v3/HadoopCodecCompressor.java index ed4b5c42..8eaf119c 100644 --- a/src/test/java/io/airlift/compress/v2/HadoopCodecCompressor.java +++ b/src/test/java/io/airlift/compress/v3/HadoopCodecCompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2; +package io.airlift.compress.v3; -import io.airlift.compress.v2.snappy.ByteArrayOutputStream; +import io.airlift.compress.v3.snappy.ByteArrayOutputStream; import org.apache.hadoop.io.compress.CompressionCodec; import java.io.IOException; diff --git a/src/test/java/io/airlift/compress/v2/HadoopCodecDecompressor.java b/src/test/java/io/airlift/compress/v3/HadoopCodecDecompressor.java similarity index 98% rename from src/test/java/io/airlift/compress/v2/HadoopCodecDecompressor.java rename to src/test/java/io/airlift/compress/v3/HadoopCodecDecompressor.java index 58339c26..3014c3e7 100644 --- a/src/test/java/io/airlift/compress/v2/HadoopCodecDecompressor.java +++ b/src/test/java/io/airlift/compress/v3/HadoopCodecDecompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2; +package io.airlift.compress.v3; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/HadoopCodecDecompressorByteAtATime.java b/src/test/java/io/airlift/compress/v3/HadoopCodecDecompressorByteAtATime.java similarity index 98% rename from src/test/java/io/airlift/compress/v2/HadoopCodecDecompressorByteAtATime.java rename to src/test/java/io/airlift/compress/v3/HadoopCodecDecompressorByteAtATime.java index c8a5c5d3..10074dd8 100644 --- a/src/test/java/io/airlift/compress/v2/HadoopCodecDecompressorByteAtATime.java +++ b/src/test/java/io/airlift/compress/v3/HadoopCodecDecompressorByteAtATime.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2; +package io.airlift.compress.v3; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/HadoopNative.java b/src/test/java/io/airlift/compress/v3/HadoopNative.java similarity index 98% rename from src/test/java/io/airlift/compress/v2/HadoopNative.java rename to src/test/java/io/airlift/compress/v3/HadoopNative.java index 14bd122d..65e87c4b 100644 --- a/src/test/java/io/airlift/compress/v2/HadoopNative.java +++ b/src/test/java/io/airlift/compress/v3/HadoopNative.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2; +package io.airlift.compress.v3; import org.apache.hadoop.util.NativeCodeLoader; diff --git a/src/test/java/io/airlift/compress/v2/TestingData.java b/src/test/java/io/airlift/compress/v3/TestingData.java similarity index 94% rename from src/test/java/io/airlift/compress/v2/TestingData.java rename to src/test/java/io/airlift/compress/v3/TestingData.java index 65d0b5fe..1e9c62d2 100644 --- a/src/test/java/io/airlift/compress/v2/TestingData.java +++ b/src/test/java/io/airlift/compress/v3/TestingData.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2; +package io.airlift.compress.v3; import com.google.common.collect.ImmutableList; -import io.airlift.compress.v2.benchmark.DataSet; +import io.airlift.compress.v3.benchmark.DataSet; import org.openjdk.jmh.annotations.Param; import java.io.IOException; diff --git a/src/test/java/io/airlift/compress/v2/Util.java b/src/test/java/io/airlift/compress/v3/Util.java similarity index 97% rename from src/test/java/io/airlift/compress/v2/Util.java rename to src/test/java/io/airlift/compress/v3/Util.java index 5830b376..9cdc6fb0 100644 --- a/src/test/java/io/airlift/compress/v2/Util.java +++ b/src/test/java/io/airlift/compress/v3/Util.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2; +package io.airlift.compress.v3; import static java.lang.String.format; diff --git a/src/test/java/io/airlift/compress/v2/benchmark/Algorithm.java b/src/test/java/io/airlift/compress/v3/benchmark/Algorithm.java similarity index 65% rename from src/test/java/io/airlift/compress/v2/benchmark/Algorithm.java rename to src/test/java/io/airlift/compress/v3/benchmark/Algorithm.java index 50ae6308..33f0454d 100644 --- a/src/test/java/io/airlift/compress/v2/benchmark/Algorithm.java +++ b/src/test/java/io/airlift/compress/v3/benchmark/Algorithm.java @@ -11,39 +11,39 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.benchmark; +package io.airlift.compress.v3.benchmark; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.lz4.Lz4Codec; -import io.airlift.compress.v2.lz4.Lz4JavaCompressor; -import io.airlift.compress.v2.lz4.Lz4JavaDecompressor; -import io.airlift.compress.v2.lz4.Lz4NativeCompressor; -import io.airlift.compress.v2.lz4.Lz4NativeDecompressor; -import io.airlift.compress.v2.lzo.LzoCodec; -import io.airlift.compress.v2.lzo.LzoCompressor; -import io.airlift.compress.v2.lzo.LzoDecompressor; -import io.airlift.compress.v2.snappy.SnappyCodec; -import io.airlift.compress.v2.snappy.SnappyJavaCompressor; -import io.airlift.compress.v2.snappy.SnappyJavaDecompressor; -import io.airlift.compress.v2.snappy.SnappyNativeCompressor; -import io.airlift.compress.v2.snappy.SnappyNativeDecompressor; -import io.airlift.compress.v2.thirdparty.HadoopLzoCompressor; -import io.airlift.compress.v2.thirdparty.HadoopLzoDecompressor; -import io.airlift.compress.v2.thirdparty.JPountzLz4Compressor; -import io.airlift.compress.v2.thirdparty.JPountzLz4Decompressor; -import io.airlift.compress.v2.thirdparty.JdkDeflateCompressor; -import io.airlift.compress.v2.thirdparty.JdkInflateDecompressor; -import io.airlift.compress.v2.thirdparty.XerialSnappyCompressor; -import io.airlift.compress.v2.thirdparty.XerialSnappyDecompressor; -import io.airlift.compress.v2.thirdparty.ZstdJniCompressor; -import io.airlift.compress.v2.thirdparty.ZstdJniDecompressor; -import io.airlift.compress.v2.zstd.ZstdJavaCompressor; -import io.airlift.compress.v2.zstd.ZstdJavaDecompressor; -import io.airlift.compress.v2.zstd.ZstdNativeCompressor; -import io.airlift.compress.v2.zstd.ZstdNativeDecompressor; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.lz4.Lz4Codec; +import io.airlift.compress.v3.lz4.Lz4JavaCompressor; +import io.airlift.compress.v3.lz4.Lz4JavaDecompressor; +import io.airlift.compress.v3.lz4.Lz4NativeCompressor; +import io.airlift.compress.v3.lz4.Lz4NativeDecompressor; +import io.airlift.compress.v3.lzo.LzoCodec; +import io.airlift.compress.v3.lzo.LzoCompressor; +import io.airlift.compress.v3.lzo.LzoDecompressor; +import io.airlift.compress.v3.snappy.SnappyCodec; +import io.airlift.compress.v3.snappy.SnappyJavaCompressor; +import io.airlift.compress.v3.snappy.SnappyJavaDecompressor; +import io.airlift.compress.v3.snappy.SnappyNativeCompressor; +import io.airlift.compress.v3.snappy.SnappyNativeDecompressor; +import io.airlift.compress.v3.thirdparty.HadoopLzoCompressor; +import io.airlift.compress.v3.thirdparty.HadoopLzoDecompressor; +import io.airlift.compress.v3.thirdparty.JPountzLz4Compressor; +import io.airlift.compress.v3.thirdparty.JPountzLz4Decompressor; +import io.airlift.compress.v3.thirdparty.JdkDeflateCompressor; +import io.airlift.compress.v3.thirdparty.JdkInflateDecompressor; +import io.airlift.compress.v3.thirdparty.XerialSnappyCompressor; +import io.airlift.compress.v3.thirdparty.XerialSnappyDecompressor; +import io.airlift.compress.v3.thirdparty.ZstdJniCompressor; +import io.airlift.compress.v3.thirdparty.ZstdJniDecompressor; +import io.airlift.compress.v3.zstd.ZstdJavaCompressor; +import io.airlift.compress.v3.zstd.ZstdJavaDecompressor; +import io.airlift.compress.v3.zstd.ZstdNativeCompressor; +import io.airlift.compress.v3.zstd.ZstdNativeDecompressor; import net.jpountz.lz4.LZ4Factory; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; diff --git a/src/test/java/io/airlift/compress/v2/benchmark/BytesCounter.java b/src/test/java/io/airlift/compress/v3/benchmark/BytesCounter.java similarity index 94% rename from src/test/java/io/airlift/compress/v2/benchmark/BytesCounter.java rename to src/test/java/io/airlift/compress/v3/benchmark/BytesCounter.java index adff894f..835258da 100644 --- a/src/test/java/io/airlift/compress/v2/benchmark/BytesCounter.java +++ b/src/test/java/io/airlift/compress/v3/benchmark/BytesCounter.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.benchmark; +package io.airlift.compress.v3.benchmark; import org.openjdk.jmh.annotations.AuxCounters; import org.openjdk.jmh.annotations.Scope; diff --git a/src/test/java/io/airlift/compress/v2/benchmark/CompressionBenchmark.java b/src/test/java/io/airlift/compress/v3/benchmark/CompressionBenchmark.java similarity index 97% rename from src/test/java/io/airlift/compress/v2/benchmark/CompressionBenchmark.java rename to src/test/java/io/airlift/compress/v3/benchmark/CompressionBenchmark.java index 1bac959d..700cb128 100644 --- a/src/test/java/io/airlift/compress/v2/benchmark/CompressionBenchmark.java +++ b/src/test/java/io/airlift/compress/v3/benchmark/CompressionBenchmark.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.benchmark; +package io.airlift.compress.v3.benchmark; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.Util; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.Util; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; diff --git a/src/test/java/io/airlift/compress/v2/benchmark/DataSet.java b/src/test/java/io/airlift/compress/v3/benchmark/DataSet.java similarity index 98% rename from src/test/java/io/airlift/compress/v2/benchmark/DataSet.java rename to src/test/java/io/airlift/compress/v3/benchmark/DataSet.java index 2047fdf1..b69e6830 100644 --- a/src/test/java/io/airlift/compress/v2/benchmark/DataSet.java +++ b/src/test/java/io/airlift/compress/v3/benchmark/DataSet.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.benchmark; +package io.airlift.compress.v3.benchmark; import com.google.common.io.Files; import org.openjdk.jmh.annotations.Param; diff --git a/src/test/java/io/airlift/compress/v2/bzip2/TestBZip2Codec.java b/src/test/java/io/airlift/compress/v3/bzip2/TestBZip2Codec.java similarity index 84% rename from src/test/java/io/airlift/compress/v2/bzip2/TestBZip2Codec.java rename to src/test/java/io/airlift/compress/v3/bzip2/TestBZip2Codec.java index eaeb1640..1b6a7391 100644 --- a/src/test/java/io/airlift/compress/v2/bzip2/TestBZip2Codec.java +++ b/src/test/java/io/airlift/compress/v3/bzip2/TestBZip2Codec.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.bzip2; +package io.airlift.compress.v3.bzip2; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopNative; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopNative; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/bzip2/TestBZip2CodecByteAtATime.java b/src/test/java/io/airlift/compress/v3/bzip2/TestBZip2CodecByteAtATime.java similarity index 83% rename from src/test/java/io/airlift/compress/v2/bzip2/TestBZip2CodecByteAtATime.java rename to src/test/java/io/airlift/compress/v3/bzip2/TestBZip2CodecByteAtATime.java index 78a24415..c85b7cf4 100644 --- a/src/test/java/io/airlift/compress/v2/bzip2/TestBZip2CodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v3/bzip2/TestBZip2CodecByteAtATime.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.bzip2; +package io.airlift.compress.v3.bzip2; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.v2.HadoopNative; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopCodecDecompressorByteAtATime; +import io.airlift.compress.v3.HadoopNative; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/deflate/MockJdkDeflateCompressor.java b/src/test/java/io/airlift/compress/v3/deflate/MockJdkDeflateCompressor.java similarity index 93% rename from src/test/java/io/airlift/compress/v2/deflate/MockJdkDeflateCompressor.java rename to src/test/java/io/airlift/compress/v3/deflate/MockJdkDeflateCompressor.java index 2ce15c82..48835a4e 100644 --- a/src/test/java/io/airlift/compress/v2/deflate/MockJdkDeflateCompressor.java +++ b/src/test/java/io/airlift/compress/v3/deflate/MockJdkDeflateCompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.deflate; +package io.airlift.compress.v3.deflate; -import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v3.Compressor; import java.lang.foreign.MemorySegment; diff --git a/src/test/java/io/airlift/compress/v2/deflate/TestDeflate.java b/src/test/java/io/airlift/compress/v3/deflate/TestDeflate.java similarity index 91% rename from src/test/java/io/airlift/compress/v2/deflate/TestDeflate.java rename to src/test/java/io/airlift/compress/v3/deflate/TestDeflate.java index 83746ad6..47afb612 100644 --- a/src/test/java/io/airlift/compress/v2/deflate/TestDeflate.java +++ b/src/test/java/io/airlift/compress/v3/deflate/TestDeflate.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.deflate; - -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopNative; -import io.airlift.compress.v2.MalformedInputException; -import io.airlift.compress.v2.lzo.LzoDecompressor; +package io.airlift.compress.v3.deflate; + +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopNative; +import io.airlift.compress.v3.MalformedInputException; +import io.airlift.compress.v3.lzo.LzoDecompressor; import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/io/airlift/compress/v2/deflate/TestJdkDeflateCodec.java b/src/test/java/io/airlift/compress/v3/deflate/TestJdkDeflateCodec.java similarity index 85% rename from src/test/java/io/airlift/compress/v2/deflate/TestJdkDeflateCodec.java rename to src/test/java/io/airlift/compress/v3/deflate/TestJdkDeflateCodec.java index 70e4221b..34f3bde2 100644 --- a/src/test/java/io/airlift/compress/v2/deflate/TestJdkDeflateCodec.java +++ b/src/test/java/io/airlift/compress/v3/deflate/TestJdkDeflateCodec.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.deflate; +package io.airlift.compress.v3.deflate; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.io.compress.DefaultCodec; diff --git a/src/test/java/io/airlift/compress/v2/deflate/TestJdkDeflateCodecByteAtATime.java b/src/test/java/io/airlift/compress/v3/deflate/TestJdkDeflateCodecByteAtATime.java similarity index 83% rename from src/test/java/io/airlift/compress/v2/deflate/TestJdkDeflateCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v3/deflate/TestJdkDeflateCodecByteAtATime.java index c41e3343..23dd6346 100644 --- a/src/test/java/io/airlift/compress/v2/deflate/TestJdkDeflateCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v3/deflate/TestJdkDeflateCodecByteAtATime.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.deflate; +package io.airlift.compress.v3.deflate; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopCodecDecompressorByteAtATime; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopCodecDecompressorByteAtATime; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.io.compress.DefaultCodec; diff --git a/src/test/java/io/airlift/compress/v2/gzip/MockJdkGzipCompressor.java b/src/test/java/io/airlift/compress/v3/gzip/MockJdkGzipCompressor.java similarity index 94% rename from src/test/java/io/airlift/compress/v2/gzip/MockJdkGzipCompressor.java rename to src/test/java/io/airlift/compress/v3/gzip/MockJdkGzipCompressor.java index 4c1a73f7..459f181b 100644 --- a/src/test/java/io/airlift/compress/v2/gzip/MockJdkGzipCompressor.java +++ b/src/test/java/io/airlift/compress/v3/gzip/MockJdkGzipCompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.gzip; +package io.airlift.compress.v3.gzip; -import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v3.Compressor; import java.lang.foreign.MemorySegment; diff --git a/src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipCodec.java b/src/test/java/io/airlift/compress/v3/gzip/TestJdkGzipCodec.java similarity index 85% rename from src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipCodec.java rename to src/test/java/io/airlift/compress/v3/gzip/TestJdkGzipCodec.java index 973da19b..c5a80de0 100644 --- a/src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipCodec.java +++ b/src/test/java/io/airlift/compress/v3/gzip/TestJdkGzipCodec.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.gzip; +package io.airlift.compress.v3.gzip; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipCodecByteAtATime.java b/src/test/java/io/airlift/compress/v3/gzip/TestJdkGzipCodecByteAtATime.java similarity index 83% rename from src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v3/gzip/TestJdkGzipCodecByteAtATime.java index 11c4c955..e2310326 100644 --- a/src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v3/gzip/TestJdkGzipCodecByteAtATime.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.gzip; +package io.airlift.compress.v3.gzip; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopCodecDecompressorByteAtATime; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopCodecDecompressorByteAtATime; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipHadoopInputStream.java b/src/test/java/io/airlift/compress/v3/gzip/TestJdkGzipHadoopInputStream.java similarity index 97% rename from src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipHadoopInputStream.java rename to src/test/java/io/airlift/compress/v3/gzip/TestJdkGzipHadoopInputStream.java index bf7bc573..9e98b437 100644 --- a/src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipHadoopInputStream.java +++ b/src/test/java/io/airlift/compress/v3/gzip/TestJdkGzipHadoopInputStream.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.gzip; +package io.airlift.compress.v3.gzip; import com.google.common.io.ByteStreams; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/airlift/compress/v2/internal/TestNativeLoader.java b/src/test/java/io/airlift/compress/v3/internal/TestNativeLoader.java similarity index 98% rename from src/test/java/io/airlift/compress/v2/internal/TestNativeLoader.java rename to src/test/java/io/airlift/compress/v3/internal/TestNativeLoader.java index f1d291aa..b63ad7f5 100644 --- a/src/test/java/io/airlift/compress/v2/internal/TestNativeLoader.java +++ b/src/test/java/io/airlift/compress/v3/internal/TestNativeLoader.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.internal; +package io.airlift.compress.v3.internal; -import io.airlift.compress.v2.internal.NativeLoader.Symbols; +import io.airlift.compress.v3.internal.NativeLoader.Symbols; import org.junit.jupiter.api.Test; import java.lang.invoke.MethodHandle; diff --git a/src/test/java/io/airlift/compress/v2/lz4/AbstractTestLz4.java b/src/test/java/io/airlift/compress/v3/lz4/AbstractTestLz4.java similarity index 96% rename from src/test/java/io/airlift/compress/v2/lz4/AbstractTestLz4.java rename to src/test/java/io/airlift/compress/v3/lz4/AbstractTestLz4.java index c4e48938..bcadf1ea 100644 --- a/src/test/java/io/airlift/compress/v2/lz4/AbstractTestLz4.java +++ b/src/test/java/io/airlift/compress/v3/lz4/AbstractTestLz4.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.AbstractTestCompression; +import io.airlift.compress.v3.AbstractTestCompression; import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/io/airlift/compress/v2/lz4/BenchmarkCount.java b/src/test/java/io/airlift/compress/v3/lz4/BenchmarkCount.java similarity index 98% rename from src/test/java/io/airlift/compress/v2/lz4/BenchmarkCount.java rename to src/test/java/io/airlift/compress/v3/lz4/BenchmarkCount.java index c4127edd..b8cbc537 100644 --- a/src/test/java/io/airlift/compress/v2/lz4/BenchmarkCount.java +++ b/src/test/java/io/airlift/compress/v3/lz4/BenchmarkCount.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/src/test/java/io/airlift/compress/v2/lz4/TestLz4.java b/src/test/java/io/airlift/compress/v3/lz4/TestLz4.java similarity index 82% rename from src/test/java/io/airlift/compress/v2/lz4/TestLz4.java rename to src/test/java/io/airlift/compress/v3/lz4/TestLz4.java index 04ce12d9..33c7c88e 100644 --- a/src/test/java/io/airlift/compress/v2/lz4/TestLz4.java +++ b/src/test/java/io/airlift/compress/v3/lz4/TestLz4.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.thirdparty.JPountzLz4Compressor; -import io.airlift.compress.v2.thirdparty.JPountzLz4Decompressor; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.thirdparty.JPountzLz4Compressor; +import io.airlift.compress.v3.thirdparty.JPountzLz4Decompressor; import net.jpountz.lz4.LZ4Factory; class TestLz4 diff --git a/src/test/java/io/airlift/compress/v2/lz4/TestLz4Codec.java b/src/test/java/io/airlift/compress/v3/lz4/TestLz4Codec.java similarity index 83% rename from src/test/java/io/airlift/compress/v2/lz4/TestLz4Codec.java rename to src/test/java/io/airlift/compress/v3/lz4/TestLz4Codec.java index 89b21b71..1c9dc267 100644 --- a/src/test/java/io/airlift/compress/v2/lz4/TestLz4Codec.java +++ b/src/test/java/io/airlift/compress/v3/lz4/TestLz4Codec.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopNative; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopNative; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/lz4/TestLz4CodecByteAtATime.java b/src/test/java/io/airlift/compress/v3/lz4/TestLz4CodecByteAtATime.java similarity index 81% rename from src/test/java/io/airlift/compress/v2/lz4/TestLz4CodecByteAtATime.java rename to src/test/java/io/airlift/compress/v3/lz4/TestLz4CodecByteAtATime.java index 1a4f92ed..48376229 100644 --- a/src/test/java/io/airlift/compress/v2/lz4/TestLz4CodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v3/lz4/TestLz4CodecByteAtATime.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.v2.HadoopNative; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopCodecDecompressorByteAtATime; +import io.airlift.compress.v3.HadoopNative; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/lz4/TestLz4Native.java b/src/test/java/io/airlift/compress/v3/lz4/TestLz4Native.java similarity index 82% rename from src/test/java/io/airlift/compress/v2/lz4/TestLz4Native.java rename to src/test/java/io/airlift/compress/v3/lz4/TestLz4Native.java index fe2b9358..b26d6226 100644 --- a/src/test/java/io/airlift/compress/v2/lz4/TestLz4Native.java +++ b/src/test/java/io/airlift/compress/v3/lz4/TestLz4Native.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lz4; +package io.airlift.compress.v3.lz4; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.thirdparty.JPountzLz4Compressor; -import io.airlift.compress.v2.thirdparty.JPountzLz4Decompressor; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.thirdparty.JPountzLz4Compressor; +import io.airlift.compress.v3.thirdparty.JPountzLz4Decompressor; import net.jpountz.lz4.LZ4Factory; class TestLz4Native diff --git a/src/test/java/io/airlift/compress/v2/lzo/TestLzo.java b/src/test/java/io/airlift/compress/v3/lzo/TestLzo.java similarity index 90% rename from src/test/java/io/airlift/compress/v2/lzo/TestLzo.java rename to src/test/java/io/airlift/compress/v3/lzo/TestLzo.java index 67625790..d9b8b2cc 100644 --- a/src/test/java/io/airlift/compress/v2/lzo/TestLzo.java +++ b/src/test/java/io/airlift/compress/v3/lzo/TestLzo.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; - -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopNative; -import io.airlift.compress.v2.MalformedInputException; -import io.airlift.compress.v2.thirdparty.HadoopLzoCompressor; -import io.airlift.compress.v2.thirdparty.HadoopLzoDecompressor; +package io.airlift.compress.v3.lzo; + +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopNative; +import io.airlift.compress.v3.MalformedInputException; +import io.airlift.compress.v3.thirdparty.HadoopLzoCompressor; +import io.airlift.compress.v3.thirdparty.HadoopLzoDecompressor; import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/io/airlift/compress/v2/lzo/TestLzoCodec.java b/src/test/java/io/airlift/compress/v3/lzo/TestLzoCodec.java similarity index 81% rename from src/test/java/io/airlift/compress/v2/lzo/TestLzoCodec.java rename to src/test/java/io/airlift/compress/v3/lzo/TestLzoCodec.java index 97317f6b..8ae4c490 100644 --- a/src/test/java/io/airlift/compress/v2/lzo/TestLzoCodec.java +++ b/src/test/java/io/airlift/compress/v3/lzo/TestLzoCodec.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopNative; -import io.airlift.compress.v2.thirdparty.HadoopLzoCompressor; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopNative; +import io.airlift.compress.v3.thirdparty.HadoopLzoCompressor; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/lzo/TestLzoCodecByteAtATime.java b/src/test/java/io/airlift/compress/v3/lzo/TestLzoCodecByteAtATime.java similarity index 79% rename from src/test/java/io/airlift/compress/v2/lzo/TestLzoCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v3/lzo/TestLzoCodecByteAtATime.java index bde7f7f2..a0af4c57 100644 --- a/src/test/java/io/airlift/compress/v2/lzo/TestLzoCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v3/lzo/TestLzoCodecByteAtATime.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.v2.HadoopNative; -import io.airlift.compress.v2.thirdparty.HadoopLzoCompressor; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopCodecDecompressorByteAtATime; +import io.airlift.compress.v3.HadoopNative; +import io.airlift.compress.v3.thirdparty.HadoopLzoCompressor; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/lzo/TestLzopCodec.java b/src/test/java/io/airlift/compress/v3/lzo/TestLzopCodec.java similarity index 88% rename from src/test/java/io/airlift/compress/v2/lzo/TestLzopCodec.java rename to src/test/java/io/airlift/compress/v3/lzo/TestLzopCodec.java index 4f899463..222609cc 100644 --- a/src/test/java/io/airlift/compress/v2/lzo/TestLzopCodec.java +++ b/src/test/java/io/airlift/compress/v3/lzo/TestLzopCodec.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; import com.google.common.io.Resources; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopNative; -import io.airlift.compress.v2.thirdparty.HadoopLzoCompressor; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopNative; +import io.airlift.compress.v3.thirdparty.HadoopLzoCompressor; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/airlift/compress/v2/lzo/TestLzopCodecByteAtATime.java b/src/test/java/io/airlift/compress/v3/lzo/TestLzopCodecByteAtATime.java similarity index 79% rename from src/test/java/io/airlift/compress/v2/lzo/TestLzopCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v3/lzo/TestLzopCodecByteAtATime.java index 250dbb8e..a11dd2e3 100644 --- a/src/test/java/io/airlift/compress/v2/lzo/TestLzopCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v3/lzo/TestLzopCodecByteAtATime.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.lzo; +package io.airlift.compress.v3.lzo; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.v2.HadoopNative; -import io.airlift.compress.v2.thirdparty.HadoopLzoCompressor; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopCodecDecompressorByteAtATime; +import io.airlift.compress.v3.HadoopNative; +import io.airlift.compress.v3.thirdparty.HadoopLzoCompressor; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/snappy/AbstractTestSnappy.java b/src/test/java/io/airlift/compress/v3/snappy/AbstractTestSnappy.java similarity index 92% rename from src/test/java/io/airlift/compress/v2/snappy/AbstractTestSnappy.java rename to src/test/java/io/airlift/compress/v3/snappy/AbstractTestSnappy.java index a50fdb5a..814e874f 100644 --- a/src/test/java/io/airlift/compress/v2/snappy/AbstractTestSnappy.java +++ b/src/test/java/io/airlift/compress/v3/snappy/AbstractTestSnappy.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.MalformedInputException; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/src/test/java/io/airlift/compress/v2/snappy/ByteArrayOutputStream.java b/src/test/java/io/airlift/compress/v3/snappy/ByteArrayOutputStream.java similarity index 97% rename from src/test/java/io/airlift/compress/v2/snappy/ByteArrayOutputStream.java rename to src/test/java/io/airlift/compress/v3/snappy/ByteArrayOutputStream.java index 2e99ffe3..5fd95ca1 100644 --- a/src/test/java/io/airlift/compress/v2/snappy/ByteArrayOutputStream.java +++ b/src/test/java/io/airlift/compress/v3/snappy/ByteArrayOutputStream.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; import java.io.OutputStream; diff --git a/src/test/java/io/airlift/compress/v2/snappy/RandomGenerator.java b/src/test/java/io/airlift/compress/v3/snappy/RandomGenerator.java similarity index 98% rename from src/test/java/io/airlift/compress/v2/snappy/RandomGenerator.java rename to src/test/java/io/airlift/compress/v3/snappy/RandomGenerator.java index 43b2cf52..b465a88f 100644 --- a/src/test/java/io/airlift/compress/v2/snappy/RandomGenerator.java +++ b/src/test/java/io/airlift/compress/v3/snappy/RandomGenerator.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; import java.util.Random; diff --git a/src/test/java/io/airlift/compress/v2/snappy/TestSnappyCodec.java b/src/test/java/io/airlift/compress/v3/snappy/TestSnappyCodec.java similarity index 84% rename from src/test/java/io/airlift/compress/v2/snappy/TestSnappyCodec.java rename to src/test/java/io/airlift/compress/v3/snappy/TestSnappyCodec.java index b5508513..d71dbe39 100644 --- a/src/test/java/io/airlift/compress/v2/snappy/TestSnappyCodec.java +++ b/src/test/java/io/airlift/compress/v3/snappy/TestSnappyCodec.java @@ -11,14 +11,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopNative; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopNative; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/snappy/TestSnappyCodecByteAtATime.java b/src/test/java/io/airlift/compress/v3/snappy/TestSnappyCodecByteAtATime.java similarity index 81% rename from src/test/java/io/airlift/compress/v2/snappy/TestSnappyCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v3/snappy/TestSnappyCodecByteAtATime.java index 77822b6d..1462a27c 100644 --- a/src/test/java/io/airlift/compress/v2/snappy/TestSnappyCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v3/snappy/TestSnappyCodecByteAtATime.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.v2.HadoopNative; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.HadoopCodecDecompressorByteAtATime; +import io.airlift.compress.v3.HadoopNative; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/v2/snappy/TestSnappyJava.java b/src/test/java/io/airlift/compress/v3/snappy/TestSnappyJava.java similarity index 81% rename from src/test/java/io/airlift/compress/v2/snappy/TestSnappyJava.java rename to src/test/java/io/airlift/compress/v3/snappy/TestSnappyJava.java index 2924dfd0..22713a32 100644 --- a/src/test/java/io/airlift/compress/v2/snappy/TestSnappyJava.java +++ b/src/test/java/io/airlift/compress/v3/snappy/TestSnappyJava.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.thirdparty.XerialSnappyCompressor; -import io.airlift.compress.v2.thirdparty.XerialSnappyDecompressor; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.thirdparty.XerialSnappyCompressor; +import io.airlift.compress.v3.thirdparty.XerialSnappyDecompressor; class TestSnappyJava extends AbstractTestSnappy diff --git a/src/test/java/io/airlift/compress/v2/snappy/TestSnappyNative.java b/src/test/java/io/airlift/compress/v3/snappy/TestSnappyNative.java similarity index 81% rename from src/test/java/io/airlift/compress/v2/snappy/TestSnappyNative.java rename to src/test/java/io/airlift/compress/v3/snappy/TestSnappyNative.java index bb97403a..305e7621 100644 --- a/src/test/java/io/airlift/compress/v2/snappy/TestSnappyNative.java +++ b/src/test/java/io/airlift/compress/v3/snappy/TestSnappyNative.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.thirdparty.XerialSnappyCompressor; -import io.airlift.compress.v2.thirdparty.XerialSnappyDecompressor; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.thirdparty.XerialSnappyCompressor; +import io.airlift.compress.v3.thirdparty.XerialSnappyDecompressor; public class TestSnappyNative extends AbstractTestSnappy diff --git a/src/test/java/io/airlift/compress/v2/snappy/TestSnappyStream.java b/src/test/java/io/airlift/compress/v3/snappy/TestSnappyStream.java similarity index 99% rename from src/test/java/io/airlift/compress/v2/snappy/TestSnappyStream.java rename to src/test/java/io/airlift/compress/v3/snappy/TestSnappyStream.java index bd318e58..33f2f818 100644 --- a/src/test/java/io/airlift/compress/v2/snappy/TestSnappyStream.java +++ b/src/test/java/io/airlift/compress/v3/snappy/TestSnappyStream.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.snappy; +package io.airlift.compress.v3.snappy; import com.google.common.base.Charsets; -import io.airlift.compress.v2.TestingData; -import io.airlift.compress.v2.benchmark.DataSet; +import io.airlift.compress.v3.TestingData; +import io.airlift.compress.v3.benchmark.DataSet; import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; diff --git a/src/test/java/io/airlift/compress/v2/thirdparty/HadoopLzoCompressor.java b/src/test/java/io/airlift/compress/v3/thirdparty/HadoopLzoCompressor.java similarity index 96% rename from src/test/java/io/airlift/compress/v2/thirdparty/HadoopLzoCompressor.java rename to src/test/java/io/airlift/compress/v3/thirdparty/HadoopLzoCompressor.java index 45c99001..b2250073 100644 --- a/src/test/java/io/airlift/compress/v2/thirdparty/HadoopLzoCompressor.java +++ b/src/test/java/io/airlift/compress/v3/thirdparty/HadoopLzoCompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.thirdparty; +package io.airlift.compress.v3.thirdparty; -import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v3.Compressor; import org.anarres.lzo.hadoop.codec.LzoCompressor; import java.io.IOException; diff --git a/src/test/java/io/airlift/compress/v2/thirdparty/HadoopLzoDecompressor.java b/src/test/java/io/airlift/compress/v3/thirdparty/HadoopLzoDecompressor.java similarity index 94% rename from src/test/java/io/airlift/compress/v2/thirdparty/HadoopLzoDecompressor.java rename to src/test/java/io/airlift/compress/v3/thirdparty/HadoopLzoDecompressor.java index 8dca4a9b..4e2a13f5 100644 --- a/src/test/java/io/airlift/compress/v2/thirdparty/HadoopLzoDecompressor.java +++ b/src/test/java/io/airlift/compress/v3/thirdparty/HadoopLzoDecompressor.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.thirdparty; +package io.airlift.compress.v3.thirdparty; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.MalformedInputException; import org.anarres.lzo.hadoop.codec.LzoDecompressor; import org.anarres.lzo.hadoop.codec.LzoDecompressor.CompressionStrategy; diff --git a/src/test/java/io/airlift/compress/v2/thirdparty/JPountzLz4Compressor.java b/src/test/java/io/airlift/compress/v3/thirdparty/JPountzLz4Compressor.java similarity index 94% rename from src/test/java/io/airlift/compress/v2/thirdparty/JPountzLz4Compressor.java rename to src/test/java/io/airlift/compress/v3/thirdparty/JPountzLz4Compressor.java index 9d179ec4..999997f9 100644 --- a/src/test/java/io/airlift/compress/v2/thirdparty/JPountzLz4Compressor.java +++ b/src/test/java/io/airlift/compress/v3/thirdparty/JPountzLz4Compressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.thirdparty; +package io.airlift.compress.v3.thirdparty; -import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v3.Compressor; import net.jpountz.lz4.LZ4Compressor; import net.jpountz.lz4.LZ4Factory; diff --git a/src/test/java/io/airlift/compress/v2/thirdparty/JPountzLz4Decompressor.java b/src/test/java/io/airlift/compress/v3/thirdparty/JPountzLz4Decompressor.java similarity index 91% rename from src/test/java/io/airlift/compress/v2/thirdparty/JPountzLz4Decompressor.java rename to src/test/java/io/airlift/compress/v3/thirdparty/JPountzLz4Decompressor.java index f90ced5c..c6acf3c8 100644 --- a/src/test/java/io/airlift/compress/v2/thirdparty/JPountzLz4Decompressor.java +++ b/src/test/java/io/airlift/compress/v3/thirdparty/JPountzLz4Decompressor.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.thirdparty; +package io.airlift.compress.v3.thirdparty; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.MalformedInputException; import net.jpountz.lz4.LZ4Factory; import net.jpountz.lz4.LZ4SafeDecompressor; diff --git a/src/test/java/io/airlift/compress/v2/thirdparty/JdkDeflateCompressor.java b/src/test/java/io/airlift/compress/v3/thirdparty/JdkDeflateCompressor.java similarity index 94% rename from src/test/java/io/airlift/compress/v2/thirdparty/JdkDeflateCompressor.java rename to src/test/java/io/airlift/compress/v3/thirdparty/JdkDeflateCompressor.java index 83539b8f..17ed0528 100644 --- a/src/test/java/io/airlift/compress/v2/thirdparty/JdkDeflateCompressor.java +++ b/src/test/java/io/airlift/compress/v3/thirdparty/JdkDeflateCompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.thirdparty; +package io.airlift.compress.v3.thirdparty; -import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v3.Compressor; import java.lang.foreign.MemorySegment; import java.util.zip.Deflater; diff --git a/src/test/java/io/airlift/compress/v2/thirdparty/JdkInflateDecompressor.java b/src/test/java/io/airlift/compress/v3/thirdparty/JdkInflateDecompressor.java similarity index 91% rename from src/test/java/io/airlift/compress/v2/thirdparty/JdkInflateDecompressor.java rename to src/test/java/io/airlift/compress/v3/thirdparty/JdkInflateDecompressor.java index fc3ec8ce..d03dad6f 100644 --- a/src/test/java/io/airlift/compress/v2/thirdparty/JdkInflateDecompressor.java +++ b/src/test/java/io/airlift/compress/v3/thirdparty/JdkInflateDecompressor.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.thirdparty; +package io.airlift.compress.v3.thirdparty; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.MalformedInputException; import java.lang.foreign.MemorySegment; import java.util.zip.DataFormatException; diff --git a/src/test/java/io/airlift/compress/v2/thirdparty/XerialSnappyCompressor.java b/src/test/java/io/airlift/compress/v3/thirdparty/XerialSnappyCompressor.java similarity index 90% rename from src/test/java/io/airlift/compress/v2/thirdparty/XerialSnappyCompressor.java rename to src/test/java/io/airlift/compress/v3/thirdparty/XerialSnappyCompressor.java index fccf6de2..d80416b7 100644 --- a/src/test/java/io/airlift/compress/v2/thirdparty/XerialSnappyCompressor.java +++ b/src/test/java/io/airlift/compress/v3/thirdparty/XerialSnappyCompressor.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.thirdparty; +package io.airlift.compress.v3.thirdparty; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.snappy.SnappyJavaCompressor; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.snappy.SnappyJavaCompressor; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/src/test/java/io/airlift/compress/v2/thirdparty/XerialSnappyDecompressor.java b/src/test/java/io/airlift/compress/v3/thirdparty/XerialSnappyDecompressor.java similarity index 90% rename from src/test/java/io/airlift/compress/v2/thirdparty/XerialSnappyDecompressor.java rename to src/test/java/io/airlift/compress/v3/thirdparty/XerialSnappyDecompressor.java index 967e873f..5c911cb0 100644 --- a/src/test/java/io/airlift/compress/v2/thirdparty/XerialSnappyDecompressor.java +++ b/src/test/java/io/airlift/compress/v3/thirdparty/XerialSnappyDecompressor.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.thirdparty; +package io.airlift.compress.v3.thirdparty; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.MalformedInputException; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/src/test/java/io/airlift/compress/v2/thirdparty/ZstdJniCompressor.java b/src/test/java/io/airlift/compress/v3/thirdparty/ZstdJniCompressor.java similarity index 94% rename from src/test/java/io/airlift/compress/v2/thirdparty/ZstdJniCompressor.java rename to src/test/java/io/airlift/compress/v3/thirdparty/ZstdJniCompressor.java index 87b98051..2b6570a2 100644 --- a/src/test/java/io/airlift/compress/v2/thirdparty/ZstdJniCompressor.java +++ b/src/test/java/io/airlift/compress/v3/thirdparty/ZstdJniCompressor.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.thirdparty; +package io.airlift.compress.v3.thirdparty; import com.github.luben.zstd.Zstd; -import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v3.Compressor; import java.lang.foreign.MemorySegment; import java.nio.ByteBuffer; diff --git a/src/test/java/io/airlift/compress/v2/thirdparty/ZstdJniDecompressor.java b/src/test/java/io/airlift/compress/v3/thirdparty/ZstdJniDecompressor.java similarity index 90% rename from src/test/java/io/airlift/compress/v2/thirdparty/ZstdJniDecompressor.java rename to src/test/java/io/airlift/compress/v3/thirdparty/ZstdJniDecompressor.java index 963219ae..27b4736c 100644 --- a/src/test/java/io/airlift/compress/v2/thirdparty/ZstdJniDecompressor.java +++ b/src/test/java/io/airlift/compress/v3/thirdparty/ZstdJniDecompressor.java @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.thirdparty; +package io.airlift.compress.v3.thirdparty; import com.github.luben.zstd.Zstd; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.MalformedInputException; import java.lang.foreign.MemorySegment; import java.nio.ByteBuffer; diff --git a/src/test/java/io/airlift/compress/v2/zstd/AbstractTestZstd.java b/src/test/java/io/airlift/compress/v3/zstd/AbstractTestZstd.java similarity index 97% rename from src/test/java/io/airlift/compress/v2/zstd/AbstractTestZstd.java rename to src/test/java/io/airlift/compress/v3/zstd/AbstractTestZstd.java index 7d1269e0..fab89f97 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/AbstractTestZstd.java +++ b/src/test/java/io/airlift/compress/v3/zstd/AbstractTestZstd.java @@ -11,13 +11,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import com.google.common.io.Resources; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.TestingData; -import io.airlift.compress.v2.benchmark.DataSet; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.TestingData; +import io.airlift.compress.v3.benchmark.DataSet; import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/io/airlift/compress/v2/zstd/TestCompressor.java b/src/test/java/io/airlift/compress/v3/zstd/TestCompressor.java similarity index 99% rename from src/test/java/io/airlift/compress/v2/zstd/TestCompressor.java rename to src/test/java/io/airlift/compress/v3/zstd/TestCompressor.java index e0984353..b0a8a98d 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/TestCompressor.java +++ b/src/test/java/io/airlift/compress/v3/zstd/TestCompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/airlift/compress/v2/zstd/TestUtil.java b/src/test/java/io/airlift/compress/v3/zstd/TestUtil.java similarity index 93% rename from src/test/java/io/airlift/compress/v2/zstd/TestUtil.java rename to src/test/java/io/airlift/compress/v3/zstd/TestUtil.java index 3540e23c..fc06d73b 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/TestUtil.java +++ b/src/test/java/io/airlift/compress/v3/zstd/TestUtil.java @@ -11,15 +11,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import com.google.common.collect.ImmutableList; import org.junit.jupiter.api.Test; import java.util.List; -import static io.airlift.compress.v2.zstd.Util.get24BitLittleEndian; -import static io.airlift.compress.v2.zstd.Util.put24BitLittleEndian; +import static io.airlift.compress.v3.zstd.Util.get24BitLittleEndian; +import static io.airlift.compress.v3.zstd.Util.put24BitLittleEndian; import static org.assertj.core.api.Assertions.assertThat; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; diff --git a/src/test/java/io/airlift/compress/v2/zstd/TestXxHash64.java b/src/test/java/io/airlift/compress/v3/zstd/TestXxHash64.java similarity index 98% rename from src/test/java/io/airlift/compress/v2/zstd/TestXxHash64.java rename to src/test/java/io/airlift/compress/v3/zstd/TestXxHash64.java index a12c0210..6501663a 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/TestXxHash64.java +++ b/src/test/java/io/airlift/compress/v3/zstd/TestXxHash64.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import net.jpountz.xxhash.XXHash64; import net.jpountz.xxhash.XXHashFactory; diff --git a/src/test/java/io/airlift/compress/v2/zstd/TestZstd.java b/src/test/java/io/airlift/compress/v3/zstd/TestZstd.java similarity index 81% rename from src/test/java/io/airlift/compress/v2/zstd/TestZstd.java rename to src/test/java/io/airlift/compress/v3/zstd/TestZstd.java index 9ef8a710..2f3bfb9d 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/TestZstd.java +++ b/src/test/java/io/airlift/compress/v3/zstd/TestZstd.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.thirdparty.ZstdJniCompressor; -import io.airlift.compress.v2.thirdparty.ZstdJniDecompressor; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.thirdparty.ZstdJniCompressor; +import io.airlift.compress.v3.thirdparty.ZstdJniDecompressor; public class TestZstd extends AbstractTestZstd diff --git a/src/test/java/io/airlift/compress/v2/zstd/TestZstdCodec.java b/src/test/java/io/airlift/compress/v3/zstd/TestZstdCodec.java similarity index 83% rename from src/test/java/io/airlift/compress/v2/zstd/TestZstdCodec.java rename to src/test/java/io/airlift/compress/v3/zstd/TestZstdCodec.java index 6ccb251d..c88dbfe7 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/TestZstdCodec.java +++ b/src/test/java/io/airlift/compress/v3/zstd/TestZstdCodec.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import com.google.common.io.Resources; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressor; -import io.airlift.compress.v2.thirdparty.ZstdJniCompressor; -import io.airlift.compress.v2.thirdparty.ZstdJniDecompressor; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressor; +import io.airlift.compress.v3.thirdparty.ZstdJniCompressor; +import io.airlift.compress.v3.thirdparty.ZstdJniDecompressor; import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/src/test/java/io/airlift/compress/v2/zstd/TestZstdCodecByteAtATime.java b/src/test/java/io/airlift/compress/v3/zstd/TestZstdCodecByteAtATime.java similarity index 85% rename from src/test/java/io/airlift/compress/v2/zstd/TestZstdCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v3/zstd/TestZstdCodecByteAtATime.java index 32049267..2cfa43a1 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/TestZstdCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v3/zstd/TestZstdCodecByteAtATime.java @@ -11,16 +11,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import com.google.common.io.Resources; -import io.airlift.compress.v2.AbstractTestCompression; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.HadoopCodecCompressor; -import io.airlift.compress.v2.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.v2.thirdparty.ZstdJniCompressor; -import io.airlift.compress.v2.thirdparty.ZstdJniDecompressor; +import io.airlift.compress.v3.AbstractTestCompression; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.HadoopCodecCompressor; +import io.airlift.compress.v3.HadoopCodecDecompressorByteAtATime; +import io.airlift.compress.v3.thirdparty.ZstdJniCompressor; +import io.airlift.compress.v3.thirdparty.ZstdJniDecompressor; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/airlift/compress/v2/zstd/TestZstdNative.java b/src/test/java/io/airlift/compress/v3/zstd/TestZstdNative.java similarity index 81% rename from src/test/java/io/airlift/compress/v2/zstd/TestZstdNative.java rename to src/test/java/io/airlift/compress/v3/zstd/TestZstdNative.java index 8e09e968..e367f409 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/TestZstdNative.java +++ b/src/test/java/io/airlift/compress/v3/zstd/TestZstdNative.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.thirdparty.ZstdJniCompressor; -import io.airlift.compress.v2.thirdparty.ZstdJniDecompressor; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.thirdparty.ZstdJniCompressor; +import io.airlift.compress.v3.thirdparty.ZstdJniDecompressor; public class TestZstdNative extends AbstractTestZstd diff --git a/src/test/java/io/airlift/compress/v2/zstd/TestZstdPartial.java b/src/test/java/io/airlift/compress/v3/zstd/TestZstdPartial.java similarity index 91% rename from src/test/java/io/airlift/compress/v2/zstd/TestZstdPartial.java rename to src/test/java/io/airlift/compress/v3/zstd/TestZstdPartial.java index 6e965c3c..f0ea096f 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/TestZstdPartial.java +++ b/src/test/java/io/airlift/compress/v3/zstd/TestZstdPartial.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import com.google.common.io.Resources; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.MalformedInputException; import java.io.IOException; diff --git a/src/test/java/io/airlift/compress/v2/zstd/TestZstdStream.java b/src/test/java/io/airlift/compress/v3/zstd/TestZstdStream.java similarity index 91% rename from src/test/java/io/airlift/compress/v2/zstd/TestZstdStream.java rename to src/test/java/io/airlift/compress/v3/zstd/TestZstdStream.java index e7e8ca78..b808e547 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/TestZstdStream.java +++ b/src/test/java/io/airlift/compress/v3/zstd/TestZstdStream.java @@ -11,12 +11,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import com.google.common.io.Resources; -import io.airlift.compress.v2.Compressor; -import io.airlift.compress.v2.Decompressor; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.Compressor; +import io.airlift.compress.v3.Decompressor; +import io.airlift.compress.v3.MalformedInputException; import java.io.IOException; diff --git a/src/test/java/io/airlift/compress/v2/zstd/ZstdPartialDecompressor.java b/src/test/java/io/airlift/compress/v3/zstd/ZstdPartialDecompressor.java similarity index 98% rename from src/test/java/io/airlift/compress/v2/zstd/ZstdPartialDecompressor.java rename to src/test/java/io/airlift/compress/v3/zstd/ZstdPartialDecompressor.java index 1784d607..e85bce2c 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/ZstdPartialDecompressor.java +++ b/src/test/java/io/airlift/compress/v3/zstd/ZstdPartialDecompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; import java.lang.foreign.MemorySegment; diff --git a/src/test/java/io/airlift/compress/v2/zstd/ZstdStreamCompressor.java b/src/test/java/io/airlift/compress/v3/zstd/ZstdStreamCompressor.java similarity index 96% rename from src/test/java/io/airlift/compress/v2/zstd/ZstdStreamCompressor.java rename to src/test/java/io/airlift/compress/v3/zstd/ZstdStreamCompressor.java index 58abe524..604a4684 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/ZstdStreamCompressor.java +++ b/src/test/java/io/airlift/compress/v3/zstd/ZstdStreamCompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -19,7 +19,7 @@ import java.lang.foreign.MemorySegment; import static com.google.common.primitives.Ints.constrainToRange; -import static io.airlift.compress.v2.zstd.Constants.MAX_BLOCK_SIZE; +import static io.airlift.compress.v3.zstd.Constants.MAX_BLOCK_SIZE; import static java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/src/test/java/io/airlift/compress/v2/zstd/ZstdStreamDecompressor.java b/src/test/java/io/airlift/compress/v3/zstd/ZstdStreamDecompressor.java similarity index 96% rename from src/test/java/io/airlift/compress/v2/zstd/ZstdStreamDecompressor.java rename to src/test/java/io/airlift/compress/v3/zstd/ZstdStreamDecompressor.java index 800318af..75531d9e 100644 --- a/src/test/java/io/airlift/compress/v2/zstd/ZstdStreamDecompressor.java +++ b/src/test/java/io/airlift/compress/v3/zstd/ZstdStreamDecompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress.v2.zstd; +package io.airlift.compress.v3.zstd; -import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v3.MalformedInputException; import java.io.ByteArrayInputStream; import java.io.IOException;