Rev 3649: Restore the exact old tests, only assert that in http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/index_builder_cleanup

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/index_builder_cleanup

------------------------------------------------------------
revno: 3649
revision-id: john at arbash-meinel.com-20080825164250-glc5z58nhwzpgdo2
parent: john at arbash-meinel.com-20080825162901-1qweamxqdvv59ie9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: index_builder_cleanup
timestamp: Mon 2008-08-25 11:42:50 -0500
message:
  Restore the exact old tests, only assert that
  _nodes_by_key is None, rather than an empty dict.
modified:
  bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
  bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
-------------- next part --------------
=== modified file 'bzrlib/btree_index.py'
--- a/bzrlib/btree_index.py	2008-08-25 16:24:09 +0000
+++ b/bzrlib/btree_index.py	2008-08-25 16:42:50 +0000
@@ -25,7 +25,6 @@
 import sha
 import struct
 import tempfile
-import time
 import zlib
 
 from bzrlib import (
@@ -60,7 +59,6 @@
 miss_attempts = 0  # Missed this entry while looking up
 bisect_shortcut = [0, 0]
 dupes = [0]
-_add_node_time = [0.0]
 
 
 class _BuilderRow(object):

=== modified file 'bzrlib/tests/test_btree_index.py'
--- a/bzrlib/tests/test_btree_index.py	2008-08-25 16:24:09 +0000
+++ b/bzrlib/tests/test_btree_index.py	2008-08-25 16:42:50 +0000
@@ -349,19 +349,23 @@
         # predictably.
         self.assertEqual(1, len(builder._nodes))
         self.assertEqual(1, len(builder._keys))
+        self.assertIs(None, builder._nodes_by_key)
         builder.add_node(*nodes[1])
         self.assertEqual(0, len(builder._nodes))
         self.assertEqual(0, len(builder._keys))
+        self.assertIs(None, builder._nodes_by_key)
         self.assertEqual(1, len(builder._backing_indices))
         self.assertEqual(2, builder._backing_indices[0].key_count())
         # now back to memory
         builder.add_node(*nodes[2])
         self.assertEqual(1, len(builder._nodes))
         self.assertEqual(1, len(builder._keys))
+        self.assertIs(None, builder._nodes_by_key)
         # And spills to a second backing index combing all
         builder.add_node(*nodes[3])
         self.assertEqual(0, len(builder._nodes))
         self.assertEqual(0, len(builder._keys))
+        self.assertIs(None, builder._nodes_by_key)
         self.assertEqual(2, len(builder._backing_indices))
         self.assertEqual(None, builder._backing_indices[0])
         self.assertEqual(4, builder._backing_indices[1].key_count())
@@ -370,6 +374,7 @@
         builder.add_node(*nodes[5])
         self.assertEqual(0, len(builder._nodes))
         self.assertEqual(0, len(builder._keys))
+        self.assertIs(None, builder._nodes_by_key)
         self.assertEqual(2, len(builder._backing_indices))
         self.assertEqual(2, builder._backing_indices[0].key_count())
         self.assertEqual(4, builder._backing_indices[1].key_count())
@@ -434,19 +439,23 @@
         # predictably.
         self.assertEqual(1, len(builder._keys))
         self.assertEqual(1, len(builder._nodes))
+        self.assertIs(None, builder._nodes_by_key)
         builder.add_node(*nodes[1])
         self.assertEqual(0, len(builder._keys))
         self.assertEqual(0, len(builder._nodes))
+        self.assertIs(None, builder._nodes_by_key)
         self.assertEqual(1, len(builder._backing_indices))
         self.assertEqual(2, builder._backing_indices[0].key_count())
         # now back to memory
         builder.add_node(*nodes[2])
         self.assertEqual(1, len(builder._nodes))
         self.assertEqual(1, len(builder._keys))
+        self.assertIs(None, builder._nodes_by_key)
         # And spills to a second backing index combing all
         builder.add_node(*nodes[3])
         self.assertEqual(0, len(builder._nodes))
         self.assertEqual(0, len(builder._keys))
+        self.assertIs(None, builder._nodes_by_key)
         self.assertEqual(2, len(builder._backing_indices))
         self.assertEqual(None, builder._backing_indices[0])
         self.assertEqual(4, builder._backing_indices[1].key_count())
@@ -455,6 +464,7 @@
         builder.add_node(*nodes[5])
         self.assertEqual(0, len(builder._nodes))
         self.assertEqual(0, len(builder._keys))
+        self.assertIs(None, builder._nodes_by_key)
         self.assertEqual(2, len(builder._backing_indices))
         self.assertEqual(2, builder._backing_indices[0].key_count())
         self.assertEqual(4, builder._backing_indices[1].key_count())
@@ -484,11 +494,11 @@
         self.assertEqual([(builder,) + node for node in sorted(nodes[:13])],
             list(builder.iter_all_entries()))
         # Two nodes - one memory one disk
-        self.assertEqual(sorted(set([(builder,) + node for node in nodes[11:13]])),
-            sorted(set(builder.iter_entries([nodes[12][0], nodes[11][0]]))))
+        self.assertEqual(set([(builder,) + node for node in nodes[11:13]]),
+            set(builder.iter_entries([nodes[12][0], nodes[11][0]])))
         self.assertEqual(13, builder.key_count())
-        self.assertEqual(sorted(set([(builder,) + node for node in nodes[11:13]])),
-            sorted(set(builder.iter_entries_prefix([nodes[12][0], nodes[11][0]]))))
+        self.assertEqual(set([(builder,) + node for node in nodes[11:13]]),
+            set(builder.iter_entries_prefix([nodes[12][0], nodes[11][0]])))
         builder.add_node(*nodes[13])
         self.assertEqual(3, len(builder._backing_indices))
         self.assertEqual(2, builder._backing_indices[0].key_count())