Merge branch 'master' into mkitti-v3-prototype

Author: mkitti

Project.toml

@@ -7,6 +7,7 @@ version = "0.9.4"
 AWSS3 = "1c724243-ef5b-51ab-93f4-b0a88ac62a95"
 Blosc = "a74b3585-a348-5f62-a45c-50e91977d574"
 CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
+ChunkCodecCore = "0b6fb165-00bc-4d37-ab8b-79f91016dbe1"
 ChunkCodecLibZstd = "55437552-ac27-4d47-9aa3-63184e8fd398"
 CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -24,8 +25,9 @@ ZipArchives = "49080126-0e18-4c2a-b176-c102e4b3760c"
 [compat]
 AWSS3 = "0.10, 0.11"
 Blosc = "0.5, 0.6, 0.7"
-CRC32c = "1.11.0"
-ChunkCodecLibZstd = "0.1.1"
+CRC32c = "1.10, 1.11"
+ChunkCodecCore = "0.4.2, 0.5"
+ChunkCodecLibZstd = "0.1.2, 0.2"
 CodecZlib = "0.6, 0.7"
 DataStructures = "0.17, 0.18"
 DateTimes64 = "1"
@@ -36,4 +38,4 @@ OffsetArrays = "0.11, 1.0"
 OpenSSL = "1"
 URIs = "1"
 ZipArchives = "2"
-julia = "1.2"
+julia = "1.10"

src/Compressors/zstd.jl

@@ -3,10 +3,8 @@
 
 This file implements a Zstd compressor via ChunkCodecLibZstd.jl.
 
-=#
-
-using ChunkCodecLibZstd: ZstdEncodeOptions, encode, decode, ChunkCodecCore
-
+using ChunkCodecLibZstd: ZstdEncodeOptions
+using ChunkCodecCore: encode, decode, decode!
 
 """
     ZstdCompressor(;level=0, checksum=false)
@@ -33,10 +31,7 @@ function zuncompress(a, z::ZstdCompressor, T)
 end
 
 function zuncompress!(data::DenseArray, compressed, z::ZstdCompressor)
-    dst = reinterpret(UInt8, vec(data))
-    n = length(dst)
-    n_decoded = something(ChunkCodecCore.try_decode!(z.config.codec, dst, compressed))::Int64
-    n_decoded == n || error("expected to decode $n bytes, only got $n_decoded bytes")
+    decode!(z.config.codec, reinterpret(UInt8, vec(data)), compressed)
     data
 end