Skip to content
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

fix(error): Fix error passthrough in queued tasks #145

Merged
merged 3 commits into from
Dec 9, 2023
Merged

fix(error): Fix error passthrough in queued tasks #145

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af55dd7
fix(error): Fix error passthrough in queued tasks
az0uz Jul 19, 2023
3fdc465
Merge branch 'master' into az0uz/fix_async_error_passthrough
az0uz Oct 22, 2023
a42434a
cleanup: remove IIFE, move progress callback inside queued task
az0uz Dec 8, 2023
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
28 changes: 16 additions & 12 deletions src/core/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,28 +339,30 @@ export class ZarrArray<StoreGetOptions = any> {
// create promise queue with concurrency control
const queue = new PQueue({ concurrency: concurrencyLimit });

const allTasks = [];

if (progressCallback) {

let progress = 0;
let queueSize = 0;
for (const _ of indexer.iter()) queueSize += 1;
progressCallback({ progress: 0, queueSize: queueSize });
for (const proj of indexer.iter()) {
(async () => {
await queue.add(() => this.chunkGetItem(proj.chunkCoords, proj.chunkSelection, out, proj.outSelection, indexer.dropAxes, storeOptions));
allTasks.push(queue.add(async () => {
await this.chunkGetItem(proj.chunkCoords, proj.chunkSelection, out, proj.outSelection, indexer.dropAxes, storeOptions);
progress += 1;
progressCallback({ progress: progress, queueSize: queueSize });
})();
}));
}

} else {
for (const proj of indexer.iter()) {
queue.add(() => this.chunkGetItem(proj.chunkCoords, proj.chunkSelection, out, proj.outSelection, indexer.dropAxes, storeOptions));
allTasks.push(queue.add(() => this.chunkGetItem(proj.chunkCoords, proj.chunkSelection, out, proj.outSelection, indexer.dropAxes, storeOptions)));
}
}

// guarantees that all work on queue has finished
await queue.onIdle();
// guarantees that all work on queue has finished and throws if any of the tasks errored.
await Promise.all(allTasks);

// Return scalar instead of zero-dimensional array.
if (out.shape.length === 0) {
Expand Down Expand Up @@ -594,6 +596,8 @@ export class ZarrArray<StoreGetOptions = any> {

const queue = new PQueue({ concurrency: concurrencyLimit });

const allTasks = [];

if (progressCallback) {

let queueSize = 0;
Expand All @@ -603,24 +607,24 @@ export class ZarrArray<StoreGetOptions = any> {
progressCallback({ progress: 0, queueSize: queueSize });
for (const proj of indexer.iter()) {
const chunkValue = this.getChunkValue(proj, indexer, value, selectionShape);
(async () => {
await queue.add(() => this.chunkSetItem(proj.chunkCoords, proj.chunkSelection, chunkValue));
allTasks.push(queue.add(async () => {
await this.chunkSetItem(proj.chunkCoords, proj.chunkSelection, chunkValue);
progress += 1;
progressCallback({ progress: progress, queueSize: queueSize });
})();
}));
}

} else {

for (const proj of indexer.iter()) {
const chunkValue = this.getChunkValue(proj, indexer, value, selectionShape);
queue.add(() => this.chunkSetItem(proj.chunkCoords, proj.chunkSelection, chunkValue));
allTasks.push(queue.add(() => this.chunkSetItem(proj.chunkCoords, proj.chunkSelection, chunkValue)));
}

}

// guarantees that all work on queue has finished
await queue.onIdle();
// guarantees that all work on queue has finished and throws if any of the tasks errored.
await Promise.all(allTasks);
}

private async chunkSetItem(chunkCoords: number[], chunkSelection: DimensionSelection[], value: number | NestedArray<TypedArray>) {
Expand Down