Rely on git hashes for manifest update #12182
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
jgraham
approved these changes
Jul 25, 2018
tools/manifest/vcs.py
Outdated
| local_changes = self._local_changes() | ||
| for result in self.git(*cmd).split("\0")[:-1]: | ||
| rel_path = result.split("\t")[-1] | ||
| hash = result.split()[2] |
There was a problem hiding this comment.
hash is also a bult-in function so maybe change the variable name.
tools/manifest/sourcefile.py
Outdated
| if not self._hash: | ||
| with self.open() as f: | ||
| content = f.read() | ||
| data = "blob " + str(len(content)) + "\0" + content |
There was a problem hiding this comment.
So, I wonder if you profiled "".join(["blob ", str(len(content)), "\0", content]) and "blob %d\0%s" % (len(content), content) vs this approach where the manifest isn't being generated from git (e.g. if you pass --work to the update). I don't know which is fastest, but it seems worth trying.
There was a problem hiding this comment.
Profiled them and seems like joins over tuples are the fastest of dealing with very long strings. On my system, at least.
There was a problem hiding this comment.
OK, sounds like a good idea to switch to that then.
There was a problem hiding this comment.
And they'll definitely be quicker on PyPy, given the lack of refcounting means they can't do the ugly CPython hack.
We earlier hashed all in-tree files when updating the manifest. Relying on git hashes instead gives us a speedup of ~50% when running |wpt manifest| With reference to web-platform-tests#11388
jgraham
approved these changes
Jul 25, 2018
aarongable
pushed a commit
to chromium/chromium
that referenced
this pull request
Aug 31, 2018
Mainly for the .serviceworker. change in tools/manifest/item.py, from web-platform-tests/wpt#12381 port/driver.py is updated accordingly to match upstream wptrunner to use HTTPS for .serviceworker. tests. This fixes an infrastructure/ test. Multiple other .serviceworker. tests are also rebaselined. There have been two recent manifest changes: web-platform-tests/wpt#12182 web-platform-tests/wpt#12563 (version bump) In order to not require a full manifest rebuild once this lands, WPT_BASE_MANIFEST.json needs to be updated. However, updating it in place has proven very difficult due to the size of the resulting diff. Instead, a WPT_BASE_MANIFEST_5.json is created. The old one will be deleted separately. Related Gerrit bug: https://bugs.chromium.org/p/gerrit/issues/detail?id=9640 This also brings in HTTP/2.0 support from web-platform-tests/wpt#12193. For this, new third_party python code is needed, namely h2, hpack, hyperframe, and enum. In addition to adding those to WPTWhiteList, it is also sorted and lines which aren't existing files (i.e., directories and removed files) are dropped. Reviewed at https://chromium-review.googlesource.com/1183425 but size of CL causing trouble updating it on Gerrit. [email protected] Bug: 876717 Change-Id: Ia43bd2eca54883a5d72a48008b6677d0e7187056 Reviewed-on: https://chromium-review.googlesource.com/1196424 Reviewed-by: Robert Ma <[email protected]> Reviewed-by: Philip Jägenstedt <[email protected]> Commit-Queue: Philip Jägenstedt <[email protected]> Cr-Commit-Position: refs/heads/master@{#588057}
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.
We earlier hashed all in-tree files when updating the manifest.
Relying on git hashes instead gives us a speedup of ~50%
when running |wpt manifest|
With reference to #11388