-
Notifications
You must be signed in to change notification settings - Fork 100
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.
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
add file size hash; make image acquisition date optional #2847
add file size hash; make image acquisition date optional #2847
Conversation
Conflicts: components/model/resources/mappings/acquisition.ome.xml
Conflicts: components/common/src/ome/util/checksum/FileSizeChecksumProviderImpl.java
Conflicts: components/common/test/ome/util/checksum/FileSizeChecksumProviderImplTest.java
Conflicts: components/common/src/ome/util/checksum/AbstractChecksumProviderReverseEndian.java
This PR needs a |
Okay to remove the |
The DB changes are the ones that worry me the least, so happy to remove. |
@mtbc: checking other sections of code I can think of before merging. |
@mtbc: in |
@@ -188,6 +189,7 @@ public void init(Helper helper) { | |||
try { | |||
sf = reg.getInternalServiceFactory( | |||
sessionUuid, "unused", 3, 1, clientUuid); | |||
MetadataTools.setDefaultDateEnabled(false); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mtbc: in discussing with @melissalinkert probably best to remove this, and in favor for making the default in Bio-Formats false
. Once you've opened that PR, they can be linked together with a --depends-on
.
This reverts commit fc7b561 because the default in Bio-Formats is to be toggled.
In |
Tested with a local server@HEAD of develop which later got upgraded to snoopy's merge build.
I can't see any issues with the diff, so I'd say this is good to merge. |
@mtbc: tested with some other images after yesterday stress. |
I will do some final tests tomorrow am. |
unless anybody wants to have a final check, we should probably merge the PR. |
It's been a week and listed in stand-up a few times: I think that everybody who might have wanted to probably already has. (-: |
See #2892. Integration tests using fake image with and without acquisition dates pass. Ready to merge. |
…date add file size hash; make image acquisition date optional
Adds the
File-Size-64
hasher, adjustsAdler-32
andCRC-32
to use Guava implementations, and tweaks some import log retrieval.To test,
Adler-32
and/orCRC-32
OMERO5.1DEV__7
File-Size-64
File-Size-64
, their hash is a small-endian representation of their sizenull
acquisition dates do not cause obvious problems: for instance, that images can still be viewed, exported, etc.--rebased-from #2741 and fixes http://trac.openmicroscopy.org.uk/ome/ticket/12465