← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/chk_map.py

  • Committer: Martin
  • Date: 2010-05-03 20:57:39 UTC
  • mto: This revision was merged to the branch mainline in revision 5204.
  • Revision ID: gzlist@googlemail.com-20100503205739-n326zdvevv0rmruh
Retain original stack and error message when translating to ValueError in bencode

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/chk_map.py
1
 
# Copyright (C) 2008-2011 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
37
37
 
38
38
"""
39
39
 
40
 
from __future__ import absolute_import
41
 
 
42
40
import heapq
43
41
import threading
44
42
 
46
44
lazy_import.lazy_import(globals(), """
47
45
from bzrlib import (
48
46
    errors,
 
47
    versionedfile,
49
48
    )
50
49
""")
51
50
from bzrlib import (
52
 
    errors,
53
51
    lru_cache,
54
52
    osutils,
55
53
    registry,
92
90
_INTERESTING_NEW_SIZE = 50
93
91
# If a ChildNode shrinks by more than this amount, we check for a remap
94
92
_INTERESTING_SHRINKAGE_LIMIT = 20
 
93
# If we delete more than this many nodes applying a delta, we check for a remap
 
94
_INTERESTING_DELETES_LIMIT = 5
95
95
 
96
96
 
97
97
def _search_key_plain(key):
135
135
            into the map; if old_key is not None, then the old mapping
136
136
            of old_key is removed.
137
137
        """
138
 
        has_deletes = False
 
138
        delete_count = 0
139
139
        # Check preconditions first.
140
140
        as_st = StaticTuple.from_sequence
141
141
        new_items = set([as_st(key) for (old, key, value) in delta
148
148
        for old, new, value in delta:
149
149
            if old is not None and old != new:
150
150
                self.unmap(old, check_remap=False)
151
 
                has_deletes = True
 
151
                delete_count += 1
152
152
        for old, new, value in delta:
153
153
            if new is not None:
154
154
                self.map(new, value)
155
 
        if has_deletes:
 
155
        if delete_count > _INTERESTING_DELETES_LIMIT:
 
156
            trace.mutter("checking remap as %d deletions", delete_count)
156
157
            self._check_remap()
157
158
        return self._save()
158
159
 
572
573
        """Check if nodes can be collapsed."""
573
574
        self._ensure_root()
574
575
        if type(self._root_node) is InternalNode:
575
 
            self._root_node = self._root_node._check_remap(self._store)
 
576
            self._root_node._check_remap(self._store)
576
577
 
577
578
    def _save(self):
578
579
        """Save the map completely.
922
923
        bytes = ''.join(lines)
923
924
        if len(bytes) != self._current_size():
924
925
            raise AssertionError('Invalid _current_size')
925
 
        _get_cache()[self._key] = bytes
 
926
        _get_cache().add(self._key, bytes)
926
927
        return [self._key]
927
928
 
928
929
    def refs(self):
1195
1196
                    prefix, node_key_filter = keys[record.key]
1196
1197
                    node_and_filters.append((node, node_key_filter))
1197
1198
                    self._items[prefix] = node
1198
 
                    _get_cache()[record.key] = bytes
 
1199
                    _get_cache().add(record.key, bytes)
1199
1200
                for info in node_and_filters:
1200
1201
                    yield info
1201
1202
 
1321
1322
            lines.append(serialised[prefix_len:])
1322
1323
        sha1, _, _ = store.add_lines((None,), (), lines)
1323
1324
        self._key = StaticTuple("sha1:" + sha1,).intern()
1324
 
        _get_cache()[self._key] = ''.join(lines)
 
1325
        _get_cache().add(self._key, ''.join(lines))
1325
1326
        yield self._key
1326
1327
 
1327
1328
    def _search_key(self, key):
1371
1372
        return self._search_prefix
1372
1373
 
1373
1374
    def unmap(self, store, key, check_remap=True):
1374
 
        """Remove key from this node and its children."""
 
1375
        """Remove key from this node and it's children."""
1375
1376
        if not len(self._items):
1376
1377
            raise AssertionError("can't unmap in an empty InternalNode.")
1377
1378
        children = [node for node, _
1726
1727
 
1727
1728
try:
1728
1729
    from bzrlib._chk_map_pyx import (
1729
 
        _bytes_to_text_key,
1730
1730
        _search_key_16,
1731
1731
        _search_key_255,
1732
1732
        _deserialise_leaf_node,
1735
1735
except ImportError, e:
1736
1736
    osutils.failed_to_load_extension(e)
1737
1737
    from bzrlib._chk_map_py import (
1738
 
        _bytes_to_text_key,
1739
1738
        _search_key_16,
1740
1739
        _search_key_255,
1741
1740
        _deserialise_leaf_node,