Rev 4423: Clean upt the test_inv tests that assumed _root_node was real and not just a key. in http://bazaar.launchpad.net/~jameinel/bzr/1.16-chk-direct
John Arbash Meinel
john at arbash-meinel.com
Wed Jun 17 19:41:36 BST 2009
At http://bazaar.launchpad.net/~jameinel/bzr/1.16-chk-direct
------------------------------------------------------------
revno: 4423
revision-id: john at arbash-meinel.com-20090617184126-i5u6odzoka4sk566
parent: john at arbash-meinel.com-20090617182359-3ms8skqdaxn3db9m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.16-chk-direct
timestamp: Wed 2009-06-17 13:41:26 -0500
message:
Clean upt the test_inv tests that assumed _root_node was real and not just a key.
-------------- next part --------------
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py 2009-06-02 23:53:06 +0000
+++ b/bzrlib/inventory.py 2009-06-17 18:41:26 +0000
@@ -1719,24 +1719,28 @@
result = CHKInventory(search_key_name)
result.revision_id = inventory.revision_id
result.root_id = inventory.root.file_id
+
+ entry_to_bytes = result._entry_to_bytes
+ parent_id_basename_key = result._parent_id_basename_key
+ id_to_entry_dict = {}
+ parent_id_basename_dict = {}
+ for path, entry in inventory.iter_entries():
+ id_to_entry_dict[(entry.file_id,)] = entry_to_bytes(entry)
+ p_id_key = parent_id_basename_key(entry)
+ parent_id_basename_dict[p_id_key] = entry.file_id
+
search_key_func = chk_map.search_key_registry.get(search_key_name)
- result.id_to_entry = chk_map.CHKMap(chk_store, None, search_key_func)
- result.id_to_entry._root_node.set_maximum_size(maximum_size)
- file_id_delta = []
+ root_key = chk_map.CHKMap.from_dict(chk_store, id_to_entry_dict,
+ maximum_size=maximum_size, key_width=1,
+ search_key_func=search_key_func)
+ result.id_to_entry = chk_map.CHKMap(chk_store, root_key,
+ search_key_func)
+ root_key = chk_map.CHKMap.from_dict(chk_store,
+ parent_id_basename_dict,
+ maximum_size=maximum_size, key_width=2,
+ search_key_func=search_key_func)
result.parent_id_basename_to_file_id = chk_map.CHKMap(chk_store,
- None, search_key_func)
- result.parent_id_basename_to_file_id._root_node.set_maximum_size(
- maximum_size)
- result.parent_id_basename_to_file_id._root_node._key_width = 2
- parent_id_delta = []
- for path, entry in inventory.iter_entries():
- file_id_delta.append((None, (entry.file_id,),
- result._entry_to_bytes(entry)))
- parent_id_delta.append(
- (None, result._parent_id_basename_key(entry),
- entry.file_id))
- result.id_to_entry.apply_delta(file_id_delta)
- result.parent_id_basename_to_file_id.apply_delta(parent_id_delta)
+ root_key, search_key_func)
return result
def _parent_id_basename_key(self, entry):
=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- a/bzrlib/repofmt/groupcompress_repo.py 2009-06-08 18:21:35 +0000
+++ b/bzrlib/repofmt/groupcompress_repo.py 2009-06-17 18:41:26 +0000
@@ -674,23 +674,6 @@
return self._inventory_add_lines(revision_id, parents,
inv_lines, check_content=False)
- def _get_null_inventory(self):
- serializer = self._format._serializer
- null_inv = inventory.CHKInventory(serializer.search_key_name)
- search_key_func = chk_map.search_key_registry.get(
- serializer.search_key_name)
- null_inv.id_to_entry = chk_map.CHKMap(self.chk_bytes,
- None, search_key_func)
- null_inv.id_to_entry._root_node.set_maximum_size(
- serializer.maximum_size)
- null_inv.parent_id_basename_to_file_id = chk_map.CHKMap(
- self.chk_bytes, None, search_key_func)
- null_inv.parent_id_basename_to_file_id._root_node.set_maximum_size(
- serializer.maximum_size)
- null_inv.parent_id_basename_to_file_id._root_node._key_width = 2
- null_inv.root_id = None
- return null_inv
-
def _create_inv_from_null(self, delta, new_revision_id):
"""This will mutate new_inv directly.
@@ -712,16 +695,15 @@
if new_path is None:
raise ValueError('Invalid delta, delta from NULL_REVISION has'
' no new_path %r' % (file_id,))
- # file id changes
if new_path == '':
new_inv.root_id = file_id
- parent_id_basename_key = '', ''
+ parent_id_basename_key = ('', '')
else:
utf8_entry_name = entry.name.encode('utf-8')
parent_id_basename_key = (entry.parent_id, utf8_entry_name)
new_value = entry_to_bytes(entry)
- # Create Caches?
- ## new_inv._path_to_fileid_cache[new_path] = file_id
+ # Populate Caches?
+ # new_inv._path_to_fileid_cache[new_path] = file_id
id_to_entry_dict[(file_id,)] = new_value
parent_id_basename_dict[parent_id_basename_key] = file_id
@@ -735,7 +717,7 @@
search_key_func)
root_key = chk_map.CHKMap.from_dict(self.chk_bytes,
parent_id_basename_dict,
- maximum_size=maximum_size, key_width=1,
+ maximum_size=maximum_size, key_width=2,
search_key_func=search_key_func)
new_inv.parent_id_basename_to_file_id = chk_map.CHKMap(self.chk_bytes,
root_key, search_key_func)
=== modified file 'bzrlib/tests/test_inv.py'
--- a/bzrlib/tests/test_inv.py 2009-04-09 20:23:07 +0000
+++ b/bzrlib/tests/test_inv.py 2009-06-17 18:41:26 +0000
@@ -297,7 +297,13 @@
inv.root.revision = "rootrev"
chk_bytes = self.get_chk_bytes()
chk_inv = CHKInventory.from_inventory(chk_bytes, inv, 120)
+ chk_inv.id_to_entry._ensure_root()
self.assertEqual(120, chk_inv.id_to_entry._root_node.maximum_size)
+ self.assertEqual(1, chk_inv.id_to_entry._root_node._key_width)
+ p_id_basename = chk_inv.parent_id_basename_to_file_id
+ p_id_basename._ensure_root()
+ self.assertEqual(120, p_id_basename._root_node.maximum_size)
+ self.assertEqual(2, p_id_basename._root_node._key_width)
def test___iter__(self):
inv = Inventory()
@@ -454,6 +460,8 @@
# new_inv should be the same as reference_inv.
self.assertEqual(reference_inv.revision_id, new_inv.revision_id)
self.assertEqual(reference_inv.root_id, new_inv.root_id)
+ reference_inv.id_to_entry._ensure_root()
+ new_inv.id_to_entry._ensure_root()
self.assertEqual(reference_inv.id_to_entry._root_node._key,
new_inv.id_to_entry._root_node._key)
@@ -473,6 +481,10 @@
reference_inv = CHKInventory.from_inventory(chk_bytes, inv)
delta = [(None, "A", "A-id", a_entry)]
new_inv = base_inv.create_by_apply_delta(delta, "expectedid")
+ reference_inv.id_to_entry._ensure_root()
+ reference_inv.parent_id_basename_to_file_id._ensure_root()
+ new_inv.id_to_entry._ensure_root()
+ new_inv.parent_id_basename_to_file_id._ensure_root()
# new_inv should be the same as reference_inv.
self.assertEqual(reference_inv.revision_id, new_inv.revision_id)
self.assertEqual(reference_inv.root_id, new_inv.root_id)
More information about the bazaar-commits
mailing list