Rev 4503: Remove the thunk. in http://bazaar.launchpad.net/~jameinel/bzr/1.17-btree-faster

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.17-btree-faster

------------------------------------------------------------
revno: 4503
revision-id: john at arbash-meinel.com-20090701205138-a0f340l8wib7mwb6
parent: john at arbash-meinel.com-20090701205037-ck7kpf8023fkg1d0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.17-btree-faster
timestamp: Wed 2009-07-01 15:51:38 -0500
message:
  Remove the thunk.
-------------- next part --------------
=== modified file 'bzrlib/btree_index.py'
--- a/bzrlib/btree_index.py	2009-07-01 20:50:37 +0000
+++ b/bzrlib/btree_index.py	2009-07-01 20:51:38 +0000
@@ -1352,7 +1352,8 @@
                     continue
             bytes = zlib.decompress(data)
             if bytes.startswith(_LEAF_FLAG):
-                node = _LeafNode(bytes, self._key_length, self.node_ref_lists)
+                node = _btree_serializer._LeafNode(bytes, self._key_length,
+                                                   self.node_ref_lists)
             elif bytes.startswith(_INTERNAL_FLAG):
                 node = _InternalNode(bytes)
             else:
@@ -1377,9 +1378,6 @@
             pass
 
 
-def _LeafNode(*args, **kwargs):
-    return _btree_serializer._LeafNode(*args, **kwargs)
-
 try:
     from bzrlib import _btree_serializer_pyx as _btree_serializer
 except ImportError:

=== modified file 'bzrlib/tests/test_btree_index.py'
--- a/bzrlib/tests/test_btree_index.py	2009-07-01 20:50:37 +0000
+++ b/bzrlib/tests/test_btree_index.py	2009-07-01 20:51:38 +0000
@@ -225,11 +225,11 @@
         # We already know serialisation works for leaves, check key selection:
         leaf1_bytes = zlib.decompress(leaf1)
         sorted_node_keys = sorted(node[0] for node in nodes)
-        node = btree_index._LeafNode(leaf1_bytes, 1, 0)
+        node = btree_index._btree_serializer._LeafNode(leaf1_bytes, 1, 0)
         self.assertEqual(231, len(node))
         self.assertEqual(sorted_node_keys[:231], sorted(node.keys))
         leaf2_bytes = zlib.decompress(leaf2)
-        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
+        node = btree_index._btree_serializer._LeafNode(leaf2_bytes, 1, 0)
         self.assertEqual(400 - 231, len(node))
         self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
 
@@ -250,7 +250,7 @@
         # Check thelast page is well formed
         leaf2 = content[74:]
         leaf2_bytes = zlib.decompress(leaf2)
-        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
+        node = btree_index._btree_serializer._LeafNode(leaf2_bytes, 1, 0)
         self.assertEqual(10, len(node))
         sorted_node_keys = sorted(node[0] for node in nodes)
         self.assertEqual(sorted_node_keys, sorted(node.keys))
@@ -272,7 +272,7 @@
         # Check the last page is well formed
         leaf2 = content[8192:]
         leaf2_bytes = zlib.decompress(leaf2)
-        node = btree_index._LeafNode(leaf2_bytes, 1, 0)
+        node = btree_index._btree_serializer._LeafNode(leaf2_bytes, 1, 0)
         self.assertEqual(400 - 231, len(node))
         sorted_node_keys = sorted(node[0] for node in nodes)
         self.assertEqual(sorted_node_keys[231:], sorted(node.keys))
@@ -999,7 +999,7 @@
             "2222222222222222222222222222222222222222\x00\x00value:2\n"
             "3333333333333333333333333333333333333333\x00\x00value:3\n"
             "4444444444444444444444444444444444444444\x00\x00value:4\n")
-        node = btree_index._LeafNode(node_bytes, 1, 0)
+        node = btree_index._btree_serializer._LeafNode(node_bytes, 1, 0)
         # We do direct access, or don't care about order, to leaf nodes most of
         # the time, so a dict is useful:
         self.assertEqual({
@@ -1018,7 +1018,7 @@
             "11\x0044\x00\t11\x00ref00\x00value:4\n"
             ""
             )
-        node = btree_index._LeafNode(node_bytes, 2, 2)
+        node = btree_index._btree_serializer._LeafNode(node_bytes, 2, 2)
         # We do direct access, or don't care about order, to leaf nodes most of
         # the time, so a dict is useful:
         self.assertEqual({
@@ -1059,7 +1059,7 @@
             "11\x0044\x00\t11\x00ref00\x00value:4\n"
             ""
             )
-        node = btree_index._LeafNode(node_bytes, 2, 2)
+        node = btree_index._btree_serializer._LeafNode(node_bytes, 2, 2)
         # We do direct access, or don't care about order, to leaf nodes most of
         # the time, so a dict is useful:
         self.assertEqual({