Make DOS timestamp local time zone independent #738
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lukaciko
commented
Aug 30, 2022
shs96c
requested changes
Aug 30, 2022
private/tools/java/rules/jvm/external/jar/AddJarManifestEntry.java
Outdated
Show resolved
Hide resolved
| .atZone(ZoneId.systemDefault()) | ||
| .toInstant() | ||
| .toEpochMilli(); | ||
| private static final LocalDateTime DEFAULT_TIMESTAMP = LocalDateTime.of(2010, 1, 1, 0, 0, 0); |
There was a problem hiding this comment.
Really, what we want is the timestamp of a well-known date in UTC. I think the fundamental mistake we made was using LocalDateTime here. Once we have those millis, we shouldn't need to do any timestamp manipulation. The main problem is we can't use 0 since zip files only encode dates from some time in the 1980s.
lukaciko
force-pushed
the
dos-time
branch
2 times, most recently
from
7861f91
to
f646a49
Compare
shs96c
requested changes
Sep 16, 2022
|
@shs96c sorry for taking some time with this PR. We've cherry picked it into our builds at Spotify and it has resolved the remote caching issues we had. Now we essentially get 100% remote cache hit rate on local builds when building a commit that was already built by the CI agent. Thank you for the review. Please see my comments and let me know what you think. |
shs96c
approved these changes
Sep 20, 2022
This was referenced Oct 7, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Adds tests replicating and fixes #735.
The
ZipEntryAPIs are pretty limited when it comes to querying and setting timestamps. The getters return the extended timestamp if that is present and MS-DOS timestamp otherwise, but there is no indication of which one was returned.This change ensures that the manifest timestamp is always 2010-01-01, even if the system default changes during runtime. The rest of ZIP entries are copied over entirely so their modification timestamps (both extended and MS-DOS) remain the same. This also means that some other data is copied over which previously wasn't - flags, access time, creation time. I don't think that would be a problem, but I might be missing something.