40
from __future__ import absolute_import
43
from bzrlib import lazy_import
44
lazy_import.lazy_import(globals(), """
53
from ..sixish import (
57
from ..sixish import PY3
58
from ..static_tuple import StaticTuple
57
from bzrlib.static_tuple import StaticTuple
61
60
# If each line is 50 bytes, and you have 255 internal pages, with 255-way fan
91
90
_INTERESTING_NEW_SIZE = 50
92
91
# If a ChildNode shrinks by more than this amount, we check for a remap
93
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
96
97
def _search_key_plain(key):
97
98
"""Map the key tuple into a search string that just uses the key bytes."""
98
return b'\x00'.join(key)
99
return '\x00'.join(key)
101
102
search_key_registry = registry.Registry()
102
search_key_registry.register(b'plain', _search_key_plain)
103
search_key_registry.register('plain', _search_key_plain)
105
106
class CHKMap(object):
134
135
into the map; if old_key is not None, then the old mapping
135
136
of old_key is removed.
138
139
# Check preconditions first.
139
140
as_st = StaticTuple.from_sequence
140
new_items = {as_st(key) for (old, key, value) in delta
141
if key is not None and old is None}
141
new_items = set([as_st(key) for (old, key, value) in delta
142
if key is not None and old is None])
142
143
existing_new = list(self.iteritems(key_filter=new_items))
144
145
raise errors.InconsistentDeltaDelta(delta,
147
148
for old, new, value in delta:
148
149
if old is not None and old != new:
149
150
self.unmap(old, check_remap=False)
151
152
for old, new, value in delta:
152
153
if new is not None:
153
154
self.map(new, value)
155
if delete_count > _INTERESTING_DELETES_LIMIT:
156
trace.mutter("checking remap as %d deletions", delete_count)
155
157
self._check_remap()
156
158
return self._save()
158
160
def _ensure_root(self):
159
161
"""Ensure that the root node is an object not a key."""
160
if isinstance(self._root_node, StaticTuple):
162
if type(self._root_node) is StaticTuple:
161
163
# Demand-load the root
162
164
self._root_node = self._get_node(self._root_node)
171
173
:param node: A tuple key or node object.
172
174
:return: A node object.
174
if isinstance(node, StaticTuple):
176
if type(node) is StaticTuple:
175
177
bytes = self._read_bytes(node)
176
178
return _deserialise(bytes, node,
177
179
search_key_func=self._search_key_func)
183
185
return _get_cache()[key]
185
187
stream = self._store.get_record_stream([key], 'unordered', True)
186
bytes = next(stream).get_bytes_as('fulltext')
188
bytes = stream.next().get_bytes_as('fulltext')
187
189
_get_cache()[key] = bytes
190
def _dump_tree(self, include_keys=False, encoding='utf-8'):
192
def _dump_tree(self, include_keys=False):
191
193
"""Return the tree in a string representation."""
192
194
self._ensure_root()
194
decode = lambda x: x.decode(encoding)
197
res = self._dump_tree_node(self._root_node, prefix=b'', indent='',
198
decode=decode, include_keys=include_keys)
195
res = self._dump_tree_node(self._root_node, prefix='', indent='',
196
include_keys=include_keys)
199
197
res.append('') # Give a trailing '\n'
200
198
return '\n'.join(res)
202
def _dump_tree_node(self, node, prefix, indent, decode, include_keys=True):
200
def _dump_tree_node(self, node, prefix, indent, include_keys=True):
203
201
"""For this node and all children, generate a string representation."""
205
203
if not include_keys:
208
206
node_key = node.key()
209
207
if node_key is not None:
210
key_str = ' %s' % (decode(node_key[0]),)
208
key_str = ' %s' % (node_key[0],)
212
210
key_str = ' None'
213
result.append('%s%r %s%s' % (indent, decode(prefix), node.__class__.__name__,
215
if isinstance(node, InternalNode):
211
result.append('%s%r %s%s' % (indent, prefix, node.__class__.__name__,
213
if type(node) is InternalNode:
216
214
# Trigger all child nodes to get loaded
217
215
list(node._iter_nodes(self._store))
218
for prefix, sub in sorted(viewitems(node._items)):
216
for prefix, sub in sorted(node._items.iteritems()):
219
217
result.extend(self._dump_tree_node(sub, prefix, indent + ' ',
220
decode=decode, include_keys=include_keys))
218
include_keys=include_keys))
222
for key, value in sorted(viewitems(node._items)):
220
for key, value in sorted(node._items.iteritems()):
223
221
# Don't use prefix nor indent here to line up when used in
224
222
# tests in conjunction with assertEqualDiff
225
result.append(' %r %r' % (
226
tuple([decode(ke) for ke in key]), decode(value)))
223
result.append(' %r %r' % (tuple(key), value))
247
244
root_key = klass._create_directly(store, initial_value,
248
245
maximum_size=maximum_size, key_width=key_width,
249
246
search_key_func=search_key_func)
250
if not isinstance(root_key, StaticTuple):
247
if type(root_key) is not StaticTuple:
251
248
raise AssertionError('we got a %s instead of a StaticTuple'
252
249
% (type(root_key),))
259
256
result._root_node.set_maximum_size(maximum_size)
260
257
result._root_node._key_width = key_width
262
for key, value in viewitems(initial_value):
259
for key, value in initial_value.items():
263
260
delta.append((None, key, value))
264
261
root_key = result.apply_delta(delta)
271
268
node.set_maximum_size(maximum_size)
272
269
node._key_width = key_width
273
270
as_st = StaticTuple.from_sequence
274
node._items = dict((as_st(key), val)
275
for key, val in viewitems(initial_value))
276
node._raw_size = sum(node._key_value_len(key, value)
277
for key, value in viewitems(node._items))
271
node._items = dict([(as_st(key), val) for key, val
272
in initial_value.iteritems()])
273
node._raw_size = sum([node._key_value_len(key, value)
274
for key,value in node._items.iteritems()])
278
275
node._len = len(node._items)
279
276
node._compute_search_prefix()
280
277
node._compute_serialised_prefix()
335
332
def process_node(node, path, a_map, pending):
336
333
# take a node and expand it
337
334
node = a_map._get_node(node)
338
if isinstance(node, LeafNode):
335
if type(node) == LeafNode:
339
336
path = (node._key, path)
340
for key, value in viewitems(node._items):
337
for key, value in node._items.items():
341
338
# For a LeafNode, the key is a serialized_key, rather than
342
339
# a search_key, but the heap is using search_keys
343
340
search_key = node._search_key_func(key)
346
343
# type(node) == InternalNode
347
344
path = (node._key, path)
348
for prefix, child in viewitems(node._items):
345
for prefix, child in node._items.items():
349
346
heapq.heappush(pending, (prefix, None, child, path))
350
347
def process_common_internal_nodes(self_node, basis_node):
351
self_items = set(viewitems(self_node._items))
352
basis_items = set(viewitems(basis_node._items))
348
self_items = set(self_node._items.items())
349
basis_items = set(basis_node._items.items())
353
350
path = (self_node._key, None)
354
351
for prefix, child in self_items - basis_items:
355
352
heapq.heappush(self_pending, (prefix, None, child, path))
357
354
for prefix, child in basis_items - self_items:
358
355
heapq.heappush(basis_pending, (prefix, None, child, path))
359
356
def process_common_leaf_nodes(self_node, basis_node):
360
self_items = set(viewitems(self_node._items))
361
basis_items = set(viewitems(basis_node._items))
357
self_items = set(self_node._items.items())
358
basis_items = set(basis_node._items.items())
362
359
path = (self_node._key, None)
363
360
for key, value in self_items - basis_items:
364
361
prefix = self._search_key_func(key)
374
371
self_node = self._get_node(self_node)
375
372
basis_node = basis._get_node(basis_node)
376
if (isinstance(self_node, InternalNode)
377
and isinstance(basis_node, InternalNode)):
373
if (type(self_node) == InternalNode
374
and type(basis_node) == InternalNode):
378
375
# Matching internal nodes
379
376
process_common_internal_nodes(self_node, basis_node)
380
elif (isinstance(self_node, LeafNode)
381
and isinstance(basis_node, LeafNode)):
377
elif (type(self_node) == LeafNode
378
and type(basis_node) == LeafNode):
382
379
process_common_leaf_nodes(self_node, basis_node)
384
381
process_node(self_node, self_path, self, self_pending)
393
390
# A better implementation would probably have a reverse map
394
391
# back to the children of a node, and jump straight to it when
395
392
# a common node is detected, the proceed to remove the already
396
# pending children. breezy.graph has a searcher module with a
393
# pending children. bzrlib.graph has a searcher module with a
397
394
# similar problem.
398
395
while key_path is not None:
399
396
key, key_path = key_path
555
552
def _node_key(self, node):
556
553
"""Get the key for a node whether it's a tuple or node."""
557
if isinstance(node, tuple):
554
if type(node) is tuple:
558
555
node = StaticTuple.from_sequence(node)
559
if isinstance(node, StaticTuple):
556
if type(node) is StaticTuple:
565
562
"""remove key from the map."""
566
563
key = StaticTuple.from_sequence(key)
567
564
self._ensure_root()
568
if isinstance(self._root_node, InternalNode):
565
if type(self._root_node) is InternalNode:
569
566
unmapped = self._root_node.unmap(self._store, key,
570
567
check_remap=check_remap)
575
572
def _check_remap(self):
576
573
"""Check if nodes can be collapsed."""
577
574
self._ensure_root()
578
if isinstance(self._root_node, InternalNode):
579
self._root_node = self._root_node._check_remap(self._store)
575
if type(self._root_node) is InternalNode:
576
self._root_node._check_remap(self._store)
582
579
"""Save the map completely.
584
581
:return: The key of the root node.
586
if isinstance(self._root_node, StaticTuple):
583
if type(self._root_node) is StaticTuple:
588
585
return self._root_node
589
586
keys = list(self._root_node.serialise(self._store))
772
769
# Short items, we need to match based on a prefix
773
filters.setdefault(len(key), set()).add(key)
770
length_filter = filters.setdefault(len(key), set())
771
length_filter.add(key)
775
filters_itemview = viewitems(filters)
776
for item in viewitems(self._items):
777
for length, length_filter in filters_itemview:
773
filters = filters.items()
774
for item in self._items.iteritems():
775
for length, length_filter in filters:
778
776
if item[0][:length] in length_filter:
782
for item in viewitems(self._items):
780
for item in self._items.iteritems():
785
783
def _key_value_len(self, key, value):
786
784
# TODO: Should probably be done without actually joining the key, but
787
785
# then that can be done via the C extension
788
786
return (len(self._serialise_key(key)) + 1
789
+ len(b'%d' % value.count(b'\n')) + 1
787
+ len(str(value.count('\n'))) + 1
790
788
+ len(value) + 1)
792
790
def _search_key(self, key):
841
839
common_prefix = self._search_prefix
842
840
split_at = len(common_prefix) + 1
844
for key, value in viewitems(self._items):
842
for key, value in self._items.iteritems():
845
843
search_key = self._search_key(key)
846
844
prefix = search_key[:split_at]
847
845
# TODO: Generally only 1 key can be exactly the right length,
853
851
# may get a '\00' node anywhere, but won't have keys of
854
852
# different lengths.
855
853
if len(prefix) < split_at:
856
prefix += b'\x00'*(split_at - len(prefix))
854
prefix += '\x00'*(split_at - len(prefix))
857
855
if prefix not in result:
858
856
node = LeafNode(search_key_func=self._search_key_func)
859
857
node.set_maximum_size(self._maximum_size)
874
872
for split, node in node_details:
875
873
new_node.add_node(split, node)
876
874
result[prefix] = new_node
877
return common_prefix, list(viewitems(result))
875
return common_prefix, result.items()
879
877
def map(self, store, key, value):
880
878
"""Map key to value."""
888
886
if self._search_prefix is _unknown:
889
887
raise AssertionError('%r must be known' % self._search_prefix)
890
return self._search_prefix, [(b"", self)]
888
return self._search_prefix, [("", self)]
892
_serialise_key = b'\x00'.join
890
_serialise_key = '\x00'.join
894
892
def serialise(self, store):
895
893
"""Serialise the LeafNode to store.
897
895
:param store: A VersionedFiles honouring the CHK extensions.
898
896
:return: An iterable of the keys inserted by this operation.
900
lines = [b"chkleaf:\n"]
901
lines.append(b"%d\n" % self._maximum_size)
902
lines.append(b"%d\n" % self._key_width)
903
lines.append(b"%d\n" % self._len)
898
lines = ["chkleaf:\n"]
899
lines.append("%d\n" % self._maximum_size)
900
lines.append("%d\n" % self._key_width)
901
lines.append("%d\n" % self._len)
904
902
if self._common_serialised_prefix is None:
906
904
if len(self._items) != 0:
907
905
raise AssertionError('If _common_serialised_prefix is None'
908
906
' we should have no items')
910
lines.append(b'%s\n' % (self._common_serialised_prefix,))
908
lines.append('%s\n' % (self._common_serialised_prefix,))
911
909
prefix_len = len(self._common_serialised_prefix)
912
for key, value in sorted(viewitems(self._items)):
910
for key, value in sorted(self._items.items()):
913
911
# Always add a final newline
914
value_lines = osutils.chunks_to_lines([value + b'\n'])
915
serialized = b"%s\x00%d\n" % (self._serialise_key(key),
912
value_lines = osutils.chunks_to_lines([value + '\n'])
913
serialized = "%s\x00%s\n" % (self._serialise_key(key),
916
914
len(value_lines))
917
915
if not serialized.startswith(self._common_serialised_prefix):
918
916
raise AssertionError('We thought the common prefix was %r'
921
919
lines.append(serialized[prefix_len:])
922
920
lines.extend(value_lines)
923
921
sha1, _, _ = store.add_lines((None,), (), lines)
924
self._key = StaticTuple(b"sha1:" + sha1,).intern()
925
data = b''.join(lines)
926
if len(data) != self._current_size():
922
self._key = StaticTuple("sha1:" + sha1,).intern()
923
bytes = ''.join(lines)
924
if len(bytes) != self._current_size():
927
925
raise AssertionError('Invalid _current_size')
928
_get_cache()[self._key] = data
926
_get_cache().add(self._key, bytes)
929
927
return [self._key]
998
996
__slots__ = ('_node_width',)
1000
def __init__(self, prefix=b'', search_key_func=None):
998
def __init__(self, prefix='', search_key_func=None):
1001
999
Node.__init__(self)
1002
1000
# The size of an internalnode with default values and no children.
1003
1001
# How many octets key prefixes within this node are.
1018
1016
raise AssertionError("_search_prefix should not be None")
1019
1017
if not prefix.startswith(self._search_prefix):
1020
1018
raise AssertionError("prefixes mismatch: %s must start with %s"
1021
% (prefix, self._search_prefix))
1019
% (prefix,self._search_prefix))
1022
1020
if len(prefix) != len(self._search_prefix) + 1:
1023
1021
raise AssertionError("prefix wrong length: len(%s) is not %d" %
1024
1022
(prefix, len(self._search_prefix) + 1))
1074
1072
# yielding all nodes, yield whatever we have, and queue up a read
1075
1073
# for whatever we are missing
1076
1074
shortcut = True
1077
for prefix, node in viewitems(self._items):
1075
for prefix, node in self._items.iteritems():
1078
1076
if node.__class__ is StaticTuple:
1079
1077
keys[node] = (prefix, None)
1151
1149
# The slow way. We walk every item in self._items, and check to
1152
1150
# see if there are any matches
1153
length_filters_itemview = viewitems(length_filters)
1154
for prefix, node in viewitems(self._items):
1151
length_filters = length_filters.items()
1152
for prefix, node in self._items.iteritems():
1155
1153
node_key_filter = []
1156
for length, length_filter in length_filters_itemview:
1154
for length, length_filter in length_filters:
1157
1155
sub_prefix = prefix[:length]
1158
1156
if sub_prefix in length_filter:
1159
1157
node_key_filter.extend(prefix_to_keys[sub_prefix])
1198
1196
prefix, node_key_filter = keys[record.key]
1199
1197
node_and_filters.append((node, node_key_filter))
1200
1198
self._items[prefix] = node
1201
_get_cache()[record.key] = bytes
1199
_get_cache().add(record.key, bytes)
1202
1200
for info in node_and_filters:
1223
1221
new_parent.add_node(self._search_prefix[:len(new_prefix)+1],
1225
1223
return new_parent.map(store, key, value)
1226
children = [node for node, _ in self._iter_nodes(store, key_filter=[key])]
1224
children = [node for node, _
1225
in self._iter_nodes(store, key_filter=[key])]
1228
1227
child = children[0]
1230
1229
# new child needed:
1231
1230
child = self._new_child(search_key, LeafNode)
1232
1231
old_len = len(child)
1233
if isinstance(child, LeafNode):
1232
if type(child) is LeafNode:
1234
1233
old_size = child._current_size()
1236
1235
old_size = None
1242
1241
self._items[search_key] = child
1243
1242
self._key = None
1244
1243
new_node = self
1245
if isinstance(child, LeafNode):
1244
if type(child) is LeafNode:
1246
1245
if old_size is None:
1247
1246
# The old node was an InternalNode which means it has now
1248
1247
# collapsed, so we need to check if it will chain to a
1266
1265
new_node = self._check_remap(store)
1267
1266
if new_node._search_prefix is None:
1268
1267
raise AssertionError("_search_prefix should not be None")
1269
return new_node._search_prefix, [(b'', new_node)]
1268
return new_node._search_prefix, [('', new_node)]
1270
1269
# child has overflown - create a new intermediate node.
1271
1270
# XXX: This is where we might want to try and expand our depth
1272
1271
# to refer to more bytes of every child (which would give us
1277
1276
child.add_node(split, node)
1278
1277
self._len = self._len - old_len + len(child)
1279
1278
self._key = None
1280
return self._search_prefix, [(b"", self)]
1279
return self._search_prefix, [("", self)]
1282
1281
def _new_child(self, search_key, klass):
1283
1282
"""Create a new child node of type klass."""
1294
1293
:param store: A VersionedFiles honouring the CHK extensions.
1295
1294
:return: An iterable of the keys inserted by this operation.
1297
for node in viewvalues(self._items):
1298
if isinstance(node, StaticTuple):
1296
for node in self._items.itervalues():
1297
if type(node) is StaticTuple:
1299
1298
# Never deserialised.
1301
1300
if node._key is not None:
1304
1303
for key in node.serialise(store):
1306
lines = [b"chknode:\n"]
1307
lines.append(b"%d\n" % self._maximum_size)
1308
lines.append(b"%d\n" % self._key_width)
1309
lines.append(b"%d\n" % self._len)
1305
lines = ["chknode:\n"]
1306
lines.append("%d\n" % self._maximum_size)
1307
lines.append("%d\n" % self._key_width)
1308
lines.append("%d\n" % self._len)
1310
1309
if self._search_prefix is None:
1311
1310
raise AssertionError("_search_prefix should not be None")
1312
lines.append(b'%s\n' % (self._search_prefix,))
1311
lines.append('%s\n' % (self._search_prefix,))
1313
1312
prefix_len = len(self._search_prefix)
1314
for prefix, node in sorted(viewitems(self._items)):
1315
if isinstance(node, StaticTuple):
1313
for prefix, node in sorted(self._items.items()):
1314
if type(node) is StaticTuple:
1318
1317
key = node._key[0]
1319
serialised = b"%s\x00%s\n" % (prefix, key)
1318
serialised = "%s\x00%s\n" % (prefix, key)
1320
1319
if not serialised.startswith(self._search_prefix):
1321
1320
raise AssertionError("prefixes mismatch: %s must start with %s"
1322
1321
% (serialised, self._search_prefix))
1323
1322
lines.append(serialised[prefix_len:])
1324
1323
sha1, _, _ = store.add_lines((None,), (), lines)
1325
self._key = StaticTuple(b"sha1:" + sha1,).intern()
1326
_get_cache()[self._key] = b''.join(lines)
1324
self._key = StaticTuple("sha1:" + sha1,).intern()
1325
_get_cache().add(self._key, ''.join(lines))
1327
1326
yield self._key
1329
1328
def _search_key(self, key):
1330
1329
"""Return the serialised key for key in this node."""
1331
1330
# search keys are fixed width. All will be self._node_width wide, so we
1332
1331
# pad as necessary.
1333
return (self._search_key_func(key) + b'\x00'*self._node_width)[:self._node_width]
1332
return (self._search_key_func(key) + '\x00'*self._node_width)[:self._node_width]
1335
1334
def _search_prefix_filter(self, key):
1336
1335
"""Serialise key for use as a prefix filter in iteritems."""
1344
1343
prefix for reaching node.
1346
1345
if offset >= self._node_width:
1347
for node in valueview(self._items):
1346
for node in self._items.values():
1348
1347
for result in node._split(offset):
1350
for key, node in self._items.items():
1351
1353
def refs(self):
1352
1354
"""Return the references to other CHK's held by this node."""
1353
1355
if self._key is None:
1354
1356
raise AssertionError("unserialised nodes have no refs.")
1356
for value in viewvalues(self._items):
1357
if isinstance(value, StaticTuple):
1358
for value in self._items.itervalues():
1359
if type(value) is StaticTuple:
1358
1360
refs.append(value)
1360
1362
refs.append(value.key())
1370
1372
return self._search_prefix
1372
1374
def unmap(self, store, key, check_remap=True):
1373
"""Remove key from this node and its children."""
1375
"""Remove key from this node and it's children."""
1374
1376
if not len(self._items):
1375
1377
raise AssertionError("can't unmap in an empty InternalNode.")
1376
1378
children = [node for node, _
1392
1394
self._items[search_key] = unmapped
1393
1395
if len(self._items) == 1:
1394
1396
# this node is no longer needed:
1395
return list(viewvalues(self._items))[0]
1396
if isinstance(unmapped, InternalNode):
1397
return self._items.values()[0]
1398
if type(unmapped) is InternalNode:
1398
1400
if check_remap:
1399
1401
return self._check_remap(store)
1439
1441
# c) With 255-way fan out, we don't want to read all 255 and destroy
1440
1442
# the page cache, just to determine that we really don't need it.
1441
1443
for node, _ in self._iter_nodes(store, batch_size=16):
1442
if isinstance(node, InternalNode):
1444
if type(node) is InternalNode:
1443
1445
# Without looking at any leaf nodes, we are sure
1445
for key, value in viewitems(node._items):
1447
for key, value in node._items.iteritems():
1446
1448
if new_leaf._map_no_split(key, value):
1448
1450
trace.mutter("remap generated a new LeafNode")
1449
1451
return new_leaf
1452
def _deserialise(data, key, search_key_func):
1454
def _deserialise(bytes, key, search_key_func):
1453
1455
"""Helper for repositorydetails - convert bytes to a node."""
1454
if data.startswith(b"chkleaf:\n"):
1455
node = LeafNode.deserialise(data, key, search_key_func=search_key_func)
1456
elif data.startswith(b"chknode:\n"):
1457
node = InternalNode.deserialise(data, key,
1456
if bytes.startswith("chkleaf:\n"):
1457
node = LeafNode.deserialise(bytes, key, search_key_func=search_key_func)
1458
elif bytes.startswith("chknode:\n"):
1459
node = InternalNode.deserialise(bytes, key,
1458
1460
search_key_func=search_key_func)
1460
1462
raise AssertionError("Unknown node type.")
1524
1526
bytes = record.get_bytes_as('fulltext')
1525
1527
node = _deserialise(bytes, record.key,
1526
1528
search_key_func=self._search_key_func)
1527
if isinstance(node, InternalNode):
1529
if type(node) is InternalNode:
1528
1530
# Note we don't have to do node.refs() because we know that
1529
1531
# there are no children that have been pushed into this node
1530
1532
# Note: Using as_st() here seemed to save 1.2MB, which would
1531
1533
# indicate that we keep 100k prefix_refs around while
1532
1534
# processing. They *should* be shorter lived than that...
1533
1535
# It does cost us ~10s of processing time
1534
prefix_refs = list(viewitems(node._items))
1536
#prefix_refs = [as_st(item) for item in node._items.iteritems()]
1537
prefix_refs = node._items.items()
1537
1540
prefix_refs = []
1538
1541
# Note: We don't use a StaticTuple here. Profiling showed a
1539
1542
# minor memory improvement (0.8MB out of 335MB peak 0.2%)
1540
1543
# But a significant slowdown (15s / 145s, or 10%)
1541
items = list(viewitems(node._items))
1544
items = node._items.items()
1542
1545
yield record, node, prefix_refs, items
1544
1547
def _read_old_roots(self):
1568
1571
# handled the interesting ones
1569
1572
for prefix, ref in old_chks_to_enqueue:
1570
1573
not_interesting = True
1571
for i in range(len(prefix), 0, -1):
1574
for i in xrange(len(prefix), 0, -1):
1572
1575
if prefix[:i] in new_prefixes:
1573
1576
not_interesting = False
1628
1631
# 'ab', then we also need to include 'a'.) So expand the
1629
1632
# new_prefixes to include all shorter prefixes
1630
1633
for prefix in list(new_prefixes):
1631
new_prefixes.update([prefix[:i] for i in range(1, len(prefix))])
1634
new_prefixes.update([prefix[:i] for i in xrange(1, len(prefix))])
1632
1635
self._enqueue_old(new_prefixes, old_chks_to_enqueue)
1634
1637
def _flush_new_queue(self):
1685
1688
for record, _, prefix_refs, items in self._read_nodes_from_store(refs):
1686
1689
# TODO: Use StaticTuple here?
1687
1690
self._all_old_items.update(items)
1688
refs = [r for _, r in prefix_refs if r not in all_old_chks]
1691
refs = [r for _,r in prefix_refs if r not in all_old_chks]
1689
1692
self._old_queue.extend(refs)
1690
1693
all_old_chks.update(refs)
1726
from ._chk_map_pyx import (
1729
from bzrlib._chk_map_pyx import (
1728
1730
_search_key_16,
1729
1731
_search_key_255,
1730
1732
_deserialise_leaf_node,
1731
1733
_deserialise_internal_node,
1733
except ImportError as e:
1735
except ImportError, e:
1734
1736
osutils.failed_to_load_extension(e)
1735
from ._chk_map_py import (
1737
from bzrlib._chk_map_py import (
1737
1738
_search_key_16,
1738
1739
_search_key_255,
1739
1740
_deserialise_leaf_node,
1740
1741
_deserialise_internal_node,
1742
search_key_registry.register(b'hash-16-way', _search_key_16)
1743
search_key_registry.register(b'hash-255-way', _search_key_255)
1743
search_key_registry.register('hash-16-way', _search_key_16)
1744
search_key_registry.register('hash-255-way', _search_key_255)
1746
1747
def _check_key(key):
1749
1750
This generally shouldn't be used in production code, but it can be helpful
1750
1751
to debug problems.
1752
if not isinstance(key, StaticTuple):
1753
if type(key) is not StaticTuple:
1753
1754
raise TypeError('key %r is not StaticTuple but %s' % (key, type(key)))
1754
1755
if len(key) != 1:
1755
1756
raise ValueError('key %r should have length 1, not %d' % (key, len(key),))
1756
if not isinstance(key[0], str):
1757
if type(key[0]) is not str:
1757
1758
raise TypeError('key %r should hold a str, not %r'
1758
1759
% (key, type(key[0])))
1759
1760
if not key[0].startswith('sha1:'):
added
removed
bzrlib/chk_map.py
