Merge lp://staging/~jelmer/bzr/hpss-get-inventories into lp://staging/bzr
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6372 |
Proposed branch: | lp://staging/~jelmer/bzr/hpss-get-inventories |
Merge into: | lp://staging/bzr |
Prerequisite: | lp://staging/~jelmer/bzr/hpss-_get-checkout-format |
Diff against target: |
728 lines (+372/-52) 17 files modified
bzrlib/remote.py (+171/-5) bzrlib/smart/repository.py (+58/-1) bzrlib/smart/request.py (+6/-3) bzrlib/tests/blackbox/test_annotate.py (+1/-1) bzrlib/tests/blackbox/test_branch.py (+3/-3) bzrlib/tests/blackbox/test_cat.py (+2/-3) bzrlib/tests/blackbox/test_checkout.py (+3/-8) bzrlib/tests/blackbox/test_export.py (+2/-3) bzrlib/tests/blackbox/test_log.py (+4/-6) bzrlib/tests/blackbox/test_ls.py (+2/-3) bzrlib/tests/blackbox/test_sign_my_commits.py (+4/-12) bzrlib/tests/per_interbranch/test_push.py (+2/-2) bzrlib/tests/per_repository_chk/test_supported.py (+11/-1) bzrlib/tests/per_repository_vf/test_add_inventory_by_delta.py (+1/-1) bzrlib/tests/test_remote.py (+41/-0) bzrlib/tests/test_smart.py (+48/-0) doc/en/release-notes/bzr-2.5.txt (+13/-0) |
To merge this branch: | bzr merge lp://staging/~jelmer/bzr/hpss-get-inventories |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | Approve | ||
Vincent Ladeuil | Approve | ||
Andrew Bennetts | Pending | ||
Review via email: mp+85252@code.staging.launchpad.net |
This proposal supersedes a proposal from 2011-11-29.
Commit message
Add HPSS call for retrieving inventories.
Description of the change
Add a HPSS call for ``Repository.
This massively reduces the number of roundtrips for various commands, and causes a fair number to no longer use VFS calls at all when used against a modern remote server.
Repository.
Unlike my previous attempt at this, this now uses record streams with inventory deltas. It is still a separate verb though.
Timings when checking out bzr.dev:
~/src/bzr/ hpss-get- inventories/ bzr co --lightweight bzr://people. samba.org/ bzr.dev 2.25s user 0.46s system 15% cpu 17.277 total hpss-get- inventories/ bzr export /tmp/bzr.dev2 bzr://people. samba.org/ bzr.dev 1.54s user 0.40s system 12% cpu 15.435 total
~/src/bzr/
versus against an older bzr server:
~/src/bzr/ hpss-get- inventories/ bzr co --lightweight bzr://people. samba.org/ bzr.dev 4.91s user 1.03s system 10% cpu 58.807 total hpss-get- inventories/ bzr export /tmp/bzr.dev5 bzr://people. samba.org/ bzr.dev 4.35s user 0.98s system 9% cpu 58.357 total
~/src/bzr/