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

Jump to bottom

Assert correct dtype for segment index file #7698

Merged
merged 6 commits into from
Mar 20, 2024
Merged

Assert correct dtype for segment index file #7698

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c57089
Assert correct dtype for segment index file
frcroth Mar 18, 2024
8f87d73
Update Changelog
frcroth Mar 18, 2024
5f10c52
Fix typo preventing returning error
frcroth Mar 18, 2024
863e44c
Make error more verbose
frcroth Mar 18, 2024
7458250
Add tryo before assertion
frcroth Mar 20, 2024
d07bc74
Merge branch 'master' into segment-index-file-assert-dtype
frcroth Mar 20, 2024
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
3 changes: 2 additions & 1 deletion CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
- Added the config key `webKnossos.user.timeTrackingOnlyWithSignificantChanges`, which when set to `true` will only track time if the user has made significant changes to the annotation. [#7627](https://github.com/scalableminds/webknossos/pull/7627)
- Only display UI elements to launch background jobs if the (worker) backend actually supports them. [#7591](https://github.com/scalableminds/webknossos/pull/7591)
- If the current dataset folder in the dashboard cannot be found (e.g., because somebody else deleted it), the page navigates to the root folder automatically. [#7669](https://github.com/scalableminds/webknossos/pull/7669)
- Voxelytics logs are now stored by organization name, rather than id, in Loki. This is inpreparation of the unificaction of these two concepts. [#7687](https://github.com/scalableminds/webknossos/pull/7687)
- Voxelytics logs are now stored by organization name, rather than id, in Loki. This is in preparation of the unification of these two concepts. [#7687](https://github.com/scalableminds/webknossos/pull/7687)
- Using a segment index file with a different data type than uint16 will now result in an error. [#7698](https://github.com/scalableminds/webknossos/pull/7698)

### Fixed
- Fixed rare SIGBUS crashes of the datastore module that were caused by memory mapping on unstable file systems. [#7528](https://github.com/scalableminds/webknossos/pull/7528)
Expand Down
4 changes: 3 additions & 1 deletion ...tastore/app/com/scalableminds/webknossos/datastore/services/SegmentIndexFileService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,10 @@ class SegmentIndexFileService @Inject()(config: DataStoreConfig,
_ <- Fox.successful(())
topLeftStart = buckets(bucketLocalOffset)(1)
topLeftEnd = buckets(bucketLocalOffset)(2)
_ <- Fox
.bool2Fox(segmentIndex.reader.string().getAttr("/", "dtype_bucket_entries") == "uint16") ?~> "value for dtype_bucket_entries in segment index file is not supported, only uint16 is supported"
frcroth marked this conversation as resolved.
Show resolved Hide resolved
topLefts = segmentIndex.reader
.uint16() // Read datatype from attributes?
.uint16()
.readMatrixBlockWithOffset("top_lefts", (topLeftEnd - topLeftStart).toInt, 3, topLeftStart, 0)
} yield topLefts)
} yield topLeftOpts
Expand Down