Skip to content

fix: sharding race condition #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brokkoli71 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: sharding race condition #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 18 additions & 18 deletions src/main/java/dev/zarr/zarrjava/v3/codec/core/ShardingIndexedCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ public ByteBuffer encode(final Array shardArray) throws ZarrException {
extendArrayBy1(chunksPerShard, 2));
final List<ByteBuffer> chunkBytesList = new ArrayList<>(chunkCount);

Arrays.stream(
IndexingUtils.computeChunkCoords(shardMetadata.shape, shardMetadata.chunkShape))
Arrays.stream(IndexingUtils.computeChunkCoords(shardMetadata.shape, shardMetadata.chunkShape))
.parallel()
.forEach(
chunkCoords -> {
Expand All @@ -128,8 +127,10 @@ public ByteBuffer encode(final Array shardArray) throws ZarrException {
null
);
if (MultiArrayUtils.allValuesEqual(chunkArray, shardMetadata.parsedFillValue)) {
setValueFromShardIndexArray(shardIndexArray, chunkCoords, 0, -1);
setValueFromShardIndexArray(shardIndexArray, chunkCoords, 1, -1);
synchronized (chunkBytesList) {
setValueFromShardIndexArray(shardIndexArray, chunkCoords, 0, -1);
setValueFromShardIndexArray(shardIndexArray, chunkCoords, 1, -1);
}
} else {
final ByteBuffer chunkBytes = codecPipeline.encode(chunkArray);
synchronized (chunkBytesList) {
Expand Down Expand Up @@ -207,33 +208,32 @@ private Array decodeInternal(
Utils.toLongArray(shape));

Arrays.stream(allChunkCoords)
// .parallel()
.parallel()
.forEach(
chunkCoords -> {
try {
final long chunkByteOffset = getValueFromShardIndexArray(shardIndexArray,
chunkCoords, 0);
final long chunkByteLength = getValueFromShardIndexArray(shardIndexArray,
chunkCoords, 1);
Array chunkArray = null;
if (chunkByteOffset == -1 || chunkByteLength == -1) {
return;
}
final IndexingUtils.ChunkProjection chunkProjection =
IndexingUtils.computeProjection(chunkCoords, shardMetadata.shape,
shardMetadata.chunkShape, offset, Utils.toLongArray(shape)
);
if (chunkByteOffset != -1 && chunkByteLength != -1) {
final ByteBuffer chunkBytes = dataProvider.read(chunkByteOffset, chunkByteLength);
if (chunkBytes == null) {
throw new ZarrException(String.format("Could not load byte data for chunk %s",
Arrays.toString(chunkCoords)));
}
chunkArray = codecPipeline.decode(chunkBytes);
final ByteBuffer chunkBytes = dataProvider.read(chunkByteOffset, chunkByteLength);
if (chunkBytes == null) {
throw new ZarrException(String.format("Could not load byte data for chunk %s",
Arrays.toString(chunkCoords)));
}
if (chunkArray == null) {
chunkArray = shardMetadata.allocateFillValueChunk();
Array chunkArray = codecPipeline.decode(chunkBytes);
synchronized (outputArray) {
MultiArrayUtils.copyRegion(chunkArray, chunkProjection.chunkOffset, outputArray,
chunkProjection.outOffset, chunkProjection.shape
);
}
MultiArrayUtils.copyRegion(chunkArray, chunkProjection.chunkOffset, outputArray,
chunkProjection.outOffset, chunkProjection.shape
);
} catch (ZarrException e) {
throw new RuntimeException(e);
}
Expand Down
Loading