Rev 3892: (abentley) Move RemoteRepository caching to CachingParentsProvider in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Dec 10 21:06:42 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3892
revision-id: pqm at pqm.ubuntu.com-20081210210638-e569azc2bomqq5qx
parent: pqm at pqm.ubuntu.com-20081210180716-sg0oipqppsgmn15t
parent: aaron at aaronbentley.com-20081210203113-ooeh6z6uavoysoc9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-12-10 21:06:38 +0000
message:
(abentley) Move RemoteRepository caching to CachingParentsProvider
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3835.1.18
revision-id: aaron at aaronbentley.com-20081210203113-ooeh6z6uavoysoc9
parent: aaron at aaronbentley.com-20081210195642-3y1d2azpt2tccgsh
parent: pqm at pqm.ubuntu.com-20081210180716-sg0oipqppsgmn15t
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Wed 2008-12-10 12:31:13 -0800
message:
Merge with trunk
added:
bzrlib/fifo_cache.py fifo_cache.py-20081209212307-31ffjwvteyvmydnf-1
bzrlib/tests/per_repository/test_add_inventory_by_delta.py test_add_inventory_d-20081013002626-rut81igtlqb4590z-1
bzrlib/tests/test_fifo_cache.py test_fifo_cache.py-20081209212307-31ffjwvteyvmydnf-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lru_cache.py lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/per_repository/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3835.1.17
revision-id: aaron at aaronbentley.com-20081210195642-3y1d2azpt2tccgsh
parent: aaron at aaronbentley.com-20081210194042-3x07buw2h4g8x9hs
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Wed 2008-12-10 11:56:42 -0800
message:
Fix stacking bug
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
------------------------------------------------------------
revno: 3835.1.16
revision-id: aaron at aaronbentley.com-20081210194042-3x07buw2h4g8x9hs
parent: aaron at aaronbentley.com-20081203050944-biuf61wbttr0wrzv
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Wed 2008-12-10 11:40:42 -0800
message:
Updates from review
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 3835.1.15
revision-id: aaron at aaronbentley.com-20081203050944-biuf61wbttr0wrzv
parent: aaron at aaronbentley.com-20081203042321-kr5k4mdhmdvl3553
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Wed 2008-12-03 00:09:44 -0500
message:
Allow miss caching to be disabled.
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3835.1.14
revision-id: aaron at aaronbentley.com-20081203042321-kr5k4mdhmdvl3553
parent: aaron at aaronbentley.com-20081123163839-ew27m17130fz85v6
parent: pqm at pqm.ubuntu.com-20081202015700-3mc9dola31w7h5h4
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Tue 2008-12-02 23:23:21 -0500
message:
Merge with trunk
added:
bzrlib/foreign.py foreign.py-20081112170002-olsxmandkk8qyfuq-1
bzrlib/tests/test_foreign.py test_foreign.py-20081125004048-ywb901edgp9lluxo-1
contrib/convert_to_1.9.py convert_to_dev2.py-20081014130524-z1ydl3mq9b4ehlvv-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_patiencediff_c.c _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
bzrlib/_readdir_pyx.pyx readdir.pyx-20060609152855-rm6v321vuaqyh9tu-1
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/python-compat.h pythoncompat.h-20080924041409-9kvi0fgtuuqp743j-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
------------------------------------------------------------
revno: 3835.1.13
revision-id: aaron at aaronbentley.com-20081123163839-ew27m17130fz85v6
parent: aaron at aaronbentley.com-20081123162708-17093o7m3obv7czs
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sun 2008-11-23 11:38:39 -0500
message:
Update documentation
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
------------------------------------------------------------
revno: 3835.1.12
revision-id: aaron at aaronbentley.com-20081123162708-17093o7m3obv7czs
parent: aaron at aaronbentley.com-20081122162637-p21ab628pasd3ruf
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sun 2008-11-23 11:27:08 -0500
message:
Unify CachingExtraParentsProvider and CachingParentsProvider.
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 3835.1.11
revision-id: aaron at aaronbentley.com-20081122162637-p21ab628pasd3ruf
parent: aaron at aaronbentley.com-20081122162428-o9vik1937s3p8fmy
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sat 2008-11-22 11:26:37 -0500
message:
Rename FakeParentsProvider to ExtraParentsProvider
modified:
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 3835.1.10
revision-id: aaron at aaronbentley.com-20081122162428-o9vik1937s3p8fmy
parent: aaron at aaronbentley.com-20081122053311-lyn8yvy36i89smyg
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sat 2008-11-22 11:24:28 -0500
message:
Move CachingExtraParentsProvider to Graph
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3835.1.9
revision-id: aaron at aaronbentley.com-20081122053311-lyn8yvy36i89smyg
parent: aaron at aaronbentley.com-20081122052057-id7ffzq9lyl9c4fk
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sat 2008-11-22 00:33:11 -0500
message:
Handle _requested_parents, take a callable
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3835.1.8
revision-id: aaron at aaronbentley.com-20081122052057-id7ffzq9lyl9c4fk
parent: aaron at aaronbentley.com-20081118214336-53wku2p6og6kvl5r
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: remote-stacking-graph
timestamp: Sat 2008-11-22 00:20:57 -0500
message:
Make UnstackedParentsProvider manage the cache
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
=== modified file 'bzrlib/graph.py'
--- a/bzrlib/graph.py 2008-10-30 15:20:00 +0000
+++ b/bzrlib/graph.py 2008-12-10 19:40:42 +0000
@@ -99,42 +99,88 @@
class CachingParentsProvider(object):
- """A parents provider which will cache the revision => parents in a dict.
-
- This is useful for providers that have an expensive lookup.
+ """A parents provider which will cache the revision => parents as a dict.
+
+ This is useful for providers which have an expensive look up.
+
+ Either a ParentsProvider or a get_parent_map-like callback may be
+ supplied. If it provides extra un-asked-for parents, they will be cached,
+ but filtered out of get_parent_map.
+
+ The cache is enabled by default, but may be disabled and re-enabled.
"""
+ def __init__(self, parent_provider=None, get_parent_map=None, debug=False):
+ """Constructor.
- def __init__(self, parent_provider):
+ :param parent_provider: The ParentProvider to use. It or
+ get_parent_map must be supplied.
+ :param get_parent_map: The get_parent_map callback to use. It or
+ parent_provider must be supplied.
+ :param debug: If true, mutter debugging messages.
+ """
self._real_provider = parent_provider
- # Theoretically we could use an LRUCache here
+ if get_parent_map is None:
+ self._get_parent_map = self._real_provider.get_parent_map
+ else:
+ self._get_parent_map = get_parent_map
self._cache = {}
+ self._cache_misses = True
+ self._debug = debug
+ if self._debug:
+ self._requested_parents = None
def __repr__(self):
return "%s(%r)" % (self.__class__.__name__, self._real_provider)
+ def enable_cache(self, cache_misses=True):
+ """Enable cache."""
+ self._cache = {}
+ self._cache_misses = cache_misses
+ if self._debug:
+ self._requested_parents = set()
+
+ def disable_cache(self):
+ """Disable and clear the cache."""
+ self._cache = None
+ if self._debug:
+ self._requested_parents = None
+
+ def get_cached_map(self):
+ """Return any cached get_parent_map values."""
+ if self._cache is None:
+ return None
+ return dict((k, v) for k, v in self._cache.items()
+ if v is not None)
+
def get_parent_map(self, keys):
- """See _StackedParentsProvider.get_parent_map"""
- needed = set()
- # If the _real_provider doesn't have a key, we cache a value of None,
- # which we then later use to realize we cannot provide a value for that
- # key.
- parent_map = {}
- cache = self._cache
- for key in keys:
- if key in cache:
- value = cache[key]
- if value is not None:
- parent_map[key] = value
- else:
- needed.add(key)
-
- if needed:
- new_parents = self._real_provider.get_parent_map(needed)
- cache.update(new_parents)
- parent_map.update(new_parents)
- needed.difference_update(new_parents)
- cache.update(dict.fromkeys(needed, None))
- return parent_map
+ """See _StackedParentsProvider.get_parent_map."""
+ # Hack to build up the caching logic.
+ ancestry = self._cache
+ if ancestry is None:
+ # Caching is disabled.
+ missing_revisions = set(keys)
+ ancestry = {}
+ else:
+ missing_revisions = set(key for key in keys if key not in ancestry)
+ if missing_revisions:
+ parent_map = self._get_parent_map(missing_revisions)
+ if self._debug:
+ mutter('re-retrieved revisions: %d of %d',
+ len(set(ancestry).intersection(parent_map)),
+ len(parent_map))
+ ancestry.update(parent_map)
+ if self._cache_misses:
+ # None is never a valid parents list, so it can be used to
+ # record misses.
+ ancestry.update(dict((k, None) for k in missing_revisions
+ if k not in parent_map))
+ present_keys = [k for k in keys if ancestry.get(k) is not None]
+ if self._debug:
+ if self._requested_parents is not None and len(ancestry) != 0:
+ self._requested_parents.update(present_keys)
+ mutter('Current hit rate: %d%%',
+ 100.0 * len(self._requested_parents) / len(ancestry))
+ return dict((k, ancestry[k]) for k in present_keys)
class Graph(object):
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2008-12-05 16:07:04 +0000
+++ b/bzrlib/remote.py 2008-12-10 20:31:13 +0000
@@ -287,17 +287,6 @@
'Does not support nested trees', target_format)
-class _UnstackedParentsProvider(object):
- """ParentsProvider for RemoteRepository that ignores stacking."""
-
- def __init__(self, remote_repository):
- self._remote_repository = remote_repository
-
- def get_parent_map(self, revision_ids):
- """See RemoteRepository.get_parent_map."""
- return self._remote_repository._get_parent_map(revision_ids)
-
-
class RemoteRepository(_RpcHelper):
"""Repository accessed over rpc.
@@ -330,10 +319,10 @@
self._lock_token = None
self._lock_count = 0
self._leave_lock = False
- # A cache of looked up revision parent data; reset at unlock time.
- self._parents_map = None
- if 'hpss' in debug.debug_flags:
- self._requested_parents = None
+ debug_cache = ('hpss' in debug.debug_flags)
+ self._unstacked_provider = graph.CachingParentsProvider(
+ get_parent_map=self._get_parent_map_rpc, debug=debug_cache)
+ self._unstacked_provider.disable_cache()
# For tests:
# These depend on the actual remote format, so force them off for
# maximum compatibility. XXX: In future these should depend on the
@@ -476,12 +465,7 @@
def get_graph(self, other_repository=None):
"""Return the graph for this repository format"""
- parents_provider = self._make_parents_provider()
- if (other_repository is not None and
- other_repository.bzrdir.transport.base !=
- self.bzrdir.transport.base):
- parents_provider = graph._StackedParentsProvider(
- [parents_provider, other_repository._make_parents_provider()])
+ parents_provider = self._make_parents_provider(other_repository)
return graph.Graph(parents_provider)
def gather_stats(self, revid=None, committers=None):
@@ -554,9 +538,7 @@
if not self._lock_mode:
self._lock_mode = 'r'
self._lock_count = 1
- self._parents_map = {}
- if 'hpss' in debug.debug_flags:
- self._requested_parents = set()
+ self._unstacked_provider.enable_cache(cache_misses=False)
if self._real_repository is not None:
self._real_repository.lock_read()
else:
@@ -596,9 +578,7 @@
self._leave_lock = False
self._lock_mode = 'w'
self._lock_count = 1
- self._parents_map = {}
- if 'hpss' in debug.debug_flags:
- self._requested_parents = set()
+ self._unstacked_provider.enable_cache(cache_misses=False)
elif self._lock_mode == 'r':
raise errors.ReadOnlyError(self)
else:
@@ -663,9 +643,7 @@
self._lock_count -= 1
if self._lock_count > 0:
return
- self._parents_map = None
- if 'hpss' in debug.debug_flags:
- self._requested_parents = None
+ self._unstacked_provider.disable_cache()
old_mode = self._lock_mode
self._lock_mode = None
try:
@@ -903,31 +881,6 @@
"""See bzrlib.Graph.get_parent_map()."""
return self._make_parents_provider().get_parent_map(revision_ids)
- def _get_parent_map(self, keys):
- """Implementation of get_parent_map() that ignores fallbacks."""
- # Hack to build up the caching logic.
- ancestry = self._parents_map
- if ancestry is None:
- # Repository is not locked, so there's no cache.
- missing_revisions = set(keys)
- ancestry = {}
- else:
- missing_revisions = set(key for key in keys if key not in ancestry)
- if missing_revisions:
- parent_map = self._get_parent_map_rpc(missing_revisions)
- if 'hpss' in debug.debug_flags:
- mutter('retransmitted revisions: %d of %d',
- len(set(ancestry).intersection(parent_map)),
- len(parent_map))
- ancestry.update(parent_map)
- present_keys = [k for k in keys if k in ancestry]
- if 'hpss' in debug.debug_flags:
- if self._requested_parents is not None and len(ancestry) != 0:
- self._requested_parents.update(present_keys)
- mutter('Current RemoteRepository graph hit rate: %d%%',
- 100.0 * len(self._requested_parents) / len(ancestry))
- return dict((k, ancestry[k]) for k in present_keys)
-
def _get_parent_map_rpc(self, keys):
"""Helper for get_parent_map that performs the RPC."""
medium = self._client._medium
@@ -976,7 +929,7 @@
# TODO: Manage this incrementally to avoid covering the same path
# repeatedly. (The server will have to on each request, but the less
# work done the better).
- parents_map = self._parents_map
+ parents_map = self._unstacked_provider.get_cached_map()
if parents_map is None:
# Repository is not locked, so there's no cache.
parents_map = {}
@@ -1228,8 +1181,10 @@
self._ensure_real()
return self._real_repository._check_for_inconsistent_revision_parents()
- def _make_parents_provider(self):
- providers = [_UnstackedParentsProvider(self)]
+ def _make_parents_provider(self, other=None):
+ providers = [self._unstacked_provider]
+ if other is not None:
+ providers.insert(0, other)
providers.extend(r._make_parents_provider() for r in
self._fallback_repositories)
return graph._StackedParentsProvider(providers)
=== modified file 'bzrlib/tests/per_repository/test_add_fallback_repository.py'
--- a/bzrlib/tests/per_repository/test_add_fallback_repository.py 2008-12-03 22:27:58 +0000
+++ b/bzrlib/tests/per_repository/test_add_fallback_repository.py 2008-12-10 20:31:13 +0000
@@ -16,7 +16,11 @@
"""Tests for Repository.add_fallback_repository."""
-from bzrlib import errors
+from bzrlib import (
+ bzrdir,
+ errors,
+ remote,
+ )
from bzrlib.revision import NULL_REVISION
from bzrlib.tests import TestNotApplicable
from bzrlib.tests.per_repository import TestCaseWithRepository
@@ -25,7 +29,14 @@
class TestAddFallbackRepository(TestCaseWithRepository):
def test_add_fallback_repository(self):
- repo = self.make_repository('repo')
+ if isinstance(self.repository_format, remote.RemoteRepositoryFormat):
+ # RemoteRepository by default builds a default format real
+ # repository, but the default format is unstackble. So explicitly
+ # make a stackable real repository and use that.
+ repo = self.make_repository('repo', format='1.9')
+ repo = bzrdir.BzrDir.open(self.get_url('repo')).open_repository()
+ else:
+ repo = self.make_repository('repo')
tree = self.make_branch_and_tree('branch')
if not repo._format.supports_external_lookups:
self.assertRaises(errors.UnstackableRepositoryFormat,
@@ -45,6 +56,13 @@
# ... or on the repository directly...
self.assertEqual({revision_id: (NULL_REVISION,)},
repo.get_parent_map([revision_id]))
+ # ... or on the repository's graph.
+ self.assertEqual({revision_id: (NULL_REVISION,)},
+ repo.get_graph().get_parent_map([revision_id]))
+ # ... or on the repository's graph, when there is an other repository.
+ other = self.make_repository('other')
+ self.assertEqual({revision_id: (NULL_REVISION,)},
+ repo.get_graph(other).get_parent_map([revision_id]))
def test_add_fallback_sets_fetch_order(self):
repo = self.make_repository('repo')
=== modified file 'bzrlib/tests/test_graph.py'
--- a/bzrlib/tests/test_graph.py 2008-10-30 15:20:00 +0000
+++ b/bzrlib/tests/test_graph.py 2008-12-10 19:40:42 +0000
@@ -1413,6 +1413,65 @@
self.assertEqual(['a', 'b'], sorted(self.inst_pp.calls))
+class TestCachingParentsProviderExtras(tests.TestCaseWithTransport):
+ """Test the behaviour when parents are provided that were not requested."""
+
+ def setUp(self):
+ super(TestCachingParentsProviderExtras, self).setUp()
+ class ExtraParentsProvider(object):
+
+ def get_parent_map(self, keys):
+ return {'rev1': [], 'rev2': ['rev1',]}
+
+ self.inst_pp = InstrumentedParentsProvider(ExtraParentsProvider())
+ self.caching_pp = _mod_graph.CachingParentsProvider(
+ get_parent_map=self.inst_pp.get_parent_map)
+
+ def test_uncached(self):
+ self.caching_pp.disable_cache()
+ self.assertEqual({'rev1': []},
+ self.caching_pp.get_parent_map(['rev1']))
+ self.assertEqual(['rev1'], self.inst_pp.calls)
+ self.assertIs(None, self.caching_pp._cache)
+
+ def test_cache_initially_empty(self):
+ self.assertEqual({}, self.caching_pp._cache)
+
+ def test_cached(self):
+ self.assertEqual({'rev1': []},
+ self.caching_pp.get_parent_map(['rev1']))
+ self.assertEqual(['rev1'], self.inst_pp.calls)
+ self.assertEqual({'rev1': [], 'rev2': ['rev1']},
+ self.caching_pp._cache)
+ self.assertEqual({'rev1': []},
+ self.caching_pp.get_parent_map(['rev1']))
+ self.assertEqual(['rev1'], self.inst_pp.calls)
+
+ def test_disable_cache_clears_cache(self):
+ # Put something in the cache
+ self.caching_pp.get_parent_map(['rev1'])
+ self.assertEqual(2, len(self.caching_pp._cache))
+ self.caching_pp.disable_cache()
+ self.assertIs(None, self.caching_pp._cache)
+
+ def test_cache_misses(self):
+ self.caching_pp.get_parent_map(['rev3'])
+ self.caching_pp.get_parent_map(['rev3'])
+ self.assertEqual(['rev3'], self.inst_pp.calls)
+
+ def test_no_cache_misses(self):
+ self.caching_pp.enable_cache(cache_misses=False)
+ self.caching_pp.get_parent_map(['rev3'])
+ self.caching_pp.get_parent_map(['rev3'])
+ self.assertEqual(['rev3', 'rev3'], self.inst_pp.calls)
+
+ def test_cache_extras(self):
+ self.assertEqual({}, self.caching_pp.get_parent_map(['rev3']))
+ self.assertEqual({'rev2': ['rev1']},
+ self.caching_pp.get_parent_map(['rev2']))
+ self.assertEqual(['rev3'], self.inst_pp.calls)
+
+
class TestCollapseLinearRegions(tests.TestCase):
def assertCollapsed(self, collapsed, original):
=== modified file 'bzrlib/tests/test_remote.py'
--- a/bzrlib/tests/test_remote.py 2008-11-25 17:31:02 +0000
+++ b/bzrlib/tests/test_remote.py 2008-12-03 05:09:44 +0000
@@ -1236,6 +1236,26 @@
repo.get_parent_map, ['a-revision-id'])
+class TestGetParentMapAllowsNew(tests.TestCaseWithTransport):
+
+ def test_allows_new_revisions(self):
+ """get_parent_map's results can be updated by commit."""
+ smart_server = server.SmartTCPServer_for_testing()
+ smart_server.setUp()
+ self.addCleanup(smart_server.tearDown)
+ self.make_branch('branch')
+ branch = Branch.open(smart_server.get_url() + '/branch')
+ tree = branch.create_checkout('tree', lightweight=True)
+ tree.lock_write()
+ self.addCleanup(tree.unlock)
+ graph = tree.branch.repository.get_graph()
+ # This provides an opportunity for the missing rev-id to be cached.
+ self.assertEqual({}, graph.get_parent_map(['rev1']))
+ tree.commit('message', rev_id='rev1')
+ graph = tree.branch.repository.get_graph()
+ self.assertEqual({'rev1': ('null:',)}, graph.get_parent_map(['rev1']))
+
+
class TestRepositoryGetRevisionGraph(TestRemoteRepository):
def test_null_revision(self):
@@ -1783,11 +1803,11 @@
repo = branch.repository
self.assertEqual(['rev1'], repo.get_parent_map(['rev1']).keys())
- def test_stacked__get_parent_map(self):
- # the private variant of _get_parent_map ignores stacking
+ def test_unstacked_get_parent_map(self):
+ # _unstacked_provider.get_parent_map ignores stacking
branch = self.prepare_stacked_remote_branch()
- repo = branch.repository
- self.assertEqual([], repo._get_parent_map(['rev1']).keys())
+ provider = branch.repository._unstacked_provider
+ self.assertEqual([], provider.get_parent_map(['rev1']).keys())
class TestRemoteBranchEffort(tests.TestCaseWithTransport):
More information about the bazaar-commits
mailing list