Rev 3815: Include a _search_key_plain function. in http://bzr.arbash-meinel.com/branches/bzr/brisbane/hash_search_key

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/brisbane/hash_search_key

------------------------------------------------------------
revno: 3815
revision-id: john at arbash-meinel.com-20090121221958-73e6ejetze235lpn
parent: john at arbash-meinel.com-20090121201426-dorxs36a1djjm6a2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: hash_search_key
timestamp: Wed 2009-01-21 16:19:58 -0600
message:
  Include a _search_key_plain function.
-------------- next part --------------
=== modified file 'bzrlib/chk_map.py'
--- a/bzrlib/chk_map.py	2009-01-21 20:05:29 +0000
+++ b/bzrlib/chk_map.py	2009-01-21 22:19:58 +0000
@@ -56,6 +56,11 @@
 _page_cache = lru_cache.LRUSizeCache(_PAGE_CACHE_SIZE)
 
 
+def _search_key_plain(key):
+    """Map the key tuple into a search string that just uses the key bytes."""
+    return '\x00'.join(key)
+
+
 def _search_key_16(key):
     """Map the key tuple into a search key string which has 16-way fan out."""
     return '\x00'.join(['%08X' % abs(zlib.crc32(bit)) for bit in key])
@@ -86,7 +91,7 @@
         """
         self._store = store
         if search_key_func is None:
-            search_key_func = '\x00'.join
+            search_key_func = _search_key_plain
         self._search_key_func = search_key_func
         if root_key is None:
             self._root_node = LeafNode(search_key_func=search_key_func)
@@ -524,7 +529,7 @@
         self._common_serialised_prefix = None
         self._serialise_key = '\x00'.join
         if search_key_func is None:
-            self._search_key_func = self._serialise_key
+            self._search_key_func = _search_key_plain
         else:
             self._search_key_func = search_key_func
 
@@ -777,7 +782,7 @@
         self._node_width = 0
         self._search_prefix = prefix
         if search_key_func is None:
-            self._search_key_func = '\x00'.join
+            self._search_key_func = _search_key_plain
         else:
             self._search_key_func = search_key_func