diff --git a/src/main/java/io/airlift/compress/Compressor.java b/src/main/java/io/airlift/compress/v2/Compressor.java similarity index 96% rename from src/main/java/io/airlift/compress/Compressor.java rename to src/main/java/io/airlift/compress/v2/Compressor.java index dd359b8f..89c3f91b 100644 --- a/src/main/java/io/airlift/compress/Compressor.java +++ b/src/main/java/io/airlift/compress/v2/Compressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress; +package io.airlift.compress.v2; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/Decompressor.java b/src/main/java/io/airlift/compress/v2/Decompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/Decompressor.java rename to src/main/java/io/airlift/compress/v2/Decompressor.java index 8da1f09e..39e932c3 100644 --- a/src/main/java/io/airlift/compress/Decompressor.java +++ b/src/main/java/io/airlift/compress/v2/Decompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress; +package io.airlift.compress.v2; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/IncompatibleJvmException.java b/src/main/java/io/airlift/compress/v2/IncompatibleJvmException.java similarity index 95% rename from src/main/java/io/airlift/compress/IncompatibleJvmException.java rename to src/main/java/io/airlift/compress/v2/IncompatibleJvmException.java index 2c92a46e..0149f26f 100644 --- a/src/main/java/io/airlift/compress/IncompatibleJvmException.java +++ b/src/main/java/io/airlift/compress/v2/IncompatibleJvmException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress; +package io.airlift.compress.v2; public class IncompatibleJvmException extends RuntimeException diff --git a/src/main/java/io/airlift/compress/MalformedInputException.java b/src/main/java/io/airlift/compress/v2/MalformedInputException.java similarity index 96% rename from src/main/java/io/airlift/compress/MalformedInputException.java rename to src/main/java/io/airlift/compress/v2/MalformedInputException.java index eb487a39..ff3c3a4b 100644 --- a/src/main/java/io/airlift/compress/MalformedInputException.java +++ b/src/main/java/io/airlift/compress/v2/MalformedInputException.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress; +package io.airlift.compress.v2; public class MalformedInputException extends RuntimeException diff --git a/src/main/java/io/airlift/compress/bzip2/BZip2Codec.java b/src/main/java/io/airlift/compress/v2/bzip2/BZip2Codec.java similarity index 88% rename from src/main/java/io/airlift/compress/bzip2/BZip2Codec.java rename to src/main/java/io/airlift/compress/v2/bzip2/BZip2Codec.java index 83bfae99..f2d7f140 100644 --- a/src/main/java/io/airlift/compress/bzip2/BZip2Codec.java +++ b/src/main/java/io/airlift/compress/v2/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.bzip2; +package io.airlift.compress.v2.bzip2; -import io.airlift.compress.hadoop.CodecAdapter; +import io.airlift.compress.v2.hadoop.CodecAdapter; public class BZip2Codec extends CodecAdapter diff --git a/src/main/java/io/airlift/compress/bzip2/BZip2Constants.java b/src/main/java/io/airlift/compress/v2/bzip2/BZip2Constants.java similarity index 97% rename from src/main/java/io/airlift/compress/bzip2/BZip2Constants.java rename to src/main/java/io/airlift/compress/v2/bzip2/BZip2Constants.java index 2ef18254..c77a19fb 100644 --- a/src/main/java/io/airlift/compress/bzip2/BZip2Constants.java +++ b/src/main/java/io/airlift/compress/v2/bzip2/BZip2Constants.java @@ -16,7 +16,7 @@ * to whom the Ant project is very grateful for his * great code. */ -package io.airlift.compress.bzip2; +package io.airlift.compress.v2.bzip2; /** * Base class for both the compress and decompress classes. Holds common arrays, diff --git a/src/main/java/io/airlift/compress/bzip2/BZip2HadoopInputStream.java b/src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopInputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/bzip2/BZip2HadoopInputStream.java rename to src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopInputStream.java index e07367fc..1dc0643a 100644 --- a/src/main/java/io/airlift/compress/bzip2/BZip2HadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.bzip2; +package io.airlift.compress.v2.bzip2; -import io.airlift.compress.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopInputStream; import java.io.BufferedInputStream; import java.io.IOException; diff --git a/src/main/java/io/airlift/compress/bzip2/BZip2HadoopOutputStream.java b/src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopOutputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/bzip2/BZip2HadoopOutputStream.java rename to src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopOutputStream.java index c0005c42..d55b961b 100644 --- a/src/main/java/io/airlift/compress/bzip2/BZip2HadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.bzip2; +package io.airlift.compress.v2.bzip2; -import io.airlift.compress.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/bzip2/BZip2HadoopStreams.java b/src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopStreams.java similarity index 86% rename from src/main/java/io/airlift/compress/bzip2/BZip2HadoopStreams.java rename to src/main/java/io/airlift/compress/v2/bzip2/BZip2HadoopStreams.java index b528de95..eebe1087 100644 --- a/src/main/java/io/airlift/compress/bzip2/BZip2HadoopStreams.java +++ b/src/main/java/io/airlift/compress/v2/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.bzip2; +package io.airlift.compress.v2.bzip2; -import io.airlift.compress.hadoop.HadoopInputStream; -import io.airlift.compress.hadoop.HadoopOutputStream; -import io.airlift.compress.hadoop.HadoopStreams; +import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopStreams; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/bzip2/CBZip2InputStream.java b/src/main/java/io/airlift/compress/v2/bzip2/CBZip2InputStream.java similarity index 98% rename from src/main/java/io/airlift/compress/bzip2/CBZip2InputStream.java rename to src/main/java/io/airlift/compress/v2/bzip2/CBZip2InputStream.java index 367a5aa1..4ea56c4f 100644 --- a/src/main/java/io/airlift/compress/bzip2/CBZip2InputStream.java +++ b/src/main/java/io/airlift/compress/v2/bzip2/CBZip2InputStream.java @@ -16,18 +16,18 @@ * to whom the Ant project is very grateful for his * great code. */ -package io.airlift.compress.bzip2; +package io.airlift.compress.v2.bzip2; import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; -import static io.airlift.compress.bzip2.BZip2Constants.G_SIZE; -import static io.airlift.compress.bzip2.BZip2Constants.MAX_ALPHA_SIZE; -import static io.airlift.compress.bzip2.BZip2Constants.MAX_SELECTORS; -import static io.airlift.compress.bzip2.BZip2Constants.N_GROUPS; -import static io.airlift.compress.bzip2.BZip2Constants.RUN_A; -import static io.airlift.compress.bzip2.BZip2Constants.RUN_B; +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; /** * An input stream that decompresses from the BZip2 format (without the file diff --git a/src/main/java/io/airlift/compress/bzip2/CBZip2OutputStream.java b/src/main/java/io/airlift/compress/v2/bzip2/CBZip2OutputStream.java similarity index 99% rename from src/main/java/io/airlift/compress/bzip2/CBZip2OutputStream.java rename to src/main/java/io/airlift/compress/v2/bzip2/CBZip2OutputStream.java index 67970fd3..97abe819 100644 --- a/src/main/java/io/airlift/compress/bzip2/CBZip2OutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.bzip2; +package io.airlift.compress.v2.bzip2; import java.io.IOException; import java.io.OutputStream; -import static io.airlift.compress.bzip2.BZip2Constants.G_SIZE; -import static io.airlift.compress.bzip2.BZip2Constants.MAX_ALPHA_SIZE; -import static io.airlift.compress.bzip2.BZip2Constants.MAX_SELECTORS; -import static io.airlift.compress.bzip2.BZip2Constants.N_GROUPS; -import static io.airlift.compress.bzip2.BZip2Constants.RUN_A; -import static io.airlift.compress.bzip2.BZip2Constants.RUN_B; +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; /** * An output stream that compresses into the BZip2 format (without the file diff --git a/src/main/java/io/airlift/compress/bzip2/Crc32.java b/src/main/java/io/airlift/compress/v2/bzip2/Crc32.java similarity index 99% rename from src/main/java/io/airlift/compress/bzip2/Crc32.java rename to src/main/java/io/airlift/compress/v2/bzip2/Crc32.java index ea9ca538..83a21208 100644 --- a/src/main/java/io/airlift/compress/bzip2/Crc32.java +++ b/src/main/java/io/airlift/compress/v2/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.bzip2; +package io.airlift.compress.v2.bzip2; // forked from Apache Hadoop final class Crc32 diff --git a/src/main/java/io/airlift/compress/deflate/DeflateCompressor.java b/src/main/java/io/airlift/compress/v2/deflate/DeflateCompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/deflate/DeflateCompressor.java rename to src/main/java/io/airlift/compress/v2/deflate/DeflateCompressor.java index 0f6d9035..37a9209e 100644 --- a/src/main/java/io/airlift/compress/deflate/DeflateCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.deflate; +package io.airlift.compress.v2.deflate; -import io.airlift.compress.Compressor; +import io.airlift.compress.v2.Compressor; import java.lang.foreign.MemorySegment; import java.util.zip.Deflater; diff --git a/src/main/java/io/airlift/compress/deflate/DeflateDecompressor.java b/src/main/java/io/airlift/compress/v2/deflate/DeflateDecompressor.java similarity index 96% rename from src/main/java/io/airlift/compress/deflate/DeflateDecompressor.java rename to src/main/java/io/airlift/compress/v2/deflate/DeflateDecompressor.java index 0e520f65..1d5a82d1 100644 --- a/src/main/java/io/airlift/compress/deflate/DeflateDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.deflate; +package io.airlift.compress.v2.deflate; -import io.airlift.compress.Decompressor; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v2.MalformedInputException; import java.lang.foreign.MemorySegment; import java.nio.ByteBuffer; diff --git a/src/main/java/io/airlift/compress/deflate/JdkDeflateCodec.java b/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateCodec.java similarity index 88% rename from src/main/java/io/airlift/compress/deflate/JdkDeflateCodec.java rename to src/main/java/io/airlift/compress/v2/deflate/JdkDeflateCodec.java index 30f06dbf..4535c3c2 100644 --- a/src/main/java/io/airlift/compress/deflate/JdkDeflateCodec.java +++ b/src/main/java/io/airlift/compress/v2/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.deflate; +package io.airlift.compress.v2.deflate; -import io.airlift.compress.hadoop.CodecAdapter; +import io.airlift.compress.v2.hadoop.CodecAdapter; public class JdkDeflateCodec extends CodecAdapter diff --git a/src/main/java/io/airlift/compress/deflate/JdkDeflateHadoopInputStream.java b/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopInputStream.java similarity index 97% rename from src/main/java/io/airlift/compress/deflate/JdkDeflateHadoopInputStream.java rename to src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopInputStream.java index ee28e520..185a0c9e 100644 --- a/src/main/java/io/airlift/compress/deflate/JdkDeflateHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.deflate; +package io.airlift.compress.v2.deflate; -import io.airlift.compress.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopInputStream; import java.io.EOFException; import java.io.IOException; diff --git a/src/main/java/io/airlift/compress/deflate/JdkDeflateHadoopOutputStream.java b/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopOutputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/deflate/JdkDeflateHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopOutputStream.java index 05f3dae5..931f698e 100644 --- a/src/main/java/io/airlift/compress/deflate/JdkDeflateHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.deflate; +package io.airlift.compress.v2.deflate; -import io.airlift.compress.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/deflate/JdkDeflateHadoopStreams.java b/src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopStreams.java similarity index 87% rename from src/main/java/io/airlift/compress/deflate/JdkDeflateHadoopStreams.java rename to src/main/java/io/airlift/compress/v2/deflate/JdkDeflateHadoopStreams.java index e78ae9b9..35fe29fa 100644 --- a/src/main/java/io/airlift/compress/deflate/JdkDeflateHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v2/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.deflate; +package io.airlift.compress.v2.deflate; -import io.airlift.compress.hadoop.HadoopInputStream; -import io.airlift.compress.hadoop.HadoopOutputStream; -import io.airlift.compress.hadoop.HadoopStreams; +import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopStreams; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/gzip/JdkGzipCodec.java b/src/main/java/io/airlift/compress/v2/gzip/JdkGzipCodec.java similarity index 89% rename from src/main/java/io/airlift/compress/gzip/JdkGzipCodec.java rename to src/main/java/io/airlift/compress/v2/gzip/JdkGzipCodec.java index f4bd1dae..96db6084 100644 --- a/src/main/java/io/airlift/compress/gzip/JdkGzipCodec.java +++ b/src/main/java/io/airlift/compress/v2/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.gzip; +package io.airlift.compress.v2.gzip; -import io.airlift.compress.hadoop.CodecAdapter; +import io.airlift.compress.v2.hadoop.CodecAdapter; public class JdkGzipCodec extends CodecAdapter diff --git a/src/main/java/io/airlift/compress/gzip/JdkGzipConstants.java b/src/main/java/io/airlift/compress/v2/gzip/JdkGzipConstants.java similarity index 94% rename from src/main/java/io/airlift/compress/gzip/JdkGzipConstants.java rename to src/main/java/io/airlift/compress/v2/gzip/JdkGzipConstants.java index 9d1ebef4..b09da66a 100644 --- a/src/main/java/io/airlift/compress/gzip/JdkGzipConstants.java +++ b/src/main/java/io/airlift/compress/v2/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.gzip; +package io.airlift.compress.v2.gzip; final class JdkGzipConstants { diff --git a/src/main/java/io/airlift/compress/gzip/JdkGzipHadoopInputStream.java b/src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopInputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/gzip/JdkGzipHadoopInputStream.java rename to src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopInputStream.java index b1814949..96538a7f 100644 --- a/src/main/java/io/airlift/compress/gzip/JdkGzipHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.gzip; +package io.airlift.compress.v2.gzip; -import io.airlift.compress.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopInputStream; import java.io.BufferedInputStream; import java.io.IOException; diff --git a/src/main/java/io/airlift/compress/gzip/JdkGzipHadoopOutputStream.java b/src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopOutputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/gzip/JdkGzipHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopOutputStream.java index 9c52186e..8a1c69b0 100644 --- a/src/main/java/io/airlift/compress/gzip/JdkGzipHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.gzip; +package io.airlift.compress.v2.gzip; -import io.airlift.compress.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/gzip/JdkGzipHadoopStreams.java b/src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopStreams.java similarity index 87% rename from src/main/java/io/airlift/compress/gzip/JdkGzipHadoopStreams.java rename to src/main/java/io/airlift/compress/v2/gzip/JdkGzipHadoopStreams.java index 7495c318..36e7de4b 100644 --- a/src/main/java/io/airlift/compress/gzip/JdkGzipHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v2/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.gzip; +package io.airlift.compress.v2.gzip; -import io.airlift.compress.hadoop.HadoopInputStream; -import io.airlift.compress.hadoop.HadoopOutputStream; -import io.airlift.compress.hadoop.HadoopStreams; +import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopStreams; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/hadoop/CodecAdapter.java b/src/main/java/io/airlift/compress/v2/hadoop/CodecAdapter.java similarity index 98% rename from src/main/java/io/airlift/compress/hadoop/CodecAdapter.java rename to src/main/java/io/airlift/compress/v2/hadoop/CodecAdapter.java index 653735d3..8fbbeb39 100644 --- a/src/main/java/io/airlift/compress/hadoop/CodecAdapter.java +++ b/src/main/java/io/airlift/compress/v2/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.hadoop; +package io.airlift.compress.v2.hadoop; -import io.airlift.compress.hadoop.CompressionInputStreamAdapter.PositionSupplier; +import io.airlift.compress.v2.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/hadoop/CompressionInputStreamAdapter.java b/src/main/java/io/airlift/compress/v2/hadoop/CompressionInputStreamAdapter.java similarity index 98% rename from src/main/java/io/airlift/compress/hadoop/CompressionInputStreamAdapter.java rename to src/main/java/io/airlift/compress/v2/hadoop/CompressionInputStreamAdapter.java index d94fe25f..ec113a12 100644 --- a/src/main/java/io/airlift/compress/hadoop/CompressionInputStreamAdapter.java +++ b/src/main/java/io/airlift/compress/v2/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.hadoop; +package io.airlift.compress.v2.hadoop; import org.apache.hadoop.io.compress.CompressionInputStream; diff --git a/src/main/java/io/airlift/compress/hadoop/CompressionOutputStreamAdapter.java b/src/main/java/io/airlift/compress/v2/hadoop/CompressionOutputStreamAdapter.java similarity index 97% rename from src/main/java/io/airlift/compress/hadoop/CompressionOutputStreamAdapter.java rename to src/main/java/io/airlift/compress/v2/hadoop/CompressionOutputStreamAdapter.java index b58fd725..8f81ef59 100644 --- a/src/main/java/io/airlift/compress/hadoop/CompressionOutputStreamAdapter.java +++ b/src/main/java/io/airlift/compress/v2/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.hadoop; +package io.airlift.compress.v2.hadoop; import org.apache.hadoop.io.compress.CompressionOutputStream; diff --git a/src/main/java/io/airlift/compress/hadoop/HadoopInputStream.java b/src/main/java/io/airlift/compress/v2/hadoop/HadoopInputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/hadoop/HadoopInputStream.java rename to src/main/java/io/airlift/compress/v2/hadoop/HadoopInputStream.java index b35eaa1f..fbb99a7a 100644 --- a/src/main/java/io/airlift/compress/hadoop/HadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.hadoop; +package io.airlift.compress.v2.hadoop; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/hadoop/HadoopOutputStream.java b/src/main/java/io/airlift/compress/v2/hadoop/HadoopOutputStream.java similarity index 97% rename from src/main/java/io/airlift/compress/hadoop/HadoopOutputStream.java rename to src/main/java/io/airlift/compress/v2/hadoop/HadoopOutputStream.java index a3871c64..b4ec39ba 100644 --- a/src/main/java/io/airlift/compress/hadoop/HadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.hadoop; +package io.airlift.compress.v2.hadoop; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/hadoop/HadoopStreams.java b/src/main/java/io/airlift/compress/v2/hadoop/HadoopStreams.java similarity index 96% rename from src/main/java/io/airlift/compress/hadoop/HadoopStreams.java rename to src/main/java/io/airlift/compress/v2/hadoop/HadoopStreams.java index 8922c4a6..6e265d49 100644 --- a/src/main/java/io/airlift/compress/hadoop/HadoopStreams.java +++ b/src/main/java/io/airlift/compress/v2/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.hadoop; +package io.airlift.compress.v2.hadoop; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/internal/NativeLoader.java b/src/main/java/io/airlift/compress/v2/internal/NativeLoader.java similarity index 98% rename from src/main/java/io/airlift/compress/internal/NativeLoader.java rename to src/main/java/io/airlift/compress/v2/internal/NativeLoader.java index 5f84300c..a285fbf9 100644 --- a/src/main/java/io/airlift/compress/internal/NativeLoader.java +++ b/src/main/java/io/airlift/compress/v2/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.internal; +package io.airlift.compress.v2.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.disable-native") != null) { + if (System.getProperty("io.airlift.compress.v2.disable-native") != null) { throw new LinkageError("Native library loading is disabled"); } diff --git a/src/main/java/io/airlift/compress/internal/NativeSignature.java b/src/main/java/io/airlift/compress/v2/internal/NativeSignature.java similarity index 95% rename from src/main/java/io/airlift/compress/internal/NativeSignature.java rename to src/main/java/io/airlift/compress/v2/internal/NativeSignature.java index 402b997a..cb5fabb6 100644 --- a/src/main/java/io/airlift/compress/internal/NativeSignature.java +++ b/src/main/java/io/airlift/compress/v2/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.internal; +package io.airlift.compress.v2.internal; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/src/main/java/io/airlift/compress/lz4/Lz4Codec.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4Codec.java similarity index 94% rename from src/main/java/io/airlift/compress/lz4/Lz4Codec.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4Codec.java index d4129231..4da4aa7c 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4Codec.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.hadoop.CodecAdapter; +import io.airlift.compress.v2.hadoop.CodecAdapter; import org.apache.hadoop.conf.Configuration; import java.util.Optional; diff --git a/src/main/java/io/airlift/compress/lz4/Lz4Compressor.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4Compressor.java similarity index 91% rename from src/main/java/io/airlift/compress/lz4/Lz4Compressor.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4Compressor.java index 1c256df1..0b9f0f6d 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4Compressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.Compressor; +import io.airlift.compress.v2.Compressor; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/lz4/Lz4Constants.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4Constants.java similarity index 95% rename from src/main/java/io/airlift/compress/lz4/Lz4Constants.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4Constants.java index 9182e667..934adc10 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4Constants.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; final class Lz4Constants { diff --git a/src/main/java/io/airlift/compress/lz4/Lz4Decompressor.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4Decompressor.java similarity index 90% rename from src/main/java/io/airlift/compress/lz4/Lz4Decompressor.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4Decompressor.java index da808598..233d642f 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4Decompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.Decompressor; +import io.airlift.compress.v2.Decompressor; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/lz4/Lz4HadoopInputStream.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopInputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/lz4/Lz4HadoopInputStream.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopInputStream.java index 4d5e5338..bca87f29 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4HadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopInputStream; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import static io.airlift.compress.lz4.Lz4Constants.SIZE_OF_LONG; +import static io.airlift.compress.v2.lz4.Lz4Constants.SIZE_OF_LONG; import static java.util.Objects.requireNonNull; class Lz4HadoopInputStream diff --git a/src/main/java/io/airlift/compress/lz4/Lz4HadoopOutputStream.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopOutputStream.java similarity index 95% rename from src/main/java/io/airlift/compress/lz4/Lz4HadoopOutputStream.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopOutputStream.java index d053983b..bf7af671 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4HadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; -import static io.airlift.compress.lz4.Lz4Constants.SIZE_OF_LONG; +import static io.airlift.compress.v2.lz4.Lz4Constants.SIZE_OF_LONG; import static java.util.Objects.requireNonNull; class Lz4HadoopOutputStream diff --git a/src/main/java/io/airlift/compress/lz4/Lz4HadoopStreams.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopStreams.java similarity index 90% rename from src/main/java/io/airlift/compress/lz4/Lz4HadoopStreams.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4HadoopStreams.java index 10c871eb..ac735131 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4HadoopStreams.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.hadoop.HadoopInputStream; -import io.airlift.compress.hadoop.HadoopOutputStream; -import io.airlift.compress.hadoop.HadoopStreams; +import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopStreams; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/lz4/Lz4JavaCompressor.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4JavaCompressor.java similarity index 91% rename from src/main/java/io/airlift/compress/lz4/Lz4JavaCompressor.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4JavaCompressor.java index 77e3893b..9e372b75 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4JavaCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.lz4.Lz4RawCompressor.MAX_TABLE_SIZE; -import static io.airlift.compress.lz4.UnsafeUtil.getAddress; -import static io.airlift.compress.lz4.UnsafeUtil.getBase; +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 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/lz4/Lz4JavaDecompressor.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4JavaDecompressor.java similarity index 92% rename from src/main/java/io/airlift/compress/lz4/Lz4JavaDecompressor.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4JavaDecompressor.java index 9eea8544..4c52e5c5 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4JavaDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.lz4.UnsafeUtil.getAddress; -import static io.airlift.compress.lz4.UnsafeUtil.getBase; +import static io.airlift.compress.v2.lz4.UnsafeUtil.getAddress; +import static io.airlift.compress.v2.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/lz4/Lz4Native.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4Native.java similarity index 96% rename from src/main/java/io/airlift/compress/lz4/Lz4Native.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4Native.java index 6d4a8f8a..3a567358 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4Native.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.internal.NativeLoader.Symbols; -import io.airlift.compress.internal.NativeSignature; +import io.airlift.compress.v2.internal.NativeLoader.Symbols; +import io.airlift.compress.v2.internal.NativeSignature; import java.lang.foreign.MemorySegment; import java.lang.invoke.MethodHandle; import java.util.Optional; -import static io.airlift.compress.internal.NativeLoader.loadSymbols; +import static io.airlift.compress.v2.internal.NativeLoader.loadSymbols; import static java.lang.invoke.MethodHandles.lookup; final class Lz4Native diff --git a/src/main/java/io/airlift/compress/lz4/Lz4NativeCompressor.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4NativeCompressor.java similarity index 94% rename from src/main/java/io/airlift/compress/lz4/Lz4NativeCompressor.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4NativeCompressor.java index db8c4f96..2e82c861 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4NativeCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; import java.lang.foreign.Arena; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.lz4.Lz4Native.DEFAULT_ACCELERATION; +import static io.airlift.compress.v2.lz4.Lz4Native.DEFAULT_ACCELERATION; import static java.lang.Math.toIntExact; public final class Lz4NativeCompressor diff --git a/src/main/java/io/airlift/compress/lz4/Lz4NativeDecompressor.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4NativeDecompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/lz4/Lz4NativeDecompressor.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4NativeDecompressor.java index 54fd7e69..e76b9850 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4NativeDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/lz4/Lz4RawCompressor.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4RawCompressor.java similarity index 96% rename from src/main/java/io/airlift/compress/lz4/Lz4RawCompressor.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4RawCompressor.java index 247488ff..1f9e9373 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4RawCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; import java.util.Arrays; -import static io.airlift.compress.lz4.Lz4Constants.LAST_LITERAL_SIZE; -import static io.airlift.compress.lz4.Lz4Constants.MIN_MATCH; -import static io.airlift.compress.lz4.Lz4Constants.SIZE_OF_LONG; -import static io.airlift.compress.lz4.Lz4Constants.SIZE_OF_SHORT; -import static io.airlift.compress.lz4.UnsafeUtil.UNSAFE; +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; final class Lz4RawCompressor { diff --git a/src/main/java/io/airlift/compress/lz4/Lz4RawDecompressor.java b/src/main/java/io/airlift/compress/v2/lz4/Lz4RawDecompressor.java similarity index 94% rename from src/main/java/io/airlift/compress/lz4/Lz4RawDecompressor.java rename to src/main/java/io/airlift/compress/v2/lz4/Lz4RawDecompressor.java index c63400d1..c7141a0b 100644 --- a/src/main/java/io/airlift/compress/lz4/Lz4RawDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; -import static io.airlift.compress.lz4.Lz4Constants.LAST_LITERAL_SIZE; -import static io.airlift.compress.lz4.Lz4Constants.MIN_MATCH; -import static io.airlift.compress.lz4.Lz4Constants.SIZE_OF_INT; -import static io.airlift.compress.lz4.Lz4Constants.SIZE_OF_LONG; -import static io.airlift.compress.lz4.Lz4Constants.SIZE_OF_SHORT; -import static io.airlift.compress.lz4.UnsafeUtil.UNSAFE; +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; final class Lz4RawDecompressor { diff --git a/src/main/java/io/airlift/compress/lz4/UnsafeUtil.java b/src/main/java/io/airlift/compress/v2/lz4/UnsafeUtil.java similarity index 95% rename from src/main/java/io/airlift/compress/lz4/UnsafeUtil.java rename to src/main/java/io/airlift/compress/v2/lz4/UnsafeUtil.java index 85ce8d97..c2b51abc 100644 --- a/src/main/java/io/airlift/compress/lz4/UnsafeUtil.java +++ b/src/main/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.IncompatibleJvmException; +import io.airlift.compress.v2.IncompatibleJvmException; import sun.misc.Unsafe; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/lzo/LzoCodec.java b/src/main/java/io/airlift/compress/v2/lzo/LzoCodec.java similarity index 94% rename from src/main/java/io/airlift/compress/lzo/LzoCodec.java rename to src/main/java/io/airlift/compress/v2/lzo/LzoCodec.java index c07f08a0..073b2bfe 100644 --- a/src/main/java/io/airlift/compress/lzo/LzoCodec.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.hadoop.CodecAdapter; +import io.airlift.compress.v2.hadoop.CodecAdapter; import org.apache.hadoop.conf.Configuration; import java.util.Optional; diff --git a/src/main/java/io/airlift/compress/lzo/LzoCompressor.java b/src/main/java/io/airlift/compress/v2/lzo/LzoCompressor.java similarity index 90% rename from src/main/java/io/airlift/compress/lzo/LzoCompressor.java rename to src/main/java/io/airlift/compress/v2/lzo/LzoCompressor.java index e9fe1810..4cf9e05b 100644 --- a/src/main/java/io/airlift/compress/lzo/LzoCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.Compressor; +import io.airlift.compress.v2.Compressor; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.lzo.LzoRawCompressor.MAX_TABLE_SIZE; -import static io.airlift.compress.lzo.UnsafeUtil.getAddress; -import static io.airlift.compress.lzo.UnsafeUtil.getBase; +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 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/lzo/LzoConstants.java b/src/main/java/io/airlift/compress/v2/lzo/LzoConstants.java similarity index 96% rename from src/main/java/io/airlift/compress/lzo/LzoConstants.java rename to src/main/java/io/airlift/compress/v2/lzo/LzoConstants.java index c28bc918..30c3816f 100644 --- a/src/main/java/io/airlift/compress/lzo/LzoConstants.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; final class LzoConstants { diff --git a/src/main/java/io/airlift/compress/lzo/LzoDecompressor.java b/src/main/java/io/airlift/compress/v2/lzo/LzoDecompressor.java similarity index 91% rename from src/main/java/io/airlift/compress/lzo/LzoDecompressor.java rename to src/main/java/io/airlift/compress/v2/lzo/LzoDecompressor.java index e0edd6d6..e61b8651 100644 --- a/src/main/java/io/airlift/compress/lzo/LzoDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.Decompressor; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v2.MalformedInputException; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.lzo.UnsafeUtil.getAddress; -import static io.airlift.compress.lzo.UnsafeUtil.getBase; +import static io.airlift.compress.v2.lzo.UnsafeUtil.getAddress; +import static io.airlift.compress.v2.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/lzo/LzoHadoopInputStream.java b/src/main/java/io/airlift/compress/v2/lzo/LzoHadoopInputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/lzo/LzoHadoopInputStream.java rename to src/main/java/io/airlift/compress/v2/lzo/LzoHadoopInputStream.java index 6772d896..8a32b101 100644 --- a/src/main/java/io/airlift/compress/lzo/LzoHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopInputStream; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import static io.airlift.compress.lzo.LzoConstants.SIZE_OF_LONG; +import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_LONG; import static java.util.Objects.requireNonNull; class LzoHadoopInputStream diff --git a/src/main/java/io/airlift/compress/lzo/LzoHadoopOutputStream.java b/src/main/java/io/airlift/compress/v2/lzo/LzoHadoopOutputStream.java similarity index 95% rename from src/main/java/io/airlift/compress/lzo/LzoHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v2/lzo/LzoHadoopOutputStream.java index 4b5d683b..4d344222 100644 --- a/src/main/java/io/airlift/compress/lzo/LzoHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; -import static io.airlift.compress.lzo.LzoConstants.SIZE_OF_LONG; +import static io.airlift.compress.v2.lzo.LzoConstants.SIZE_OF_LONG; import static java.util.Objects.requireNonNull; class LzoHadoopOutputStream diff --git a/src/main/java/io/airlift/compress/lzo/LzoHadoopStreams.java b/src/main/java/io/airlift/compress/v2/lzo/LzoHadoopStreams.java similarity index 89% rename from src/main/java/io/airlift/compress/lzo/LzoHadoopStreams.java rename to src/main/java/io/airlift/compress/v2/lzo/LzoHadoopStreams.java index a75718cd..d1896e2f 100644 --- a/src/main/java/io/airlift/compress/lzo/LzoHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.hadoop.HadoopInputStream; -import io.airlift.compress.hadoop.HadoopOutputStream; -import io.airlift.compress.hadoop.HadoopStreams; +import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopStreams; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/lzo/LzoRawCompressor.java b/src/main/java/io/airlift/compress/v2/lzo/LzoRawCompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/lzo/LzoRawCompressor.java rename to src/main/java/io/airlift/compress/v2/lzo/LzoRawCompressor.java index 1b81930f..e6a8fcd7 100644 --- a/src/main/java/io/airlift/compress/lzo/LzoRawCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; import java.util.Arrays; -import static io.airlift.compress.lzo.LzoConstants.SIZE_OF_INT; -import static io.airlift.compress.lzo.LzoConstants.SIZE_OF_LONG; -import static io.airlift.compress.lzo.LzoConstants.SIZE_OF_SHORT; -import static io.airlift.compress.lzo.UnsafeUtil.UNSAFE; +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; final class LzoRawCompressor { diff --git a/src/main/java/io/airlift/compress/lzo/LzoRawDecompressor.java b/src/main/java/io/airlift/compress/v2/lzo/LzoRawDecompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/lzo/LzoRawDecompressor.java rename to src/main/java/io/airlift/compress/v2/lzo/LzoRawDecompressor.java index d96fe83c..f6f0e436 100644 --- a/src/main/java/io/airlift/compress/lzo/LzoRawDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; -import static io.airlift.compress.lzo.LzoConstants.SIZE_OF_INT; -import static io.airlift.compress.lzo.LzoConstants.SIZE_OF_LONG; -import static io.airlift.compress.lzo.LzoConstants.SIZE_OF_SHORT; -import static io.airlift.compress.lzo.UnsafeUtil.UNSAFE; +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 java.lang.Integer.toBinaryString; final class LzoRawDecompressor diff --git a/src/main/java/io/airlift/compress/lzo/LzopCodec.java b/src/main/java/io/airlift/compress/v2/lzo/LzopCodec.java similarity index 82% rename from src/main/java/io/airlift/compress/lzo/LzopCodec.java rename to src/main/java/io/airlift/compress/v2/lzo/LzopCodec.java index 99f206d7..7bdfc00c 100644 --- a/src/main/java/io/airlift/compress/lzo/LzopCodec.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.hadoop.CodecAdapter; +import io.airlift.compress.v2.hadoop.CodecAdapter; -import static io.airlift.compress.lzo.LzoCodec.getBufferSize; +import static io.airlift.compress.v2.lzo.LzoCodec.getBufferSize; public class LzopCodec extends CodecAdapter diff --git a/src/main/java/io/airlift/compress/lzo/LzopHadoopInputStream.java b/src/main/java/io/airlift/compress/v2/lzo/LzopHadoopInputStream.java similarity index 97% rename from src/main/java/io/airlift/compress/lzo/LzopHadoopInputStream.java rename to src/main/java/io/airlift/compress/v2/lzo/LzopHadoopInputStream.java index b26bab4d..f3055210 100644 --- a/src/main/java/io/airlift/compress/lzo/LzopHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.hadoop.HadoopInputStream; +import io.airlift.compress.v2.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.lzo.LzoConstants.LZOP_MAGIC; -import static io.airlift.compress.lzo.LzoConstants.LZO_1X_VARIANT; -import static io.airlift.compress.lzo.LzoConstants.SIZE_OF_LONG; +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 java.lang.String.format; import static java.util.Objects.requireNonNull; diff --git a/src/main/java/io/airlift/compress/lzo/LzopHadoopOutputStream.java b/src/main/java/io/airlift/compress/v2/lzo/LzopHadoopOutputStream.java similarity index 94% rename from src/main/java/io/airlift/compress/lzo/LzopHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v2/lzo/LzopHadoopOutputStream.java index af4fb971..f68f7139 100644 --- a/src/main/java/io/airlift/compress/lzo/LzopHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.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.lzo.LzoConstants.LZOP_MAGIC; -import static io.airlift.compress.lzo.LzoConstants.LZO_1X_VARIANT; -import static io.airlift.compress.lzo.LzoConstants.SIZE_OF_LONG; +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 java.util.Objects.requireNonNull; class LzopHadoopOutputStream diff --git a/src/main/java/io/airlift/compress/lzo/LzopHadoopStreams.java b/src/main/java/io/airlift/compress/v2/lzo/LzopHadoopStreams.java similarity index 89% rename from src/main/java/io/airlift/compress/lzo/LzopHadoopStreams.java rename to src/main/java/io/airlift/compress/v2/lzo/LzopHadoopStreams.java index f5b5e76d..5e72bf27 100644 --- a/src/main/java/io/airlift/compress/lzo/LzopHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.hadoop.HadoopInputStream; -import io.airlift.compress.hadoop.HadoopOutputStream; -import io.airlift.compress.hadoop.HadoopStreams; +import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopStreams; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/lzo/UnsafeUtil.java b/src/main/java/io/airlift/compress/v2/lzo/UnsafeUtil.java similarity index 95% rename from src/main/java/io/airlift/compress/lzo/UnsafeUtil.java rename to src/main/java/io/airlift/compress/v2/lzo/UnsafeUtil.java index defb8616..dec67892 100644 --- a/src/main/java/io/airlift/compress/lzo/UnsafeUtil.java +++ b/src/main/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.IncompatibleJvmException; +import io.airlift.compress.v2.IncompatibleJvmException; import sun.misc.Unsafe; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/snappy/Crc32C.java b/src/main/java/io/airlift/compress/v2/snappy/Crc32C.java similarity index 99% rename from src/main/java/io/airlift/compress/snappy/Crc32C.java rename to src/main/java/io/airlift/compress/v2/snappy/Crc32C.java index 70ef064c..3058b699 100644 --- a/src/main/java/io/airlift/compress/snappy/Crc32C.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; import java.util.zip.Checksum; diff --git a/src/main/java/io/airlift/compress/snappy/SnappyCodec.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyCodec.java similarity index 94% rename from src/main/java/io/airlift/compress/snappy/SnappyCodec.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyCodec.java index 0785a021..c29f46f8 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyCodec.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.hadoop.CodecAdapter; +import io.airlift.compress.v2.hadoop.CodecAdapter; import org.apache.hadoop.conf.Configuration; import java.util.Optional; diff --git a/src/main/java/io/airlift/compress/snappy/SnappyCompressor.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyCompressor.java similarity index 90% rename from src/main/java/io/airlift/compress/snappy/SnappyCompressor.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyCompressor.java index f44322a0..18423953 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.Compressor; +import io.airlift.compress.v2.Compressor; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/snappy/SnappyConstants.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyConstants.java similarity index 95% rename from src/main/java/io/airlift/compress/snappy/SnappyConstants.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyConstants.java index eea82751..e6ad808c 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyConstants.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; final class SnappyConstants { diff --git a/src/main/java/io/airlift/compress/snappy/SnappyDecompressor.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyDecompressor.java similarity index 90% rename from src/main/java/io/airlift/compress/snappy/SnappyDecompressor.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyDecompressor.java index 92965a3a..f9ed1e37 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.Decompressor; +import io.airlift.compress.v2.Decompressor; public sealed interface SnappyDecompressor extends Decompressor diff --git a/src/main/java/io/airlift/compress/snappy/SnappyFramed.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyFramed.java similarity index 96% rename from src/main/java/io/airlift/compress/snappy/SnappyFramed.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyFramed.java index 1e59ef3d..4686547d 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyFramed.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; /** * Constants for implementing x-snappy-framed. diff --git a/src/main/java/io/airlift/compress/snappy/SnappyFramedInputStream.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyFramedInputStream.java similarity index 98% rename from src/main/java/io/airlift/compress/snappy/SnappyFramedInputStream.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyFramedInputStream.java index 93b69c83..49cee35b 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyFramedInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; -import static io.airlift.compress.snappy.SnappyFramedOutputStream.MAX_BLOCK_SIZE; +import static io.airlift.compress.v2.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/snappy/SnappyFramedOutputStream.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyFramedOutputStream.java similarity index 99% rename from src/main/java/io/airlift/compress/snappy/SnappyFramedOutputStream.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyFramedOutputStream.java index ae626eb0..8b3210ae 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyFramedOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/snappy/SnappyHadoopInputStream.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopInputStream.java similarity index 97% rename from src/main/java/io/airlift/compress/snappy/SnappyHadoopInputStream.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopInputStream.java index 6465f0bc..dedb2311 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopInputStream; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import static io.airlift.compress.snappy.SnappyConstants.SIZE_OF_LONG; +import static io.airlift.compress.v2.snappy.SnappyConstants.SIZE_OF_LONG; class SnappyHadoopInputStream extends HadoopInputStream diff --git a/src/main/java/io/airlift/compress/snappy/SnappyHadoopOutputStream.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopOutputStream.java similarity index 95% rename from src/main/java/io/airlift/compress/snappy/SnappyHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopOutputStream.java index 9b64d814..1321ee3a 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; -import static io.airlift.compress.snappy.SnappyConstants.SIZE_OF_LONG; +import static io.airlift.compress.v2.snappy.SnappyConstants.SIZE_OF_LONG; import static java.util.Objects.requireNonNull; class SnappyHadoopOutputStream diff --git a/src/main/java/io/airlift/compress/snappy/SnappyHadoopStreams.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopStreams.java similarity index 90% rename from src/main/java/io/airlift/compress/snappy/SnappyHadoopStreams.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyHadoopStreams.java index 8ef2c8ed..d69dd907 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.hadoop.HadoopInputStream; -import io.airlift.compress.hadoop.HadoopOutputStream; -import io.airlift.compress.hadoop.HadoopStreams; +import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopStreams; import java.io.InputStream; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/snappy/SnappyInternalUtils.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyInternalUtils.java similarity index 99% rename from src/main/java/io/airlift/compress/snappy/SnappyInternalUtils.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyInternalUtils.java index bd7b9e44..7d03b294 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyInternalUtils.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/snappy/SnappyJavaCompressor.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyJavaCompressor.java similarity index 94% rename from src/main/java/io/airlift/compress/snappy/SnappyJavaCompressor.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyJavaCompressor.java index 22ccac15..5d059c00 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyJavaCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.snappy.UnsafeUtil.getAddress; -import static io.airlift.compress.snappy.UnsafeUtil.getBase; +import static io.airlift.compress.v2.snappy.UnsafeUtil.getAddress; +import static io.airlift.compress.v2.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/snappy/SnappyJavaDecompressor.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyJavaDecompressor.java similarity index 93% rename from src/main/java/io/airlift/compress/snappy/SnappyJavaDecompressor.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyJavaDecompressor.java index 91a7af69..3e1cca90 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyJavaDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.snappy.UnsafeUtil.getAddress; -import static io.airlift.compress.snappy.UnsafeUtil.getBase; +import static io.airlift.compress.v2.snappy.UnsafeUtil.getAddress; +import static io.airlift.compress.v2.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/snappy/SnappyNative.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyNative.java similarity index 95% rename from src/main/java/io/airlift/compress/snappy/SnappyNative.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyNative.java index b20ce666..fdc29bc5 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyNative.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.MalformedInputException; -import io.airlift.compress.internal.NativeLoader.Symbols; -import io.airlift.compress.internal.NativeSignature; +import io.airlift.compress.v2.MalformedInputException; +import io.airlift.compress.v2.internal.NativeLoader.Symbols; +import io.airlift.compress.v2.internal.NativeSignature; import java.lang.foreign.MemorySegment; import java.lang.invoke.MethodHandle; import java.util.Optional; -import static io.airlift.compress.internal.NativeLoader.loadSymbols; +import static io.airlift.compress.v2.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/snappy/SnappyNativeCompressor.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyNativeCompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/snappy/SnappyNativeCompressor.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyNativeCompressor.java index 66fc85ee..c7142aa6 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyNativeCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/snappy/SnappyNativeDecompressor.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyNativeDecompressor.java similarity index 95% rename from src/main/java/io/airlift/compress/snappy/SnappyNativeDecompressor.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyNativeDecompressor.java index a36f03d5..2f97ba42 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyNativeDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/snappy/SnappyRawCompressor.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyRawCompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/snappy/SnappyRawCompressor.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyRawCompressor.java index cda4781d..df61a3eb 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyRawCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; import java.util.Arrays; -import static io.airlift.compress.snappy.SnappyConstants.COPY_1_BYTE_OFFSET; -import static io.airlift.compress.snappy.SnappyConstants.COPY_2_BYTE_OFFSET; -import static io.airlift.compress.snappy.SnappyConstants.SIZE_OF_INT; -import static io.airlift.compress.snappy.SnappyConstants.SIZE_OF_LONG; -import static io.airlift.compress.snappy.SnappyConstants.SIZE_OF_SHORT; -import static io.airlift.compress.snappy.UnsafeUtil.UNSAFE; +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; final class SnappyRawCompressor { diff --git a/src/main/java/io/airlift/compress/snappy/SnappyRawDecompressor.java b/src/main/java/io/airlift/compress/v2/snappy/SnappyRawDecompressor.java similarity index 97% rename from src/main/java/io/airlift/compress/snappy/SnappyRawDecompressor.java rename to src/main/java/io/airlift/compress/v2/snappy/SnappyRawDecompressor.java index 589fe5d0..cbdefc11 100644 --- a/src/main/java/io/airlift/compress/snappy/SnappyRawDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; -import static io.airlift.compress.snappy.SnappyConstants.LITERAL; -import static io.airlift.compress.snappy.SnappyConstants.SIZE_OF_INT; -import static io.airlift.compress.snappy.SnappyConstants.SIZE_OF_LONG; -import static io.airlift.compress.snappy.UnsafeUtil.UNSAFE; +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; final class SnappyRawDecompressor { diff --git a/src/main/java/io/airlift/compress/snappy/UnsafeUtil.java b/src/main/java/io/airlift/compress/v2/snappy/UnsafeUtil.java similarity index 95% rename from src/main/java/io/airlift/compress/snappy/UnsafeUtil.java rename to src/main/java/io/airlift/compress/v2/snappy/UnsafeUtil.java index 759f00cb..68f96c53 100644 --- a/src/main/java/io/airlift/compress/snappy/UnsafeUtil.java +++ b/src/main/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.IncompatibleJvmException; +import io.airlift.compress.v2.IncompatibleJvmException; import sun.misc.Unsafe; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/zstd/BitInputStream.java b/src/main/java/io/airlift/compress/v2/zstd/BitInputStream.java similarity index 95% rename from src/main/java/io/airlift/compress/zstd/BitInputStream.java rename to src/main/java/io/airlift/compress/v2/zstd/BitInputStream.java index c1326ebc..87cb0064 100644 --- a/src/main/java/io/airlift/compress/zstd/BitInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import static io.airlift.compress.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.zstd.Util.highestBit; -import static io.airlift.compress.zstd.Util.verify; +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; /** * 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/zstd/BitOutputStream.java b/src/main/java/io/airlift/compress/v2/zstd/BitOutputStream.java similarity index 91% rename from src/main/java/io/airlift/compress/zstd/BitOutputStream.java rename to src/main/java/io/airlift/compress/v2/zstd/BitOutputStream.java index 766dc2ed..078f79e7 100644 --- a/src/main/java/io/airlift/compress/zstd/BitOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import static io.airlift.compress.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.zstd.Util.checkArgument; +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; class BitOutputStream { diff --git a/src/main/java/io/airlift/compress/zstd/BlockCompressionState.java b/src/main/java/io/airlift/compress/v2/zstd/BlockCompressionState.java similarity index 98% rename from src/main/java/io/airlift/compress/zstd/BlockCompressionState.java rename to src/main/java/io/airlift/compress/v2/zstd/BlockCompressionState.java index eff6ea3a..ada65a1b 100644 --- a/src/main/java/io/airlift/compress/zstd/BlockCompressionState.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.util.Arrays; diff --git a/src/main/java/io/airlift/compress/zstd/BlockCompressor.java b/src/main/java/io/airlift/compress/v2/zstd/BlockCompressor.java similarity index 96% rename from src/main/java/io/airlift/compress/zstd/BlockCompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/BlockCompressor.java index ac0d26c5..149af817 100644 --- a/src/main/java/io/airlift/compress/zstd/BlockCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; interface BlockCompressor { diff --git a/src/main/java/io/airlift/compress/zstd/CompressionContext.java b/src/main/java/io/airlift/compress/v2/zstd/CompressionContext.java similarity index 91% rename from src/main/java/io/airlift/compress/zstd/CompressionContext.java rename to src/main/java/io/airlift/compress/v2/zstd/CompressionContext.java index 26b14789..16c0b17a 100644 --- a/src/main/java/io/airlift/compress/zstd/CompressionContext.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import static io.airlift.compress.zstd.Constants.MAX_BLOCK_SIZE; -import static io.airlift.compress.zstd.Util.checkArgument; +import static io.airlift.compress.v2.zstd.Constants.MAX_BLOCK_SIZE; +import static io.airlift.compress.v2.zstd.Util.checkArgument; class CompressionContext { diff --git a/src/main/java/io/airlift/compress/zstd/CompressionParameters.java b/src/main/java/io/airlift/compress/v2/zstd/CompressionParameters.java similarity index 98% rename from src/main/java/io/airlift/compress/zstd/CompressionParameters.java rename to src/main/java/io/airlift/compress/v2/zstd/CompressionParameters.java index 8540314c..210f067e 100644 --- a/src/main/java/io/airlift/compress/zstd/CompressionParameters.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import static io.airlift.compress.zstd.Constants.MAX_BLOCK_SIZE; -import static io.airlift.compress.zstd.Constants.MAX_WINDOW_LOG; -import static io.airlift.compress.zstd.Constants.MIN_WINDOW_LOG; -import static io.airlift.compress.zstd.Util.cycleLog; -import static io.airlift.compress.zstd.Util.highestBit; +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; class CompressionParameters { diff --git a/src/main/java/io/airlift/compress/zstd/Constants.java b/src/main/java/io/airlift/compress/v2/zstd/Constants.java similarity index 98% rename from src/main/java/io/airlift/compress/zstd/Constants.java rename to src/main/java/io/airlift/compress/v2/zstd/Constants.java index d532cdf9..0b164e79 100644 --- a/src/main/java/io/airlift/compress/zstd/Constants.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; final class Constants { diff --git a/src/main/java/io/airlift/compress/zstd/DoubleFastBlockCompressor.java b/src/main/java/io/airlift/compress/v2/zstd/DoubleFastBlockCompressor.java similarity index 98% rename from src/main/java/io/airlift/compress/zstd/DoubleFastBlockCompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/DoubleFastBlockCompressor.java index 15e7991b..bcc7cf2b 100644 --- a/src/main/java/io/airlift/compress/zstd/DoubleFastBlockCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import static io.airlift.compress.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; +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; class DoubleFastBlockCompressor implements BlockCompressor diff --git a/src/main/java/io/airlift/compress/zstd/FiniteStateEntropy.java b/src/main/java/io/airlift/compress/v2/zstd/FiniteStateEntropy.java similarity index 97% rename from src/main/java/io/airlift/compress/zstd/FiniteStateEntropy.java rename to src/main/java/io/airlift/compress/v2/zstd/FiniteStateEntropy.java index f0aa2740..4e033916 100644 --- a/src/main/java/io/airlift/compress/zstd/FiniteStateEntropy.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; - -import static io.airlift.compress.zstd.BitInputStream.peekBits; -import static io.airlift.compress.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.zstd.Util.checkArgument; -import static io.airlift.compress.zstd.Util.verify; +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; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; final class FiniteStateEntropy diff --git a/src/main/java/io/airlift/compress/zstd/FrameHeader.java b/src/main/java/io/airlift/compress/v2/zstd/FrameHeader.java similarity index 96% rename from src/main/java/io/airlift/compress/zstd/FrameHeader.java rename to src/main/java/io/airlift/compress/v2/zstd/FrameHeader.java index 4fd6f200..e109f5e7 100644 --- a/src/main/java/io/airlift/compress/zstd/FrameHeader.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.util.Objects; import java.util.StringJoiner; -import static io.airlift.compress.zstd.Util.checkState; +import static io.airlift.compress.v2.zstd.Util.checkState; import static java.lang.Math.min; import static java.lang.Math.toIntExact; diff --git a/src/main/java/io/airlift/compress/zstd/FseCompressionTable.java b/src/main/java/io/airlift/compress/v2/zstd/FseCompressionTable.java similarity index 98% rename from src/main/java/io/airlift/compress/zstd/FseCompressionTable.java rename to src/main/java/io/airlift/compress/v2/zstd/FseCompressionTable.java index 94811f20..1e5ea032 100644 --- a/src/main/java/io/airlift/compress/zstd/FseCompressionTable.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import static io.airlift.compress.zstd.FiniteStateEntropy.MAX_SYMBOL; +import static io.airlift.compress.v2.zstd.FiniteStateEntropy.MAX_SYMBOL; class FseCompressionTable { diff --git a/src/main/java/io/airlift/compress/zstd/FseTableReader.java b/src/main/java/io/airlift/compress/v2/zstd/FseTableReader.java similarity index 94% rename from src/main/java/io/airlift/compress/zstd/FseTableReader.java rename to src/main/java/io/airlift/compress/v2/zstd/FseTableReader.java index c2204f1a..b1ac0417 100644 --- a/src/main/java/io/airlift/compress/zstd/FseTableReader.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import static io.airlift.compress.zstd.FiniteStateEntropy.MAX_SYMBOL; -import static io.airlift.compress.zstd.FiniteStateEntropy.MIN_TABLE_LOG; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.zstd.Util.highestBit; -import static io.airlift.compress.zstd.Util.verify; +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; class FseTableReader { diff --git a/src/main/java/io/airlift/compress/zstd/Histogram.java b/src/main/java/io/airlift/compress/v2/zstd/Histogram.java similarity index 94% rename from src/main/java/io/airlift/compress/zstd/Histogram.java rename to src/main/java/io/airlift/compress/v2/zstd/Histogram.java index 22946ce7..0362e7d6 100644 --- a/src/main/java/io/airlift/compress/zstd/Histogram.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.util.Arrays; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; final class Histogram diff --git a/src/main/java/io/airlift/compress/zstd/Huffman.java b/src/main/java/io/airlift/compress/v2/zstd/Huffman.java similarity index 96% rename from src/main/java/io/airlift/compress/zstd/Huffman.java rename to src/main/java/io/airlift/compress/v2/zstd/Huffman.java index 29fb74e3..7612bfb5 100644 --- a/src/main/java/io/airlift/compress/zstd/Huffman.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.util.Arrays; -import static io.airlift.compress.zstd.BitInputStream.isEndOfStream; -import static io.airlift.compress.zstd.BitInputStream.peekBitsFast; -import static io.airlift.compress.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.zstd.Util.isPowerOf2; -import static io.airlift.compress.zstd.Util.verify; +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; class Huffman { diff --git a/src/main/java/io/airlift/compress/zstd/HuffmanCompressionContext.java b/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionContext.java similarity index 98% rename from src/main/java/io/airlift/compress/zstd/HuffmanCompressionContext.java rename to src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionContext.java index be233294..21151c47 100644 --- a/src/main/java/io/airlift/compress/zstd/HuffmanCompressionContext.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; class HuffmanCompressionContext { diff --git a/src/main/java/io/airlift/compress/zstd/HuffmanCompressionTable.java b/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionTable.java similarity index 96% rename from src/main/java/io/airlift/compress/zstd/HuffmanCompressionTable.java rename to src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionTable.java index 4798d75d..20e43916 100644 --- a/src/main/java/io/airlift/compress/zstd/HuffmanCompressionTable.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.util.Arrays; -import static io.airlift.compress.zstd.Huffman.MAX_FSE_TABLE_LOG; -import static io.airlift.compress.zstd.Huffman.MAX_SYMBOL; -import static io.airlift.compress.zstd.Huffman.MAX_SYMBOL_COUNT; -import static io.airlift.compress.zstd.Huffman.MAX_TABLE_LOG; -import static io.airlift.compress.zstd.Huffman.MIN_TABLE_LOG; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.zstd.Util.checkArgument; -import static io.airlift.compress.zstd.Util.minTableLog; +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; final class HuffmanCompressionTable { diff --git a/src/main/java/io/airlift/compress/zstd/HuffmanCompressionTableWorkspace.java b/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionTableWorkspace.java similarity index 96% rename from src/main/java/io/airlift/compress/zstd/HuffmanCompressionTableWorkspace.java rename to src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressionTableWorkspace.java index efa877ec..9ca6c2fe 100644 --- a/src/main/java/io/airlift/compress/zstd/HuffmanCompressionTableWorkspace.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.util.Arrays; diff --git a/src/main/java/io/airlift/compress/zstd/HuffmanCompressor.java b/src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressor.java similarity index 95% rename from src/main/java/io/airlift/compress/zstd/HuffmanCompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/HuffmanCompressor.java index f5e738c1..519e1643 100644 --- a/src/main/java/io/airlift/compress/zstd/HuffmanCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import static io.airlift.compress.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; +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; final class HuffmanCompressor { diff --git a/src/main/java/io/airlift/compress/zstd/HuffmanTableWriterWorkspace.java b/src/main/java/io/airlift/compress/v2/zstd/HuffmanTableWriterWorkspace.java similarity index 81% rename from src/main/java/io/airlift/compress/zstd/HuffmanTableWriterWorkspace.java rename to src/main/java/io/airlift/compress/v2/zstd/HuffmanTableWriterWorkspace.java index 247717bb..fee6dc71 100644 --- a/src/main/java/io/airlift/compress/zstd/HuffmanTableWriterWorkspace.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import static io.airlift.compress.zstd.Huffman.MAX_FSE_TABLE_LOG; -import static io.airlift.compress.zstd.Huffman.MAX_SYMBOL; -import static io.airlift.compress.zstd.Huffman.MAX_TABLE_LOG; +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; class HuffmanTableWriterWorkspace { diff --git a/src/main/java/io/airlift/compress/zstd/NodeTable.java b/src/main/java/io/airlift/compress/v2/zstd/NodeTable.java similarity index 97% rename from src/main/java/io/airlift/compress/zstd/NodeTable.java rename to src/main/java/io/airlift/compress/v2/zstd/NodeTable.java index 0a82404c..0c14de1f 100644 --- a/src/main/java/io/airlift/compress/zstd/NodeTable.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.util.Arrays; diff --git a/src/main/java/io/airlift/compress/zstd/RepeatedOffsets.java b/src/main/java/io/airlift/compress/v2/zstd/RepeatedOffsets.java similarity index 96% rename from src/main/java/io/airlift/compress/zstd/RepeatedOffsets.java rename to src/main/java/io/airlift/compress/v2/zstd/RepeatedOffsets.java index 74cb1932..1c4efee9 100644 --- a/src/main/java/io/airlift/compress/zstd/RepeatedOffsets.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; class RepeatedOffsets { diff --git a/src/main/java/io/airlift/compress/zstd/SequenceEncoder.java b/src/main/java/io/airlift/compress/v2/zstd/SequenceEncoder.java similarity index 92% rename from src/main/java/io/airlift/compress/zstd/SequenceEncoder.java rename to src/main/java/io/airlift/compress/v2/zstd/SequenceEncoder.java index bb78fa12..97907ae6 100644 --- a/src/main/java/io/airlift/compress/zstd/SequenceEncoder.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; - -import static io.airlift.compress.zstd.Constants.DEFAULT_MAX_OFFSET_CODE_SYMBOL; -import static io.airlift.compress.zstd.Constants.LITERALS_LENGTH_BITS; -import static io.airlift.compress.zstd.Constants.LITERAL_LENGTH_TABLE_LOG; -import static io.airlift.compress.zstd.Constants.LONG_NUMBER_OF_SEQUENCES; -import static io.airlift.compress.zstd.Constants.MATCH_LENGTH_BITS; -import static io.airlift.compress.zstd.Constants.MATCH_LENGTH_TABLE_LOG; -import static io.airlift.compress.zstd.Constants.MAX_LITERALS_LENGTH_SYMBOL; -import static io.airlift.compress.zstd.Constants.MAX_MATCH_LENGTH_SYMBOL; -import static io.airlift.compress.zstd.Constants.MAX_OFFSET_CODE_SYMBOL; -import static io.airlift.compress.zstd.Constants.OFFSET_TABLE_LOG; -import static io.airlift.compress.zstd.Constants.SEQUENCE_ENCODING_BASIC; -import static io.airlift.compress.zstd.Constants.SEQUENCE_ENCODING_COMPRESSED; -import static io.airlift.compress.zstd.Constants.SEQUENCE_ENCODING_RLE; -import static io.airlift.compress.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.zstd.FiniteStateEntropy.optimalTableLog; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.zstd.Util.checkArgument; +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; final class SequenceEncoder { diff --git a/src/main/java/io/airlift/compress/zstd/SequenceEncodingContext.java b/src/main/java/io/airlift/compress/v2/zstd/SequenceEncodingContext.java similarity index 83% rename from src/main/java/io/airlift/compress/zstd/SequenceEncodingContext.java rename to src/main/java/io/airlift/compress/v2/zstd/SequenceEncodingContext.java index abc553a7..765bf028 100644 --- a/src/main/java/io/airlift/compress/zstd/SequenceEncodingContext.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import static io.airlift.compress.zstd.Constants.MAX_LITERALS_LENGTH_SYMBOL; -import static io.airlift.compress.zstd.Constants.MAX_MATCH_LENGTH_SYMBOL; -import static io.airlift.compress.zstd.Constants.MAX_OFFSET_CODE_SYMBOL; +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; class SequenceEncodingContext { diff --git a/src/main/java/io/airlift/compress/zstd/SequenceStore.java b/src/main/java/io/airlift/compress/v2/zstd/SequenceStore.java similarity index 97% rename from src/main/java/io/airlift/compress/zstd/SequenceStore.java rename to src/main/java/io/airlift/compress/v2/zstd/SequenceStore.java index 217500aa..aeabdcf4 100644 --- a/src/main/java/io/airlift/compress/zstd/SequenceStore.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import static io.airlift.compress.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_LONG; +import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; final class SequenceStore diff --git a/src/main/java/io/airlift/compress/zstd/UnsafeUtil.java b/src/main/java/io/airlift/compress/v2/zstd/UnsafeUtil.java similarity index 95% rename from src/main/java/io/airlift/compress/zstd/UnsafeUtil.java rename to src/main/java/io/airlift/compress/v2/zstd/UnsafeUtil.java index 98ac46a6..cd774bc3 100644 --- a/src/main/java/io/airlift/compress/zstd/UnsafeUtil.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.IncompatibleJvmException; +import io.airlift.compress.v2.IncompatibleJvmException; import sun.misc.Unsafe; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/zstd/Util.java b/src/main/java/io/airlift/compress/v2/zstd/Util.java similarity index 94% rename from src/main/java/io/airlift/compress/zstd/Util.java rename to src/main/java/io/airlift/compress/v2/zstd/Util.java index 8adc9144..9ac4dfd4 100644 --- a/src/main/java/io/airlift/compress/zstd/Util.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; -import static io.airlift.compress.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; +import static io.airlift.compress.v2.zstd.Constants.SIZE_OF_SHORT; +import static io.airlift.compress.v2.zstd.UnsafeUtil.UNSAFE; final class Util { diff --git a/src/main/java/io/airlift/compress/zstd/XxHash64.java b/src/main/java/io/airlift/compress/v2/zstd/XxHash64.java similarity index 97% rename from src/main/java/io/airlift/compress/zstd/XxHash64.java rename to src/main/java/io/airlift/compress/v2/zstd/XxHash64.java index 48609e93..bd9349a7 100644 --- a/src/main/java/io/airlift/compress/zstd/XxHash64.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.io.IOException; import java.io.InputStream; -import static io.airlift.compress.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.zstd.Util.checkPositionIndexes; +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 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/zstd/ZstdCodec.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdCodec.java similarity index 89% rename from src/main/java/io/airlift/compress/zstd/ZstdCodec.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdCodec.java index 4d5dd6b3..b57cd6cf 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdCodec.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.hadoop.CodecAdapter; +import io.airlift.compress.v2.hadoop.CodecAdapter; public class ZstdCodec extends CodecAdapter diff --git a/src/main/java/io/airlift/compress/zstd/ZstdCompressor.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdCompressor.java similarity index 90% rename from src/main/java/io/airlift/compress/zstd/ZstdCompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdCompressor.java index b8b98ab4..8c2a725c 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.Compressor; +import io.airlift.compress.v2.Compressor; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/zstd/ZstdDecompressor.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdDecompressor.java similarity index 89% rename from src/main/java/io/airlift/compress/zstd/ZstdDecompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdDecompressor.java index b05ca90d..44a164ca 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.Decompressor; +import io.airlift.compress.v2.Decompressor; public interface ZstdDecompressor extends Decompressor diff --git a/src/main/java/io/airlift/compress/zstd/ZstdFrameCompressor.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdFrameCompressor.java similarity index 93% rename from src/main/java/io/airlift/compress/zstd/ZstdFrameCompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdFrameCompressor.java index 63d19626..9fd80882 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdFrameCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; - -import static io.airlift.compress.zstd.Constants.COMPRESSED_BLOCK; -import static io.airlift.compress.zstd.Constants.COMPRESSED_LITERALS_BLOCK; -import static io.airlift.compress.zstd.Constants.MAGIC_NUMBER; -import static io.airlift.compress.zstd.Constants.MIN_BLOCK_SIZE; -import static io.airlift.compress.zstd.Constants.MIN_WINDOW_LOG; -import static io.airlift.compress.zstd.Constants.RAW_BLOCK; -import static io.airlift.compress.zstd.Constants.RAW_LITERALS_BLOCK; -import static io.airlift.compress.zstd.Constants.RLE_LITERALS_BLOCK; -import static io.airlift.compress.zstd.Constants.SIZE_OF_BLOCK_HEADER; -import static io.airlift.compress.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.zstd.Constants.TREELESS_LITERALS_BLOCK; -import static io.airlift.compress.zstd.Huffman.MAX_SYMBOL; -import static io.airlift.compress.zstd.Huffman.MAX_SYMBOL_COUNT; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.zstd.Util.checkArgument; -import static io.airlift.compress.zstd.Util.put24BitLittleEndian; +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; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; final class ZstdFrameCompressor diff --git a/src/main/java/io/airlift/compress/zstd/ZstdFrameDecompressor.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdFrameDecompressor.java similarity index 94% rename from src/main/java/io/airlift/compress/zstd/ZstdFrameDecompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdFrameDecompressor.java index 8476eec5..4c8c3b84 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdFrameDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; import java.util.Arrays; -import static io.airlift.compress.zstd.BitInputStream.peekBits; -import static io.airlift.compress.zstd.Constants.COMPRESSED_BLOCK; -import static io.airlift.compress.zstd.Constants.COMPRESSED_LITERALS_BLOCK; -import static io.airlift.compress.zstd.Constants.DEFAULT_MAX_OFFSET_CODE_SYMBOL; -import static io.airlift.compress.zstd.Constants.LITERALS_LENGTH_BITS; -import static io.airlift.compress.zstd.Constants.LITERAL_LENGTH_TABLE_LOG; -import static io.airlift.compress.zstd.Constants.LONG_NUMBER_OF_SEQUENCES; -import static io.airlift.compress.zstd.Constants.MAGIC_NUMBER; -import static io.airlift.compress.zstd.Constants.MATCH_LENGTH_BITS; -import static io.airlift.compress.zstd.Constants.MATCH_LENGTH_TABLE_LOG; -import static io.airlift.compress.zstd.Constants.MAX_BLOCK_SIZE; -import static io.airlift.compress.zstd.Constants.MAX_LITERALS_LENGTH_SYMBOL; -import static io.airlift.compress.zstd.Constants.MAX_MATCH_LENGTH_SYMBOL; -import static io.airlift.compress.zstd.Constants.MIN_BLOCK_SIZE; -import static io.airlift.compress.zstd.Constants.MIN_SEQUENCES_SIZE; -import static io.airlift.compress.zstd.Constants.MIN_WINDOW_LOG; -import static io.airlift.compress.zstd.Constants.OFFSET_TABLE_LOG; -import static io.airlift.compress.zstd.Constants.RAW_BLOCK; -import static io.airlift.compress.zstd.Constants.RAW_LITERALS_BLOCK; -import static io.airlift.compress.zstd.Constants.RLE_BLOCK; -import static io.airlift.compress.zstd.Constants.RLE_LITERALS_BLOCK; -import static io.airlift.compress.zstd.Constants.SEQUENCE_ENCODING_BASIC; -import static io.airlift.compress.zstd.Constants.SEQUENCE_ENCODING_COMPRESSED; -import static io.airlift.compress.zstd.Constants.SEQUENCE_ENCODING_REPEAT; -import static io.airlift.compress.zstd.Constants.SEQUENCE_ENCODING_RLE; -import static io.airlift.compress.zstd.Constants.SIZE_OF_BLOCK_HEADER; -import static io.airlift.compress.zstd.Constants.SIZE_OF_BYTE; -import static io.airlift.compress.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.zstd.Constants.SIZE_OF_SHORT; -import static io.airlift.compress.zstd.Constants.TREELESS_LITERALS_BLOCK; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.zstd.Util.fail; -import static io.airlift.compress.zstd.Util.get24BitLittleEndian; -import static io.airlift.compress.zstd.Util.mask; -import static io.airlift.compress.zstd.Util.verify; +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 java.lang.String.format; import static sun.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET; diff --git a/src/main/java/io/airlift/compress/zstd/ZstdHadoopInputStream.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopInputStream.java similarity index 94% rename from src/main/java/io/airlift/compress/zstd/ZstdHadoopInputStream.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopInputStream.java index 807e7353..4332a93e 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdHadoopInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/zstd/ZstdHadoopOutputStream.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopOutputStream.java similarity index 95% rename from src/main/java/io/airlift/compress/zstd/ZstdHadoopOutputStream.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopOutputStream.java index 28af1a22..e49a0f41 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdHadoopOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/io/airlift/compress/zstd/ZstdHadoopStreams.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopStreams.java similarity index 87% rename from src/main/java/io/airlift/compress/zstd/ZstdHadoopStreams.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdHadoopStreams.java index 7870f818..6516ae1e 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdHadoopStreams.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.hadoop.HadoopInputStream; -import io.airlift.compress.hadoop.HadoopOutputStream; -import io.airlift.compress.hadoop.HadoopStreams; +import io.airlift.compress.v2.hadoop.HadoopInputStream; +import io.airlift.compress.v2.hadoop.HadoopOutputStream; +import io.airlift.compress.v2.hadoop.HadoopStreams; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/io/airlift/compress/zstd/ZstdIncrementalFrameDecompressor.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdIncrementalFrameDecompressor.java similarity index 93% rename from src/main/java/io/airlift/compress/zstd/ZstdIncrementalFrameDecompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdIncrementalFrameDecompressor.java index c1993fc5..41cd8bfd 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdIncrementalFrameDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; import java.util.Arrays; -import static io.airlift.compress.zstd.Constants.COMPRESSED_BLOCK; -import static io.airlift.compress.zstd.Constants.MAX_BLOCK_SIZE; -import static io.airlift.compress.zstd.Constants.RAW_BLOCK; -import static io.airlift.compress.zstd.Constants.RLE_BLOCK; -import static io.airlift.compress.zstd.Constants.SIZE_OF_BLOCK_HEADER; -import static io.airlift.compress.zstd.Constants.SIZE_OF_INT; -import static io.airlift.compress.zstd.UnsafeUtil.UNSAFE; -import static io.airlift.compress.zstd.Util.checkArgument; -import static io.airlift.compress.zstd.Util.checkState; -import static io.airlift.compress.zstd.Util.fail; -import static io.airlift.compress.zstd.Util.verify; -import static io.airlift.compress.zstd.ZstdFrameDecompressor.MAX_WINDOW_SIZE; -import static io.airlift.compress.zstd.ZstdFrameDecompressor.decodeRawBlock; -import static io.airlift.compress.zstd.ZstdFrameDecompressor.decodeRleBlock; -import static io.airlift.compress.zstd.ZstdFrameDecompressor.readFrameHeader; -import static io.airlift.compress.zstd.ZstdFrameDecompressor.verifyMagic; +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 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/zstd/ZstdInputStream.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdInputStream.java similarity index 96% rename from src/main/java/io/airlift/compress/zstd/ZstdInputStream.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdInputStream.java index 2e9d377e..edfd834c 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdInputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.io.IOException; import java.io.InputStream; import java.util.Arrays; -import static io.airlift.compress.zstd.Util.checkPositionIndexes; -import static io.airlift.compress.zstd.Util.checkState; +import static io.airlift.compress.v2.zstd.Util.checkPositionIndexes; +import static io.airlift.compress.v2.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/zstd/ZstdJavaCompressor.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdJavaCompressor.java similarity index 92% rename from src/main/java/io/airlift/compress/zstd/ZstdJavaCompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdJavaCompressor.java index 5dc2cfa7..6b5ae3a3 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdJavaCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.zstd.Constants.MAX_BLOCK_SIZE; -import static io.airlift.compress.zstd.UnsafeUtil.getAddress; -import static io.airlift.compress.zstd.UnsafeUtil.getBase; +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 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/zstd/ZstdJavaDecompressor.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdJavaDecompressor.java similarity index 93% rename from src/main/java/io/airlift/compress/zstd/ZstdJavaDecompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdJavaDecompressor.java index 9f9ec682..992e93a5 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdJavaDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.zstd.UnsafeUtil.getAddress; -import static io.airlift.compress.zstd.UnsafeUtil.getBase; +import static io.airlift.compress.v2.zstd.UnsafeUtil.getAddress; +import static io.airlift.compress.v2.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/zstd/ZstdNative.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdNative.java similarity index 97% rename from src/main/java/io/airlift/compress/zstd/ZstdNative.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdNative.java index 7eb3e75e..58ce52d4 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdNative.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.internal.NativeLoader; -import io.airlift.compress.internal.NativeSignature; +import io.airlift.compress.v2.internal.NativeLoader; +import io.airlift.compress.v2.internal.NativeSignature; import java.lang.foreign.MemorySegment; import java.lang.invoke.MethodHandle; diff --git a/src/main/java/io/airlift/compress/zstd/ZstdNativeCompressor.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdNativeCompressor.java similarity index 94% rename from src/main/java/io/airlift/compress/zstd/ZstdNativeCompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdNativeCompressor.java index 7018ab02..5bdf5e12 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdNativeCompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.lang.foreign.MemorySegment; -import static io.airlift.compress.zstd.ZstdNative.DEFAULT_COMPRESSION_LEVEL; +import static io.airlift.compress.v2.zstd.ZstdNative.DEFAULT_COMPRESSION_LEVEL; import static java.lang.Math.toIntExact; public class ZstdNativeCompressor diff --git a/src/main/java/io/airlift/compress/zstd/ZstdNativeDecompressor.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdNativeDecompressor.java similarity index 98% rename from src/main/java/io/airlift/compress/zstd/ZstdNativeDecompressor.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdNativeDecompressor.java index e429d8b9..7ebd14b0 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdNativeDecompressor.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.lang.foreign.MemorySegment; diff --git a/src/main/java/io/airlift/compress/zstd/ZstdOutputStream.java b/src/main/java/io/airlift/compress/v2/zstd/ZstdOutputStream.java similarity index 95% rename from src/main/java/io/airlift/compress/zstd/ZstdOutputStream.java rename to src/main/java/io/airlift/compress/v2/zstd/ZstdOutputStream.java index 7a9a600f..a6e22332 100644 --- a/src/main/java/io/airlift/compress/zstd/ZstdOutputStream.java +++ b/src/main/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import java.io.IOException; import java.io.OutputStream; import java.util.Arrays; -import static io.airlift.compress.zstd.CompressionParameters.DEFAULT_COMPRESSION_LEVEL; -import static io.airlift.compress.zstd.Constants.SIZE_OF_BLOCK_HEADER; -import static io.airlift.compress.zstd.Constants.SIZE_OF_LONG; -import static io.airlift.compress.zstd.Util.checkState; +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 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/AbstractTestCompression.java b/src/test/java/io/airlift/compress/v2/AbstractTestCompression.java similarity index 99% rename from src/test/java/io/airlift/compress/AbstractTestCompression.java rename to src/test/java/io/airlift/compress/v2/AbstractTestCompression.java index 5721057f..90fa559d 100644 --- a/src/test/java/io/airlift/compress/AbstractTestCompression.java +++ b/src/test/java/io/airlift/compress/v2/AbstractTestCompression.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress; +package io.airlift.compress.v2; import com.google.common.primitives.Bytes; -import io.airlift.compress.benchmark.DataSet; +import io.airlift.compress.v2.benchmark.DataSet; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/airlift/compress/HadoopCodecCompressor.java b/src/test/java/io/airlift/compress/v2/HadoopCodecCompressor.java similarity index 96% rename from src/test/java/io/airlift/compress/HadoopCodecCompressor.java rename to src/test/java/io/airlift/compress/v2/HadoopCodecCompressor.java index 82f78e0a..ed4b5c42 100644 --- a/src/test/java/io/airlift/compress/HadoopCodecCompressor.java +++ b/src/test/java/io/airlift/compress/v2/HadoopCodecCompressor.java @@ -11,9 +11,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress; +package io.airlift.compress.v2; -import io.airlift.compress.snappy.ByteArrayOutputStream; +import io.airlift.compress.v2.snappy.ByteArrayOutputStream; import org.apache.hadoop.io.compress.CompressionCodec; import java.io.IOException; diff --git a/src/test/java/io/airlift/compress/HadoopCodecDecompressor.java b/src/test/java/io/airlift/compress/v2/HadoopCodecDecompressor.java similarity index 98% rename from src/test/java/io/airlift/compress/HadoopCodecDecompressor.java rename to src/test/java/io/airlift/compress/v2/HadoopCodecDecompressor.java index 057359b4..58339c26 100644 --- a/src/test/java/io/airlift/compress/HadoopCodecDecompressor.java +++ b/src/test/java/io/airlift/compress/v2/HadoopCodecDecompressor.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress; +package io.airlift.compress.v2; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/HadoopCodecDecompressorByteAtATime.java b/src/test/java/io/airlift/compress/v2/HadoopCodecDecompressorByteAtATime.java similarity index 98% rename from src/test/java/io/airlift/compress/HadoopCodecDecompressorByteAtATime.java rename to src/test/java/io/airlift/compress/v2/HadoopCodecDecompressorByteAtATime.java index 4afa6913..c8a5c5d3 100644 --- a/src/test/java/io/airlift/compress/HadoopCodecDecompressorByteAtATime.java +++ b/src/test/java/io/airlift/compress/v2/HadoopCodecDecompressorByteAtATime.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress; +package io.airlift.compress.v2; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/HadoopNative.java b/src/test/java/io/airlift/compress/v2/HadoopNative.java similarity index 99% rename from src/test/java/io/airlift/compress/HadoopNative.java rename to src/test/java/io/airlift/compress/v2/HadoopNative.java index 760952b8..17b0146b 100644 --- a/src/test/java/io/airlift/compress/HadoopNative.java +++ b/src/test/java/io/airlift/compress/v2/HadoopNative.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress; +package io.airlift.compress.v2; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/TestingData.java b/src/test/java/io/airlift/compress/v2/TestingData.java similarity index 94% rename from src/test/java/io/airlift/compress/TestingData.java rename to src/test/java/io/airlift/compress/v2/TestingData.java index cdc227ca..65d0b5fe 100644 --- a/src/test/java/io/airlift/compress/TestingData.java +++ b/src/test/java/io/airlift/compress/v2/TestingData.java @@ -11,10 +11,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress; +package io.airlift.compress.v2; import com.google.common.collect.ImmutableList; -import io.airlift.compress.benchmark.DataSet; +import io.airlift.compress.v2.benchmark.DataSet; import org.openjdk.jmh.annotations.Param; import java.io.IOException; diff --git a/src/test/java/io/airlift/compress/Util.java b/src/test/java/io/airlift/compress/v2/Util.java similarity index 97% rename from src/test/java/io/airlift/compress/Util.java rename to src/test/java/io/airlift/compress/v2/Util.java index e4c53077..5830b376 100644 --- a/src/test/java/io/airlift/compress/Util.java +++ b/src/test/java/io/airlift/compress/v2/Util.java @@ -11,7 +11,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.airlift.compress; +package io.airlift.compress.v2; import static java.lang.String.format; diff --git a/src/test/java/io/airlift/compress/benchmark/Algorithm.java b/src/test/java/io/airlift/compress/v2/benchmark/Algorithm.java similarity index 65% rename from src/test/java/io/airlift/compress/benchmark/Algorithm.java rename to src/test/java/io/airlift/compress/v2/benchmark/Algorithm.java index b37e1443..50ae6308 100644 --- a/src/test/java/io/airlift/compress/benchmark/Algorithm.java +++ b/src/test/java/io/airlift/compress/v2/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.benchmark; +package io.airlift.compress.v2.benchmark; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.lz4.Lz4Codec; -import io.airlift.compress.lz4.Lz4JavaCompressor; -import io.airlift.compress.lz4.Lz4JavaDecompressor; -import io.airlift.compress.lz4.Lz4NativeCompressor; -import io.airlift.compress.lz4.Lz4NativeDecompressor; -import io.airlift.compress.lzo.LzoCodec; -import io.airlift.compress.lzo.LzoCompressor; -import io.airlift.compress.lzo.LzoDecompressor; -import io.airlift.compress.snappy.SnappyCodec; -import io.airlift.compress.snappy.SnappyJavaCompressor; -import io.airlift.compress.snappy.SnappyJavaDecompressor; -import io.airlift.compress.snappy.SnappyNativeCompressor; -import io.airlift.compress.snappy.SnappyNativeDecompressor; -import io.airlift.compress.thirdparty.HadoopLzoCompressor; -import io.airlift.compress.thirdparty.HadoopLzoDecompressor; -import io.airlift.compress.thirdparty.JPountzLz4Compressor; -import io.airlift.compress.thirdparty.JPountzLz4Decompressor; -import io.airlift.compress.thirdparty.JdkDeflateCompressor; -import io.airlift.compress.thirdparty.JdkInflateDecompressor; -import io.airlift.compress.thirdparty.XerialSnappyCompressor; -import io.airlift.compress.thirdparty.XerialSnappyDecompressor; -import io.airlift.compress.thirdparty.ZstdJniCompressor; -import io.airlift.compress.thirdparty.ZstdJniDecompressor; -import io.airlift.compress.zstd.ZstdJavaCompressor; -import io.airlift.compress.zstd.ZstdJavaDecompressor; -import io.airlift.compress.zstd.ZstdNativeCompressor; -import io.airlift.compress.zstd.ZstdNativeDecompressor; +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 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/benchmark/BytesCounter.java b/src/test/java/io/airlift/compress/v2/benchmark/BytesCounter.java similarity index 94% rename from src/test/java/io/airlift/compress/benchmark/BytesCounter.java rename to src/test/java/io/airlift/compress/v2/benchmark/BytesCounter.java index 3df9ba08..adff894f 100644 --- a/src/test/java/io/airlift/compress/benchmark/BytesCounter.java +++ b/src/test/java/io/airlift/compress/v2/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.benchmark; +package io.airlift.compress.v2.benchmark; import org.openjdk.jmh.annotations.AuxCounters; import org.openjdk.jmh.annotations.Scope; diff --git a/src/test/java/io/airlift/compress/benchmark/CompressionBenchmark.java b/src/test/java/io/airlift/compress/v2/benchmark/CompressionBenchmark.java similarity index 97% rename from src/test/java/io/airlift/compress/benchmark/CompressionBenchmark.java rename to src/test/java/io/airlift/compress/v2/benchmark/CompressionBenchmark.java index bb266626..1bac959d 100644 --- a/src/test/java/io/airlift/compress/benchmark/CompressionBenchmark.java +++ b/src/test/java/io/airlift/compress/v2/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.benchmark; +package io.airlift.compress.v2.benchmark; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.Util; +import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v2.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/benchmark/DataSet.java b/src/test/java/io/airlift/compress/v2/benchmark/DataSet.java similarity index 98% rename from src/test/java/io/airlift/compress/benchmark/DataSet.java rename to src/test/java/io/airlift/compress/v2/benchmark/DataSet.java index 205fe42d..2047fdf1 100644 --- a/src/test/java/io/airlift/compress/benchmark/DataSet.java +++ b/src/test/java/io/airlift/compress/v2/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.benchmark; +package io.airlift.compress.v2.benchmark; import com.google.common.io.Files; import org.openjdk.jmh.annotations.Param; diff --git a/src/test/java/io/airlift/compress/bzip2/TestBZip2Codec.java b/src/test/java/io/airlift/compress/v2/bzip2/TestBZip2Codec.java similarity index 84% rename from src/test/java/io/airlift/compress/bzip2/TestBZip2Codec.java rename to src/test/java/io/airlift/compress/v2/bzip2/TestBZip2Codec.java index e92eb6a7..eaeb1640 100644 --- a/src/test/java/io/airlift/compress/bzip2/TestBZip2Codec.java +++ b/src/test/java/io/airlift/compress/v2/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.bzip2; +package io.airlift.compress.v2.bzip2; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopNative; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/bzip2/TestBZip2CodecByteAtATime.java b/src/test/java/io/airlift/compress/v2/bzip2/TestBZip2CodecByteAtATime.java similarity index 82% rename from src/test/java/io/airlift/compress/bzip2/TestBZip2CodecByteAtATime.java rename to src/test/java/io/airlift/compress/v2/bzip2/TestBZip2CodecByteAtATime.java index 0cf5a7c7..78a24415 100644 --- a/src/test/java/io/airlift/compress/bzip2/TestBZip2CodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v2/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.bzip2; +package io.airlift.compress.v2.bzip2; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.HadoopNative; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/deflate/MockJdkDeflateCompressor.java b/src/test/java/io/airlift/compress/v2/deflate/MockJdkDeflateCompressor.java similarity index 93% rename from src/test/java/io/airlift/compress/deflate/MockJdkDeflateCompressor.java rename to src/test/java/io/airlift/compress/v2/deflate/MockJdkDeflateCompressor.java index a8452e8f..2ce15c82 100644 --- a/src/test/java/io/airlift/compress/deflate/MockJdkDeflateCompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.deflate; +package io.airlift.compress.v2.deflate; -import io.airlift.compress.Compressor; +import io.airlift.compress.v2.Compressor; import java.lang.foreign.MemorySegment; diff --git a/src/test/java/io/airlift/compress/deflate/TestDeflate.java b/src/test/java/io/airlift/compress/v2/deflate/TestDeflate.java similarity index 91% rename from src/test/java/io/airlift/compress/deflate/TestDeflate.java rename to src/test/java/io/airlift/compress/v2/deflate/TestDeflate.java index 118ae4e3..83746ad6 100644 --- a/src/test/java/io/airlift/compress/deflate/TestDeflate.java +++ b/src/test/java/io/airlift/compress/v2/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.deflate; - -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopNative; -import io.airlift.compress.MalformedInputException; -import io.airlift.compress.lzo.LzoDecompressor; +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; import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/io/airlift/compress/deflate/TestJdkDeflateCodec.java b/src/test/java/io/airlift/compress/v2/deflate/TestJdkDeflateCodec.java similarity index 85% rename from src/test/java/io/airlift/compress/deflate/TestJdkDeflateCodec.java rename to src/test/java/io/airlift/compress/v2/deflate/TestJdkDeflateCodec.java index b23304ae..70e4221b 100644 --- a/src/test/java/io/airlift/compress/deflate/TestJdkDeflateCodec.java +++ b/src/test/java/io/airlift/compress/v2/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.deflate; +package io.airlift.compress.v2.deflate; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; +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 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/deflate/TestJdkDeflateCodecByteAtATime.java b/src/test/java/io/airlift/compress/v2/deflate/TestJdkDeflateCodecByteAtATime.java similarity index 82% rename from src/test/java/io/airlift/compress/deflate/TestJdkDeflateCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v2/deflate/TestJdkDeflateCodecByteAtATime.java index 99040de8..c41e3343 100644 --- a/src/test/java/io/airlift/compress/deflate/TestJdkDeflateCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v2/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.deflate; +package io.airlift.compress.v2.deflate; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopCodecDecompressorByteAtATime; +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 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/gzip/MockJdkGzipCompressor.java b/src/test/java/io/airlift/compress/v2/gzip/MockJdkGzipCompressor.java similarity index 94% rename from src/test/java/io/airlift/compress/gzip/MockJdkGzipCompressor.java rename to src/test/java/io/airlift/compress/v2/gzip/MockJdkGzipCompressor.java index 7000d37b..4c1a73f7 100644 --- a/src/test/java/io/airlift/compress/gzip/MockJdkGzipCompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.gzip; +package io.airlift.compress.v2.gzip; -import io.airlift.compress.Compressor; +import io.airlift.compress.v2.Compressor; import java.lang.foreign.MemorySegment; diff --git a/src/test/java/io/airlift/compress/gzip/TestJdkGzipCodec.java b/src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipCodec.java similarity index 85% rename from src/test/java/io/airlift/compress/gzip/TestJdkGzipCodec.java rename to src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipCodec.java index c4ba1e9b..973da19b 100644 --- a/src/test/java/io/airlift/compress/gzip/TestJdkGzipCodec.java +++ b/src/test/java/io/airlift/compress/v2/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.gzip; +package io.airlift.compress.v2.gzip; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/gzip/TestJdkGzipCodecByteAtATime.java b/src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipCodecByteAtATime.java similarity index 82% rename from src/test/java/io/airlift/compress/gzip/TestJdkGzipCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipCodecByteAtATime.java index 95ef9697..11c4c955 100644 --- a/src/test/java/io/airlift/compress/gzip/TestJdkGzipCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v2/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.gzip; +package io.airlift.compress.v2.gzip; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopCodecDecompressorByteAtATime; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/gzip/TestJdkGzipHadoopInputStream.java b/src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipHadoopInputStream.java similarity index 97% rename from src/test/java/io/airlift/compress/gzip/TestJdkGzipHadoopInputStream.java rename to src/test/java/io/airlift/compress/v2/gzip/TestJdkGzipHadoopInputStream.java index 919c6d36..bf7bc573 100644 --- a/src/test/java/io/airlift/compress/gzip/TestJdkGzipHadoopInputStream.java +++ b/src/test/java/io/airlift/compress/v2/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.gzip; +package io.airlift.compress.v2.gzip; import com.google.common.io.ByteStreams; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/airlift/compress/internal/TestNativeLoader.java b/src/test/java/io/airlift/compress/v2/internal/TestNativeLoader.java similarity index 98% rename from src/test/java/io/airlift/compress/internal/TestNativeLoader.java rename to src/test/java/io/airlift/compress/v2/internal/TestNativeLoader.java index 5d55b664..f1d291aa 100644 --- a/src/test/java/io/airlift/compress/internal/TestNativeLoader.java +++ b/src/test/java/io/airlift/compress/v2/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.internal; +package io.airlift.compress.v2.internal; -import io.airlift.compress.internal.NativeLoader.Symbols; +import io.airlift.compress.v2.internal.NativeLoader.Symbols; import org.junit.jupiter.api.Test; import java.lang.invoke.MethodHandle; diff --git a/src/test/java/io/airlift/compress/lz4/AbstractTestLz4.java b/src/test/java/io/airlift/compress/v2/lz4/AbstractTestLz4.java similarity index 96% rename from src/test/java/io/airlift/compress/lz4/AbstractTestLz4.java rename to src/test/java/io/airlift/compress/v2/lz4/AbstractTestLz4.java index 9026963e..c4e48938 100644 --- a/src/test/java/io/airlift/compress/lz4/AbstractTestLz4.java +++ b/src/test/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.AbstractTestCompression; +import io.airlift.compress.v2.AbstractTestCompression; import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/io/airlift/compress/lz4/BenchmarkCount.java b/src/test/java/io/airlift/compress/v2/lz4/BenchmarkCount.java similarity index 98% rename from src/test/java/io/airlift/compress/lz4/BenchmarkCount.java rename to src/test/java/io/airlift/compress/v2/lz4/BenchmarkCount.java index 307b635f..c4127edd 100644 --- a/src/test/java/io/airlift/compress/lz4/BenchmarkCount.java +++ b/src/test/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; diff --git a/src/test/java/io/airlift/compress/lz4/TestLz4.java b/src/test/java/io/airlift/compress/v2/lz4/TestLz4.java similarity index 82% rename from src/test/java/io/airlift/compress/lz4/TestLz4.java rename to src/test/java/io/airlift/compress/v2/lz4/TestLz4.java index 4eb1cb0a..04ce12d9 100644 --- a/src/test/java/io/airlift/compress/lz4/TestLz4.java +++ b/src/test/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.thirdparty.JPountzLz4Compressor; -import io.airlift.compress.thirdparty.JPountzLz4Decompressor; +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 net.jpountz.lz4.LZ4Factory; class TestLz4 diff --git a/src/test/java/io/airlift/compress/lz4/TestLz4Codec.java b/src/test/java/io/airlift/compress/v2/lz4/TestLz4Codec.java similarity index 83% rename from src/test/java/io/airlift/compress/lz4/TestLz4Codec.java rename to src/test/java/io/airlift/compress/v2/lz4/TestLz4Codec.java index 79a01b9f..89b21b71 100644 --- a/src/test/java/io/airlift/compress/lz4/TestLz4Codec.java +++ b/src/test/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopNative; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/lz4/TestLz4CodecByteAtATime.java b/src/test/java/io/airlift/compress/v2/lz4/TestLz4CodecByteAtATime.java similarity index 81% rename from src/test/java/io/airlift/compress/lz4/TestLz4CodecByteAtATime.java rename to src/test/java/io/airlift/compress/v2/lz4/TestLz4CodecByteAtATime.java index 89d96f3d..1a4f92ed 100644 --- a/src/test/java/io/airlift/compress/lz4/TestLz4CodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.HadoopNative; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/lz4/TestLz4Native.java b/src/test/java/io/airlift/compress/v2/lz4/TestLz4Native.java similarity index 82% rename from src/test/java/io/airlift/compress/lz4/TestLz4Native.java rename to src/test/java/io/airlift/compress/v2/lz4/TestLz4Native.java index 59869b17..fe2b9358 100644 --- a/src/test/java/io/airlift/compress/lz4/TestLz4Native.java +++ b/src/test/java/io/airlift/compress/v2/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.lz4; +package io.airlift.compress.v2.lz4; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.thirdparty.JPountzLz4Compressor; -import io.airlift.compress.thirdparty.JPountzLz4Decompressor; +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 net.jpountz.lz4.LZ4Factory; class TestLz4Native diff --git a/src/test/java/io/airlift/compress/lzo/TestLzo.java b/src/test/java/io/airlift/compress/v2/lzo/TestLzo.java similarity index 90% rename from src/test/java/io/airlift/compress/lzo/TestLzo.java rename to src/test/java/io/airlift/compress/v2/lzo/TestLzo.java index f8359bfb..67625790 100644 --- a/src/test/java/io/airlift/compress/lzo/TestLzo.java +++ b/src/test/java/io/airlift/compress/v2/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.lzo; - -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopNative; -import io.airlift.compress.MalformedInputException; -import io.airlift.compress.thirdparty.HadoopLzoCompressor; -import io.airlift.compress.thirdparty.HadoopLzoDecompressor; +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; import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/io/airlift/compress/lzo/TestLzoCodec.java b/src/test/java/io/airlift/compress/v2/lzo/TestLzoCodec.java similarity index 81% rename from src/test/java/io/airlift/compress/lzo/TestLzoCodec.java rename to src/test/java/io/airlift/compress/v2/lzo/TestLzoCodec.java index e8e2336b..97317f6b 100644 --- a/src/test/java/io/airlift/compress/lzo/TestLzoCodec.java +++ b/src/test/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopNative; -import io.airlift.compress.thirdparty.HadoopLzoCompressor; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/lzo/TestLzoCodecByteAtATime.java b/src/test/java/io/airlift/compress/v2/lzo/TestLzoCodecByteAtATime.java similarity index 79% rename from src/test/java/io/airlift/compress/lzo/TestLzoCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v2/lzo/TestLzoCodecByteAtATime.java index 4e82a3d9..bde7f7f2 100644 --- a/src/test/java/io/airlift/compress/lzo/TestLzoCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.HadoopNative; -import io.airlift.compress.thirdparty.HadoopLzoCompressor; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/lzo/TestLzopCodec.java b/src/test/java/io/airlift/compress/v2/lzo/TestLzopCodec.java similarity index 88% rename from src/test/java/io/airlift/compress/lzo/TestLzopCodec.java rename to src/test/java/io/airlift/compress/v2/lzo/TestLzopCodec.java index b4b2c1de..4f899463 100644 --- a/src/test/java/io/airlift/compress/lzo/TestLzopCodec.java +++ b/src/test/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; import com.google.common.io.Resources; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopNative; -import io.airlift.compress.thirdparty.HadoopLzoCompressor; +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 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/lzo/TestLzopCodecByteAtATime.java b/src/test/java/io/airlift/compress/v2/lzo/TestLzopCodecByteAtATime.java similarity index 79% rename from src/test/java/io/airlift/compress/lzo/TestLzopCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v2/lzo/TestLzopCodecByteAtATime.java index 9391f721..250dbb8e 100644 --- a/src/test/java/io/airlift/compress/lzo/TestLzopCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v2/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.lzo; +package io.airlift.compress.v2.lzo; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.HadoopNative; -import io.airlift.compress.thirdparty.HadoopLzoCompressor; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/snappy/AbstractTestSnappy.java b/src/test/java/io/airlift/compress/v2/snappy/AbstractTestSnappy.java similarity index 92% rename from src/test/java/io/airlift/compress/snappy/AbstractTestSnappy.java rename to src/test/java/io/airlift/compress/v2/snappy/AbstractTestSnappy.java index f96edbd0..a50fdb5a 100644 --- a/src/test/java/io/airlift/compress/snappy/AbstractTestSnappy.java +++ b/src/test/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.AbstractTestCompression; +import io.airlift.compress.v2.MalformedInputException; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/src/test/java/io/airlift/compress/snappy/ByteArrayOutputStream.java b/src/test/java/io/airlift/compress/v2/snappy/ByteArrayOutputStream.java similarity index 97% rename from src/test/java/io/airlift/compress/snappy/ByteArrayOutputStream.java rename to src/test/java/io/airlift/compress/v2/snappy/ByteArrayOutputStream.java index 84f7f53f..2e99ffe3 100644 --- a/src/test/java/io/airlift/compress/snappy/ByteArrayOutputStream.java +++ b/src/test/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; import java.io.OutputStream; diff --git a/src/test/java/io/airlift/compress/snappy/RandomGenerator.java b/src/test/java/io/airlift/compress/v2/snappy/RandomGenerator.java similarity index 98% rename from src/test/java/io/airlift/compress/snappy/RandomGenerator.java rename to src/test/java/io/airlift/compress/v2/snappy/RandomGenerator.java index 36b8f323..43b2cf52 100644 --- a/src/test/java/io/airlift/compress/snappy/RandomGenerator.java +++ b/src/test/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; import java.util.Random; diff --git a/src/test/java/io/airlift/compress/snappy/TestSnappyCodec.java b/src/test/java/io/airlift/compress/v2/snappy/TestSnappyCodec.java similarity index 84% rename from src/test/java/io/airlift/compress/snappy/TestSnappyCodec.java rename to src/test/java/io/airlift/compress/v2/snappy/TestSnappyCodec.java index 1a827e3d..b5508513 100644 --- a/src/test/java/io/airlift/compress/snappy/TestSnappyCodec.java +++ b/src/test/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopNative; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/snappy/TestSnappyCodecByteAtATime.java b/src/test/java/io/airlift/compress/v2/snappy/TestSnappyCodecByteAtATime.java similarity index 81% rename from src/test/java/io/airlift/compress/snappy/TestSnappyCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v2/snappy/TestSnappyCodecByteAtATime.java index d2b0d708..77822b6d 100644 --- a/src/test/java/io/airlift/compress/snappy/TestSnappyCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.HadoopNative; +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 org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.compress.CompressionCodec; diff --git a/src/test/java/io/airlift/compress/snappy/TestSnappyJava.java b/src/test/java/io/airlift/compress/v2/snappy/TestSnappyJava.java similarity index 81% rename from src/test/java/io/airlift/compress/snappy/TestSnappyJava.java rename to src/test/java/io/airlift/compress/v2/snappy/TestSnappyJava.java index 592ec81e..2924dfd0 100644 --- a/src/test/java/io/airlift/compress/snappy/TestSnappyJava.java +++ b/src/test/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.thirdparty.XerialSnappyCompressor; -import io.airlift.compress.thirdparty.XerialSnappyDecompressor; +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; class TestSnappyJava extends AbstractTestSnappy diff --git a/src/test/java/io/airlift/compress/snappy/TestSnappyNative.java b/src/test/java/io/airlift/compress/v2/snappy/TestSnappyNative.java similarity index 81% rename from src/test/java/io/airlift/compress/snappy/TestSnappyNative.java rename to src/test/java/io/airlift/compress/v2/snappy/TestSnappyNative.java index 105aeb60..bb97403a 100644 --- a/src/test/java/io/airlift/compress/snappy/TestSnappyNative.java +++ b/src/test/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.thirdparty.XerialSnappyCompressor; -import io.airlift.compress.thirdparty.XerialSnappyDecompressor; +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; public class TestSnappyNative extends AbstractTestSnappy diff --git a/src/test/java/io/airlift/compress/snappy/TestSnappyStream.java b/src/test/java/io/airlift/compress/v2/snappy/TestSnappyStream.java similarity index 99% rename from src/test/java/io/airlift/compress/snappy/TestSnappyStream.java rename to src/test/java/io/airlift/compress/v2/snappy/TestSnappyStream.java index afb082e3..bd318e58 100644 --- a/src/test/java/io/airlift/compress/snappy/TestSnappyStream.java +++ b/src/test/java/io/airlift/compress/v2/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.snappy; +package io.airlift.compress.v2.snappy; import com.google.common.base.Charsets; -import io.airlift.compress.TestingData; -import io.airlift.compress.benchmark.DataSet; +import io.airlift.compress.v2.TestingData; +import io.airlift.compress.v2.benchmark.DataSet; import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; diff --git a/src/test/java/io/airlift/compress/thirdparty/HadoopLzoCompressor.java b/src/test/java/io/airlift/compress/v2/thirdparty/HadoopLzoCompressor.java similarity index 96% rename from src/test/java/io/airlift/compress/thirdparty/HadoopLzoCompressor.java rename to src/test/java/io/airlift/compress/v2/thirdparty/HadoopLzoCompressor.java index 2f12bc8b..45c99001 100644 --- a/src/test/java/io/airlift/compress/thirdparty/HadoopLzoCompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.thirdparty; +package io.airlift.compress.v2.thirdparty; -import io.airlift.compress.Compressor; +import io.airlift.compress.v2.Compressor; import org.anarres.lzo.hadoop.codec.LzoCompressor; import java.io.IOException; diff --git a/src/test/java/io/airlift/compress/thirdparty/HadoopLzoDecompressor.java b/src/test/java/io/airlift/compress/v2/thirdparty/HadoopLzoDecompressor.java similarity index 94% rename from src/test/java/io/airlift/compress/thirdparty/HadoopLzoDecompressor.java rename to src/test/java/io/airlift/compress/v2/thirdparty/HadoopLzoDecompressor.java index ff6524c7..8dca4a9b 100644 --- a/src/test/java/io/airlift/compress/thirdparty/HadoopLzoDecompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.thirdparty; +package io.airlift.compress.v2.thirdparty; -import io.airlift.compress.Decompressor; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v2.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/thirdparty/JPountzLz4Compressor.java b/src/test/java/io/airlift/compress/v2/thirdparty/JPountzLz4Compressor.java similarity index 94% rename from src/test/java/io/airlift/compress/thirdparty/JPountzLz4Compressor.java rename to src/test/java/io/airlift/compress/v2/thirdparty/JPountzLz4Compressor.java index 78efa2cc..9d179ec4 100644 --- a/src/test/java/io/airlift/compress/thirdparty/JPountzLz4Compressor.java +++ b/src/test/java/io/airlift/compress/v2/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.thirdparty; +package io.airlift.compress.v2.thirdparty; -import io.airlift.compress.Compressor; +import io.airlift.compress.v2.Compressor; import net.jpountz.lz4.LZ4Compressor; import net.jpountz.lz4.LZ4Factory; diff --git a/src/test/java/io/airlift/compress/thirdparty/JPountzLz4Decompressor.java b/src/test/java/io/airlift/compress/v2/thirdparty/JPountzLz4Decompressor.java similarity index 91% rename from src/test/java/io/airlift/compress/thirdparty/JPountzLz4Decompressor.java rename to src/test/java/io/airlift/compress/v2/thirdparty/JPountzLz4Decompressor.java index 25ce649f..f90ced5c 100644 --- a/src/test/java/io/airlift/compress/thirdparty/JPountzLz4Decompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.thirdparty; +package io.airlift.compress.v2.thirdparty; -import io.airlift.compress.Decompressor; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v2.MalformedInputException; import net.jpountz.lz4.LZ4Factory; import net.jpountz.lz4.LZ4SafeDecompressor; diff --git a/src/test/java/io/airlift/compress/thirdparty/JdkDeflateCompressor.java b/src/test/java/io/airlift/compress/v2/thirdparty/JdkDeflateCompressor.java similarity index 94% rename from src/test/java/io/airlift/compress/thirdparty/JdkDeflateCompressor.java rename to src/test/java/io/airlift/compress/v2/thirdparty/JdkDeflateCompressor.java index c62a47e1..83539b8f 100644 --- a/src/test/java/io/airlift/compress/thirdparty/JdkDeflateCompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.thirdparty; +package io.airlift.compress.v2.thirdparty; -import io.airlift.compress.Compressor; +import io.airlift.compress.v2.Compressor; import java.lang.foreign.MemorySegment; import java.util.zip.Deflater; diff --git a/src/test/java/io/airlift/compress/thirdparty/JdkInflateDecompressor.java b/src/test/java/io/airlift/compress/v2/thirdparty/JdkInflateDecompressor.java similarity index 91% rename from src/test/java/io/airlift/compress/thirdparty/JdkInflateDecompressor.java rename to src/test/java/io/airlift/compress/v2/thirdparty/JdkInflateDecompressor.java index 1f1954a8..fc3ec8ce 100644 --- a/src/test/java/io/airlift/compress/thirdparty/JdkInflateDecompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.thirdparty; +package io.airlift.compress.v2.thirdparty; -import io.airlift.compress.Decompressor; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v2.MalformedInputException; import java.lang.foreign.MemorySegment; import java.util.zip.DataFormatException; diff --git a/src/test/java/io/airlift/compress/thirdparty/XerialSnappyCompressor.java b/src/test/java/io/airlift/compress/v2/thirdparty/XerialSnappyCompressor.java similarity index 90% rename from src/test/java/io/airlift/compress/thirdparty/XerialSnappyCompressor.java rename to src/test/java/io/airlift/compress/v2/thirdparty/XerialSnappyCompressor.java index 9c4c07cf..fccf6de2 100644 --- a/src/test/java/io/airlift/compress/thirdparty/XerialSnappyCompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.thirdparty; +package io.airlift.compress.v2.thirdparty; -import io.airlift.compress.Compressor; -import io.airlift.compress.snappy.SnappyJavaCompressor; +import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v2.snappy.SnappyJavaCompressor; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/src/test/java/io/airlift/compress/thirdparty/XerialSnappyDecompressor.java b/src/test/java/io/airlift/compress/v2/thirdparty/XerialSnappyDecompressor.java similarity index 90% rename from src/test/java/io/airlift/compress/thirdparty/XerialSnappyDecompressor.java rename to src/test/java/io/airlift/compress/v2/thirdparty/XerialSnappyDecompressor.java index e593e295..967e873f 100644 --- a/src/test/java/io/airlift/compress/thirdparty/XerialSnappyDecompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.thirdparty; +package io.airlift.compress.v2.thirdparty; -import io.airlift.compress.Decompressor; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v2.MalformedInputException; import java.io.IOException; import java.lang.foreign.MemorySegment; diff --git a/src/test/java/io/airlift/compress/thirdparty/ZstdJniCompressor.java b/src/test/java/io/airlift/compress/v2/thirdparty/ZstdJniCompressor.java similarity index 94% rename from src/test/java/io/airlift/compress/thirdparty/ZstdJniCompressor.java rename to src/test/java/io/airlift/compress/v2/thirdparty/ZstdJniCompressor.java index 80471e58..87b98051 100644 --- a/src/test/java/io/airlift/compress/thirdparty/ZstdJniCompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.thirdparty; +package io.airlift.compress.v2.thirdparty; import com.github.luben.zstd.Zstd; -import io.airlift.compress.Compressor; +import io.airlift.compress.v2.Compressor; import java.lang.foreign.MemorySegment; import java.nio.ByteBuffer; diff --git a/src/test/java/io/airlift/compress/thirdparty/ZstdJniDecompressor.java b/src/test/java/io/airlift/compress/v2/thirdparty/ZstdJniDecompressor.java similarity index 90% rename from src/test/java/io/airlift/compress/thirdparty/ZstdJniDecompressor.java rename to src/test/java/io/airlift/compress/v2/thirdparty/ZstdJniDecompressor.java index d2d9fe5c..963219ae 100644 --- a/src/test/java/io/airlift/compress/thirdparty/ZstdJniDecompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.thirdparty; +package io.airlift.compress.v2.thirdparty; import com.github.luben.zstd.Zstd; -import io.airlift.compress.Decompressor; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v2.MalformedInputException; import java.lang.foreign.MemorySegment; import java.nio.ByteBuffer; diff --git a/src/test/java/io/airlift/compress/zstd/AbstractTestZstd.java b/src/test/java/io/airlift/compress/v2/zstd/AbstractTestZstd.java similarity index 97% rename from src/test/java/io/airlift/compress/zstd/AbstractTestZstd.java rename to src/test/java/io/airlift/compress/v2/zstd/AbstractTestZstd.java index df070a9e..7d1269e0 100644 --- a/src/test/java/io/airlift/compress/zstd/AbstractTestZstd.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import com.google.common.io.Resources; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.TestingData; -import io.airlift.compress.benchmark.DataSet; +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 org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; diff --git a/src/test/java/io/airlift/compress/zstd/TestCompressor.java b/src/test/java/io/airlift/compress/v2/zstd/TestCompressor.java similarity index 99% rename from src/test/java/io/airlift/compress/zstd/TestCompressor.java rename to src/test/java/io/airlift/compress/v2/zstd/TestCompressor.java index 10582be9..e0984353 100644 --- a/src/test/java/io/airlift/compress/zstd/TestCompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/airlift/compress/zstd/TestUtil.java b/src/test/java/io/airlift/compress/v2/zstd/TestUtil.java similarity index 93% rename from src/test/java/io/airlift/compress/zstd/TestUtil.java rename to src/test/java/io/airlift/compress/v2/zstd/TestUtil.java index 4f54f6f0..3540e23c 100644 --- a/src/test/java/io/airlift/compress/zstd/TestUtil.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import com.google.common.collect.ImmutableList; import org.junit.jupiter.api.Test; import java.util.List; -import static io.airlift.compress.zstd.Util.get24BitLittleEndian; -import static io.airlift.compress.zstd.Util.put24BitLittleEndian; +import static io.airlift.compress.v2.zstd.Util.get24BitLittleEndian; +import static io.airlift.compress.v2.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/zstd/TestXxHash64.java b/src/test/java/io/airlift/compress/v2/zstd/TestXxHash64.java similarity index 98% rename from src/test/java/io/airlift/compress/zstd/TestXxHash64.java rename to src/test/java/io/airlift/compress/v2/zstd/TestXxHash64.java index 9de3551f..a12c0210 100644 --- a/src/test/java/io/airlift/compress/zstd/TestXxHash64.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import net.jpountz.xxhash.XXHash64; import net.jpountz.xxhash.XXHashFactory; diff --git a/src/test/java/io/airlift/compress/zstd/TestZstd.java b/src/test/java/io/airlift/compress/v2/zstd/TestZstd.java similarity index 81% rename from src/test/java/io/airlift/compress/zstd/TestZstd.java rename to src/test/java/io/airlift/compress/v2/zstd/TestZstd.java index d1b6ed73..9ef8a710 100644 --- a/src/test/java/io/airlift/compress/zstd/TestZstd.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.thirdparty.ZstdJniCompressor; -import io.airlift.compress.thirdparty.ZstdJniDecompressor; +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; public class TestZstd extends AbstractTestZstd diff --git a/src/test/java/io/airlift/compress/zstd/TestZstdCodec.java b/src/test/java/io/airlift/compress/v2/zstd/TestZstdCodec.java similarity index 85% rename from src/test/java/io/airlift/compress/zstd/TestZstdCodec.java rename to src/test/java/io/airlift/compress/v2/zstd/TestZstdCodec.java index a418f175..9475bf74 100644 --- a/src/test/java/io/airlift/compress/zstd/TestZstdCodec.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import com.google.common.io.Resources; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressor; -import io.airlift.compress.thirdparty.ZstdJniCompressor; -import io.airlift.compress.thirdparty.ZstdJniDecompressor; +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 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/zstd/TestZstdCodecByteAtATime.java b/src/test/java/io/airlift/compress/v2/zstd/TestZstdCodecByteAtATime.java similarity index 85% rename from src/test/java/io/airlift/compress/zstd/TestZstdCodecByteAtATime.java rename to src/test/java/io/airlift/compress/v2/zstd/TestZstdCodecByteAtATime.java index 7c067a2f..32049267 100644 --- a/src/test/java/io/airlift/compress/zstd/TestZstdCodecByteAtATime.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import com.google.common.io.Resources; -import io.airlift.compress.AbstractTestCompression; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.HadoopCodecCompressor; -import io.airlift.compress.HadoopCodecDecompressorByteAtATime; -import io.airlift.compress.thirdparty.ZstdJniCompressor; -import io.airlift.compress.thirdparty.ZstdJniDecompressor; +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 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/zstd/TestZstdNative.java b/src/test/java/io/airlift/compress/v2/zstd/TestZstdNative.java similarity index 81% rename from src/test/java/io/airlift/compress/zstd/TestZstdNative.java rename to src/test/java/io/airlift/compress/v2/zstd/TestZstdNative.java index dcd84da7..8e09e968 100644 --- a/src/test/java/io/airlift/compress/zstd/TestZstdNative.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.thirdparty.ZstdJniCompressor; -import io.airlift.compress.thirdparty.ZstdJniDecompressor; +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; public class TestZstdNative extends AbstractTestZstd diff --git a/src/test/java/io/airlift/compress/zstd/TestZstdPartial.java b/src/test/java/io/airlift/compress/v2/zstd/TestZstdPartial.java similarity index 91% rename from src/test/java/io/airlift/compress/zstd/TestZstdPartial.java rename to src/test/java/io/airlift/compress/v2/zstd/TestZstdPartial.java index 0c93f9e2..6e965c3c 100644 --- a/src/test/java/io/airlift/compress/zstd/TestZstdPartial.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import com.google.common.io.Resources; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v2.MalformedInputException; import java.io.IOException; diff --git a/src/test/java/io/airlift/compress/zstd/TestZstdStream.java b/src/test/java/io/airlift/compress/v2/zstd/TestZstdStream.java similarity index 91% rename from src/test/java/io/airlift/compress/zstd/TestZstdStream.java rename to src/test/java/io/airlift/compress/v2/zstd/TestZstdStream.java index 8d926f40..e7e8ca78 100644 --- a/src/test/java/io/airlift/compress/zstd/TestZstdStream.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; import com.google.common.io.Resources; -import io.airlift.compress.Compressor; -import io.airlift.compress.Decompressor; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.Compressor; +import io.airlift.compress.v2.Decompressor; +import io.airlift.compress.v2.MalformedInputException; import java.io.IOException; diff --git a/src/test/java/io/airlift/compress/zstd/ZstdPartialDecompressor.java b/src/test/java/io/airlift/compress/v2/zstd/ZstdPartialDecompressor.java similarity index 98% rename from src/test/java/io/airlift/compress/zstd/ZstdPartialDecompressor.java rename to src/test/java/io/airlift/compress/v2/zstd/ZstdPartialDecompressor.java index 399dccf6..1784d607 100644 --- a/src/test/java/io/airlift/compress/zstd/ZstdPartialDecompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; import java.lang.foreign.MemorySegment; diff --git a/src/test/java/io/airlift/compress/zstd/ZstdStreamCompressor.java b/src/test/java/io/airlift/compress/v2/zstd/ZstdStreamCompressor.java similarity index 96% rename from src/test/java/io/airlift/compress/zstd/ZstdStreamCompressor.java rename to src/test/java/io/airlift/compress/v2/zstd/ZstdStreamCompressor.java index a38a40e9..58abe524 100644 --- a/src/test/java/io/airlift/compress/zstd/ZstdStreamCompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.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.zstd.Constants.MAX_BLOCK_SIZE; +import static io.airlift.compress.v2.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/zstd/ZstdStreamDecompressor.java b/src/test/java/io/airlift/compress/v2/zstd/ZstdStreamDecompressor.java similarity index 96% rename from src/test/java/io/airlift/compress/zstd/ZstdStreamDecompressor.java rename to src/test/java/io/airlift/compress/v2/zstd/ZstdStreamDecompressor.java index b5b10b59..800318af 100644 --- a/src/test/java/io/airlift/compress/zstd/ZstdStreamDecompressor.java +++ b/src/test/java/io/airlift/compress/v2/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.zstd; +package io.airlift.compress.v2.zstd; -import io.airlift.compress.MalformedInputException; +import io.airlift.compress.v2.MalformedInputException; import java.io.ByteArrayInputStream; import java.io.IOException;