Rev 4354: Remove counts of unique/repeated texts in check as unuseful and expensive. in http://people.ubuntu.com/~robertc/baz2.0/check

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/check

------------------------------------------------------------
revno: 4354
revision-id: robertc at robertcollins.net-20090512072733-5ihm1n04rgqs4eye
parent: robertc at robertcollins.net-20090512064737-iu2ktc3bryvqdyt3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: check
timestamp: Tue 2009-05-12 17:27:33 +1000
message:
  Remove counts of unique/repeated texts in check as unuseful and expensive.
=== modified file 'bzrlib/check.py'
--- a/bzrlib/check.py	2009-05-12 06:47:37 +0000
+++ b/bzrlib/check.py	2009-05-12 07:27:33 +0000
@@ -66,10 +66,8 @@
 
     def __init__(self, repository, check_repo=True):
         self.repository = repository
-        self.checked_text_cnt = 0
         self.checked_rev_cnt = 0
         self.ghosts = set()
-        self.repeated_text_cnt = 0
         self.missing_parent_links = {}
         self.missing_inventory_sha_cnt = 0
         self.missing_revision_cnt = 0
@@ -206,8 +204,6 @@
              self.repository._format)
         note('%6d revisions', self.checked_rev_cnt)
         note('%6d file-ids', len(self.checked_weaves))
-        note('%6d unique file texts', self.checked_text_cnt)
-        note('%6d repeated file texts', self.repeated_text_cnt)
         if verbose:
             note('%6d unreferenced text versions',
                 len(self.unreferenced_versions))

=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py	2009-04-10 12:11:58 +0000
+++ b/bzrlib/inventory.py	2009-05-12 07:27:33 +0000
@@ -481,16 +481,13 @@
         key = (self.file_id, self.revision)
         if key in checker.checked_texts:
             prev_sha = checker.checked_texts[key]
-            if prev_sha != self.text_sha1:
-                raise BzrCheckError(
-                    'mismatched sha1 on {%s} in {%s} (%s != %s) %r' %
-                    (self.file_id, tree_revision_id, prev_sha, self.text_sha1,
-                     t))
-            else:
-                checker.repeated_text_cnt += 1
+            if prev_sha == self.text_sha1:
                 return
+            raise BzrCheckError(
+                'mismatched sha1 on {%s} in {%s} (%s != %s) %r' %
+                (self.file_id, tree_revision_id, prev_sha, self.text_sha1,
+                 t))
 
-        checker.checked_text_cnt += 1
         # We can't check the length, because Weave doesn't store that
         # information, and the whole point of looking at the weave's
         # sha1sum is that we don't have to extract the text.

=== modified file 'bzrlib/tests/blackbox/test_check.py'
--- a/bzrlib/tests/blackbox/test_check.py	2009-05-12 05:34:15 +0000
+++ b/bzrlib/tests/blackbox/test_check.py	2009-05-12 07:27:33 +0000
@@ -39,8 +39,6 @@
         self.assertContainsRe(err, r"checked repository.*\n"
                                    r"     1 revisions\n"
                                    r"     0 file-ids\n"
-                                   r"     0 unique file texts\n"
-                                   r"     0 repeated file texts\n"
                                    )
         self.assertContainsRe(err, r"Checking branch at '.*'\.\n")
         self.assertContainsRe(err, r"checked branch.*")
@@ -60,8 +58,6 @@
                                    r"checked repository.*\n"
                                    r"     1 revisions\n"
                                    r"     0 file-ids\n"
-                                   r"     0 unique file texts\n"
-                                   r"     0 repeated file texts\n$"
                                    )
 
     def test_check_tree(self):