1
# Copyright (C) 2008, 2009 Canonical Ltd
1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
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
57
from bzrlib.static_tuple import StaticTuple
57
60
# If each line is 50 bytes, and you have 255 internal pages, with 255-way fan
58
61
# out, it takes 3.1MB to cache the layer.
59
62
_PAGE_CACHE_SIZE = 4*1024*1024
60
# We are caching bytes so len(value) is perfectly accurate
61
_page_cache = lru_cache.LRUSizeCache(_PAGE_CACHE_SIZE)
63
# Per thread caches for 2 reasons:
64
# - in the server we may be serving very different content, so we get less
66
# - we avoid locking on every cache lookup.
67
_thread_caches = threading.local()
69
_thread_caches.page_cache = None
72
"""Get the per-thread page cache.
74
We need a function to do this because in a new thread the _thread_caches
75
threading.local object does not have the cache initialized yet.
77
page_cache = getattr(_thread_caches, 'page_cache', None)
78
if page_cache is None:
79
# We are caching bytes so len(value) is perfectly accurate
80
page_cache = lru_cache.LRUSizeCache(_PAGE_CACHE_SIZE)
81
_thread_caches.page_cache = page_cache
66
89
# If a ChildNode falls below this many bytes, we check for a remap
67
90
_INTERESTING_NEW_SIZE = 50
116
139
# Check preconditions first.
117
new_items = set([key for (old, key, value) in delta if key is not None
140
as_st = StaticTuple.from_sequence
141
new_items = set([as_st(key) for (old, key, value) in delta
142
if key is not None and old is None])
119
143
existing_new = list(self.iteritems(key_filter=new_items))
121
145
raise errors.InconsistentDeltaDelta(delta,
149
173
:param node: A tuple key or node object.
150
174
:return: A node object.
152
if type(node) is tuple:
176
if type(node) is StaticTuple:
153
177
bytes = self._read_bytes(node)
154
178
return _deserialise(bytes, node,
155
179
search_key_func=self._search_key_func)
159
183
def _read_bytes(self, key):
161
return _page_cache[key]
185
return _get_cache()[key]
163
187
stream = self._store.get_record_stream([key], 'unordered', True)
164
188
bytes = stream.next().get_bytes_as('fulltext')
165
_page_cache[key] = bytes
189
_get_cache()[key] = bytes
168
192
def _dump_tree(self, include_keys=False):
196
220
for key, value in sorted(node._items.iteritems()):
197
221
# Don't use prefix nor indent here to line up when used in
198
222
# tests in conjunction with assertEqualDiff
199
result.append(' %r %r' % (key, value))
223
result.append(' %r %r' % (tuple(key), value))
220
244
root_key = klass._create_directly(store, initial_value,
221
245
maximum_size=maximum_size, key_width=key_width,
222
246
search_key_func=search_key_func)
247
if type(root_key) is not StaticTuple:
248
raise AssertionError('we got a %s instead of a StaticTuple'
240
267
node = LeafNode(search_key_func=search_key_func)
241
268
node.set_maximum_size(maximum_size)
242
269
node._key_width = key_width
243
node._items = dict(initial_value)
270
as_st = StaticTuple.from_sequence
271
node._items = dict([(as_st(key), val) for key, val
272
in initial_value.iteritems()])
244
273
node._raw_size = sum([node._key_value_len(key, value)
245
for key,value in initial_value.iteritems()])
274
for key,value in node._items.iteritems()])
246
275
node._len = len(node._items)
247
276
node._compute_search_prefix()
248
277
node._compute_serialised_prefix()
484
513
def iteritems(self, key_filter=None):
485
514
"""Iterate over the entire CHKMap's contents."""
486
515
self._ensure_root()
516
if key_filter is not None:
517
as_st = StaticTuple.from_sequence
518
key_filter = [as_st(key) for key in key_filter]
487
519
return self._root_node.iteritems(self._store, key_filter=key_filter)
490
522
"""Return the key for this map."""
491
if type(self._root_node) is tuple:
523
if type(self._root_node) is StaticTuple:
492
524
return self._root_node
494
526
return self._root_node._key
503
535
:param key: A key to map.
504
536
:param value: The value to assign to key.
538
key = StaticTuple.from_sequence(key)
506
539
# Need a root object.
507
540
self._ensure_root()
508
541
prefix, node_details = self._root_node.map(self._store, key, value)
519
552
def _node_key(self, node):
520
553
"""Get the key for a node whether it's a tuple or node."""
521
554
if type(node) is tuple:
555
node = StaticTuple.from_sequence(node)
556
if type(node) is StaticTuple:
526
561
def unmap(self, key, check_remap=True):
527
562
"""remove key from the map."""
563
key = StaticTuple.from_sequence(key)
528
564
self._ensure_root()
529
565
if type(self._root_node) is InternalNode:
530
566
unmapped = self._root_node.unmap(self._store, key,
706
742
:param bytes: The bytes of the node.
707
743
:param key: The key that the serialised node has.
745
key = static_tuple.expect_static_tuple(key)
709
746
return _deserialise_leaf_node(bytes, key,
710
747
search_key_func=search_key_func)
881
918
lines.append(serialized[prefix_len:])
882
919
lines.extend(value_lines)
883
920
sha1, _, _ = store.add_lines((None,), (), lines)
884
self._key = ("sha1:" + sha1,)
921
self._key = StaticTuple("sha1:" + sha1,).intern()
885
922
bytes = ''.join(lines)
886
923
if len(bytes) != self._current_size():
887
924
raise AssertionError('Invalid _current_size')
888
_page_cache.add(self._key, bytes)
925
_get_cache().add(self._key, bytes)
889
926
return [self._key]
1004
1041
:param key: The key that the serialised node has.
1005
1042
:return: An InternalNode instance.
1044
key = static_tuple.expect_static_tuple(key)
1007
1045
return _deserialise_internal_node(bytes, key,
1008
1046
search_key_func=search_key_func)
1034
1072
# for whatever we are missing
1035
1073
shortcut = True
1036
1074
for prefix, node in self._items.iteritems():
1037
if node.__class__ is tuple:
1075
if node.__class__ is StaticTuple:
1038
1076
keys[node] = (prefix, None)
1040
1078
yield node, None
1069
1107
# A given key can only match 1 child node, if it isn't
1070
1108
# there, then we can just return nothing
1072
if node.__class__ is tuple:
1110
if node.__class__ is StaticTuple:
1073
1111
keys[node] = (search_prefix, [key])
1075
1113
# This is loaded, and the only thing that can match,
1102
1140
# We can ignore this one
1104
1142
node_key_filter = prefix_to_keys[search_prefix]
1105
if node.__class__ is tuple:
1143
if node.__class__ is StaticTuple:
1106
1144
keys[node] = (search_prefix, node_key_filter)
1108
1146
yield node, node_key_filter
1117
1155
if sub_prefix in length_filter:
1118
1156
node_key_filter.extend(prefix_to_keys[sub_prefix])
1119
1157
if node_key_filter: # this key matched something, yield it
1120
if node.__class__ is tuple:
1158
if node.__class__ is StaticTuple:
1121
1159
keys[node] = (prefix, node_key_filter)
1123
1161
yield node, node_key_filter
1157
1195
prefix, node_key_filter = keys[record.key]
1158
1196
node_and_filters.append((node, node_key_filter))
1159
1197
self._items[prefix] = node
1160
_page_cache.add(record.key, bytes)
1198
_get_cache().add(record.key, bytes)
1161
1199
for info in node_and_filters:
1272
1310
lines.append('%s\n' % (self._search_prefix,))
1273
1311
prefix_len = len(self._search_prefix)
1274
1312
for prefix, node in sorted(self._items.items()):
1275
if type(node) is tuple:
1313
if type(node) is StaticTuple:
1278
1316
key = node._key[0]
1282
1320
% (serialised, self._search_prefix))
1283
1321
lines.append(serialised[prefix_len:])
1284
1322
sha1, _, _ = store.add_lines((None,), (), lines)
1285
self._key = ("sha1:" + sha1,)
1286
_page_cache.add(self._key, ''.join(lines))
1323
self._key = StaticTuple("sha1:" + sha1,).intern()
1324
_get_cache().add(self._key, ''.join(lines))
1287
1325
yield self._key
1289
1327
def _search_key(self, key):
1438
1476
def __init__(self, store, new_root_keys, old_root_keys,
1439
1477
search_key_func, pb=None):
1478
# TODO: Should we add a StaticTuple barrier here? It would be nice to
1479
# force callers to use StaticTuple, because there will often be
1480
# lots of keys passed in here. And even if we cast it locally,
1481
# that just meanst that we will have *both* a StaticTuple and a
1482
# tuple() in memory, referring to the same object. (so a net
1483
# increase in memory, not a decrease.)
1440
1484
self._store = store
1441
1485
self._new_root_keys = new_root_keys
1442
1486
self._old_root_keys = old_root_keys
1444
1488
# All uninteresting chks that we have seen. By the time they are added
1445
1489
# here, they should be either fully ignored, or queued up for
1491
# TODO: This might grow to a large size if there are lots of merge
1492
# parents, etc. However, it probably doesn't scale to O(history)
1493
# like _processed_new_refs does.
1447
1494
self._all_old_chks = set(self._old_root_keys)
1448
1495
# All items that we have seen from the old_root_keys
1449
1496
self._all_old_items = set()
1450
1497
# These are interesting items which were either read, or already in the
1451
1498
# interesting queue (so we don't need to walk them again)
1499
# TODO: processed_new_refs becomes O(all_chks), consider switching to
1452
1501
self._processed_new_refs = set()
1453
1502
self._search_key_func = search_key_func
1461
1510
self._state = None
1463
1512
def _read_nodes_from_store(self, keys):
1464
# We chose not to use _page_cache, because we think in terms of records
1465
# to be yielded. Also, we expect to touch each page only 1 time during
1466
# this code. (We may want to evaluate saving the raw bytes into the
1467
# page cache, which would allow a working tree update after the fetch
1468
# to not have to read the bytes again.)
1513
# We chose not to use _get_cache(), because we think in
1514
# terms of records to be yielded. Also, we expect to touch each page
1515
# only 1 time during this code. (We may want to evaluate saving the
1516
# raw bytes into the page cache, which would allow a working tree
1517
# update after the fetch to not have to read the bytes again.)
1518
as_st = StaticTuple.from_sequence
1469
1519
stream = self._store.get_record_stream(keys, 'unordered', True)
1470
1520
for record in stream:
1471
1521
if self._pb is not None:
1478
1528
if type(node) is InternalNode:
1479
1529
# Note we don't have to do node.refs() because we know that
1480
1530
# there are no children that have been pushed into this node
1531
# Note: Using as_st() here seemed to save 1.2MB, which would
1532
# indicate that we keep 100k prefix_refs around while
1533
# processing. They *should* be shorter lived than that...
1534
# It does cost us ~10s of processing time
1535
#prefix_refs = [as_st(item) for item in node._items.iteritems()]
1481
1536
prefix_refs = node._items.items()
1484
1539
prefix_refs = []
1540
# Note: We don't use a StaticTuple here. Profiling showed a
1541
# minor memory improvement (0.8MB out of 335MB peak 0.2%)
1542
# But a significant slowdown (15s / 145s, or 10%)
1485
1543
items = node._items.items()
1486
1544
yield record, node, prefix_refs, items
1495
1553
if p_r[1] not in all_old_chks]
1496
1554
new_refs = [p_r[1] for p_r in prefix_refs]
1497
1555
all_old_chks.update(new_refs)
1556
# TODO: This might be a good time to turn items into StaticTuple
1557
# instances and possibly intern them. However, this does not
1558
# impact 'initial branch' performance, so I'm not worrying
1498
1560
self._all_old_items.update(items)
1499
1561
# Queue up the uninteresting references
1500
1562
# Don't actually put them in the 'to-read' queue until we have
1553
1615
# current design allows for this, as callers will do the work
1554
1616
# to make the results unique. We might profile whether we
1555
1617
# gain anything by ensuring unique return values for items
1618
# TODO: This might be a good time to cast to StaticTuple, as
1619
# self._new_item_queue will hold the contents of multiple
1620
# records for an extended lifetime
1556
1621
new_items = [item for item in items
1557
1622
if item not in self._all_old_items]
1558
1623
self._new_item_queue.extend(new_items)
1584
1649
yield None, new_items
1585
1650
refs = refs.difference(all_old_chks)
1651
processed_new_refs.update(refs)
1653
# TODO: Using a SimpleSet for self._processed_new_refs and
1654
# saved as much as 10MB of peak memory. However, it requires
1655
# implementing a non-pyrex version.
1587
1656
next_refs = set()
1588
1657
next_refs_update = next_refs.update
1589
1658
# Inlining _read_nodes_from_store improves 'bzr branch bzr.dev'
1590
1659
# from 1m54s to 1m51s. Consider it.
1591
1660
for record, _, p_refs, items in self._read_nodes_from_store(refs):
1592
items = [item for item in items
1593
if item not in all_old_items]
1662
# using the 'if' check saves about 145s => 141s, when
1663
# streaming initial branch of Launchpad data.
1664
items = [item for item in items
1665
if item not in all_old_items]
1594
1666
yield record, items
1595
1667
next_refs_update([p_r[1] for p_r in p_refs])
1669
# set1.difference(set/dict) walks all of set1, and checks if it
1670
# exists in 'other'.
1671
# set1.difference(iterable) walks all of iterable, and does a
1672
# 'difference_update' on a clone of set1. Pick wisely based on the
1673
# expected sizes of objects.
1674
# in our case it is expected that 'new_refs' will always be quite
1596
1676
next_refs = next_refs.difference(all_old_chks)
1597
1677
next_refs = next_refs.difference(processed_new_refs)
1598
1678
processed_new_refs.update(next_refs)
1605
1685
self._old_queue = []
1606
1686
all_old_chks = self._all_old_chks
1607
1687
for record, _, prefix_refs, items in self._read_nodes_from_store(refs):
1688
# TODO: Use StaticTuple here?
1608
1689
self._all_old_items.update(items)
1609
1690
refs = [r for _,r in prefix_refs if r not in all_old_chks]
1610
1691
self._old_queue.extend(refs)
1661
1742
search_key_registry.register('hash-16-way', _search_key_16)
1662
1743
search_key_registry.register('hash-255-way', _search_key_255)
1746
def _check_key(key):
1747
"""Helper function to assert that a key is properly formatted.
1749
This generally shouldn't be used in production code, but it can be helpful
1752
if type(key) is not StaticTuple:
1753
raise TypeError('key %r is not StaticTuple but %s' % (key, type(key)))
1755
raise ValueError('key %r should have length 1, not %d' % (key, len(key),))
1756
if type(key[0]) is not str:
1757
raise TypeError('key %r should hold a str, not %r'
1758
% (key, type(key[0])))
1759
if not key[0].startswith('sha1:'):
1760
raise ValueError('key %r should point to a sha1:' % (key,))
added
removed
bzrlib/chk_map.py
