Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/main/java/dev/zarr/zarrjava/v2/codec/core/GzipCodec.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import dev.zarr.zarrjava.v2.codec.Codec;

import java.nio.ByteBuffer;
import java.util.zip.Deflater;

public class GzipCodec extends dev.zarr.zarrjava.core.codec.core.GzipCodec implements Codec {

Expand All @@ -20,8 +21,8 @@ public class GzipCodec extends dev.zarr.zarrjava.core.codec.core.GzipCodec imple
public GzipCodec(
@JsonProperty(value = "level", defaultValue = "" + DEFAULT_LEVEL) int level)
throws ZarrException {
if (level < 0 || level > 9) {
throw new ZarrException("'level' needs to be between 0 and 9.");
if (level < Deflater.DEFAULT_COMPRESSION || level > 9) {
throw new ZarrException("'level' needs to be between -1 and 9.");
}
this.level = level;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/dev/zarr/zarrjava/v2/codec/core/ZlibCodec.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public class ZlibCodec extends BytesBytesCodec implements Codec {
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
public ZlibCodec(
@JsonProperty(value = "level", defaultValue = "1") int level) throws ZarrException {
if (level < 0 || level > 9) {
throw new ZarrException("'level' needs to be between 0 and 9.");
if (level < Deflater.DEFAULT_COMPRESSION || level > 9) {
throw new ZarrException("'level' needs to be between -1 and 9.");
}
this.level = level;
}
Expand Down
35 changes: 35 additions & 0 deletions src/test/java/dev/zarr/zarrjava/ZarrV2Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,41 @@ public void testReadBloscAutoShuffle(String dataType, String expectedShuffle)
Assertions.assertEquals(127, readData.getInt(127));
}

@ParameterizedTest
@ValueSource(strings = {"gzip", "zlib"})
public void testReadDefaultCompressionLevel(String compressorId)
throws IOException, ZarrException {
String arrayName = "v2_default_level_" + compressorId;
StoreHandle storeHandle = new FilesystemStore(TESTOUTPUT).resolve(arrayName);
ucar.ma2.Array testData =
ucar.ma2.Array.factory(ucar.ma2.DataType.UBYTE, new int[]{16, 16});
for (int i = 0; i < testData.getSize(); i++) {
testData.setInt(i, i % 128);
}
ArrayMetadataBuilder metadataBuilder = Array.metadataBuilder()
.withShape(16, 16)
.withDataType(DataType.UINT8)
.withChunks(8, 8);
Array array = Array.create(
storeHandle,
(compressorId.equals("gzip")
? metadataBuilder.withGzipCompressor(1)
: metadataBuilder.withZlibCompressor(1)).build()
);
array.write(testData);

Path zarrayPath = TESTOUTPUT.resolve(arrayName).resolve(ZARRAY);
String zarray = new String(Files.readAllBytes(zarrayPath));
String defaultLevelZarray = zarray.replaceFirst("\"level\"\\s*:\\s*1", "\"level\": -1");
Assertions.assertTrue(defaultLevelZarray.contains("\"level\": -1"), zarray);
Files.write(zarrayPath, defaultLevelZarray.getBytes());

Array reopenedArray = Array.open(storeHandle);
ucar.ma2.Array readData = reopenedArray.read();
Assertions.assertEquals(16 * 16, readData.getSize());
Assertions.assertEquals(127, readData.getInt(127));
}

@ParameterizedTest
@CsvSource({
"BOOL", "FLOAT64"
Expand Down
Loading