Merge lp:~jameinel/bzr/1.16-chk-direct into lp:~bzr/bzr/trunk-old
Status: | Merged |
---|---|
Merged at revision: | not available |
Proposed branch: | lp:~jameinel/bzr/1.16-chk-direct |
Merge into: | lp:~bzr/bzr/trunk-old |
Diff against target: | 200 lines |
To merge this branch: | bzr merge lp:~jameinel/bzr/1.16-chk-direct |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pool | 2009-06-08 | Approve on 2009-06-16 | |
Review via email:
|
John A Meinel (jameinel) wrote : | # |
Martin Pool (mbp) wrote : | # |
I'm not very familiar with the chkmap code you're changing here, but I don't see any problems with this patch. Were you wanting to talk about any particular issue here, or is there a list thread about it?
- 4422. By John A Meinel on 2009-06-17
-
Some cleanup. Move the check that from_dict works into test_chk_map.
- 4423. By John A Meinel on 2009-06-17
-
Clean upt the test_inv tests that assumed _root_node was real and not just a key.
- 4424. By John A Meinel on 2009-06-17
-
Pull out the common 'populate this CHKInventory' code out into a helper
and share it between the creators. - 4425. By John A Meinel on 2009-06-17
-
Merge bzr.dev 4454 in prep for NEWS
- 4426. By John A Meinel on 2009-06-17
-
NEWS entry about --2a improvement.
- 4427. By John A Meinel on 2009-06-18
-
The new add_inventory_
by_delta is returning a CHKInventory when mapping from NULL
Which is completely valid, but 'broke' one of the tests.
So to fix it, changed the test to use CHKInventories on both sides, and add an __eq__
member. The nice thing is that CHKInventory.__eq__ is fairly cheap, since it only
has to check the root keys. - 4428. By John A Meinel on 2009-06-18
-
Merge bzr.dev 4460 resolving NEWS
This is a bit more of an [RFC] than a strict [MERGE], but I figured it would be good to get some feedback on the route I'm taking.
With the attached patch (and most of my other proposed updates for commit w/ dev6 format repositories) I've managed to get the time for initial commit of a MySQL repository down to ~ equivalent to the XML time.
For comparison:
dev6 15.5s
1.9 11.6s
dev6+ 13.5s
dev6-all 11.6s
So this patch by itself saves approximately 2s, or 10-20% of the time for
initial commit.
The main change is to get away from calling CHKMap.map() for every object in
the commit, and instead to create a LeafNode and then _split() it.
This also includes my other change to improve InternalNode.map() performance /code.edge. launchpad. net/~jameinel/ bzr/1.16- chkmap- updates/ +merge/ 7113)
(_iter_nodes change: https:/
However, InternalNode.map() still has a lot of "did the LeafNode shrink"
overhead, that we really don't care about for initial commit.
Hopefully someone will approve 7113 for me, and then I'll resubmit this, so we can see that it isn't a very big change.