/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/btree_index.py

  • Committer: Martin
  • Date: 2017-06-05 20:48:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6658.
  • Revision ID: gzlist@googlemail.com-20170605204831-20accykspjcrx0a8
Apply 2to3 dict fixer and clean up resulting mess using view helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/btree_index.py
44
44
    BytesIO,
45
45
    map,
46
46
    range,
 
47
    viewitems,
 
48
    viewkeys,
 
49
    viewvalues,
47
50
    )
48
51
 
49
52
 
557
560
        if self._nodes_by_key is None:
558
561
            nodes_by_key = {}
559
562
            if self.reference_lists:
560
 
                for key, (references, value) in self._nodes.iteritems():
 
563
                for key, (references, value) in viewitems(self._nodes):
561
564
                    key_dict = nodes_by_key
562
565
                    for subkey in key[:-1]:
563
566
                        key_dict = key_dict.setdefault(subkey, {})
564
567
                    key_dict[key[-1]] = key, value, references
565
568
            else:
566
 
                for key, (references, value) in self._nodes.iteritems():
 
569
                for key, (references, value) in viewitems(self._nodes):
567
570
                    key_dict = nodes_by_key
568
571
                    for subkey in key[:-1]:
569
572
                        key_dict = key_dict.setdefault(subkey, {})
905
908
 
906
909
    def _get_offsets_to_cached_pages(self):
907
910
        """Determine what nodes we already have cached."""
908
 
        cached_offsets = set(self._internal_node_cache.keys())
 
911
        cached_offsets = set(self._internal_node_cache)
 
912
        # cache may be dict or LRUCache, keys() is the common method
909
913
        cached_offsets.update(self._leaf_node_cache.keys())
910
914
        if self._root_node is not None:
911
915
            cached_offsets.add(0)
944
948
    def _cache_leaf_values(self, nodes):
945
949
        """Cache directly from key => value, skipping the btree."""
946
950
        if self._leaf_value_cache is not None:
947
 
            for node in nodes.itervalues():
 
951
            for node in viewvalues(nodes):
948
952
                for key, value in node.all_items():
949
953
                    if key in self._leaf_value_cache:
950
954
                        # Don't add the rest of the keys, we've seen this node