Skip to content

Fix bug where the checksum of zipfiles is wrong #930

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

Merged
merged 3 commits into from
Jan 6, 2022
Merged

Fix bug where the checksum of zipfiles is wrong #930

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
317de6f
Fix bug where the checksum of zipfiles is wrong
orenwatson Jan 5, 2022
6dee888
add test and use a view instead of a copy
orenwatson Jan 5, 2022
a68f7c9
Merge branch 'master' into orenwatson-patch-zipfile-bug
jakirkham Jan 6, 2022
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
2 changes: 1 addition & 1 deletion zarr/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1565,7 +1565,7 @@ def __setitem__(self, key, value):
else:
keyinfo.external_attr = 0o644 << 16 # ?rw-r--r--

self.zf.writestr(keyinfo, value)
self.zf.writestr(keyinfo, value.tobytes())
Copy link
Member

@jakirkham jakirkham Jan 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would introduce an additional copy before writing to disk.

Guessing the issue is ZipFile assumes data here is uint8 even if that may not be the case. Also suspect this only happens when a compressor is not used (otherwise this would already be the case)

Would suggest changing line 1554 above to add .view("u1") to cast to uint8. This should have the same end result (data is represented as uint8), but not cause a copy

Copy link
Contributor Author

@orenwatson orenwatson Jan 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. I'll write a test case as well.

Copy link
Contributor Author

@orenwatson orenwatson Jan 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test is added now.


def __delitem__(self, key):
raise NotImplementedError
Expand Down