Rev 4561: remove the counters, etc. in http://bazaar.launchpad.net/~jameinel/bzr/1.18-2a-bundle-performance

John Arbash Meinel john at arbash-meinel.com
Tue Jul 28 21:24:12 BST 2009


At http://bazaar.launchpad.net/~jameinel/bzr/1.18-2a-bundle-performance

------------------------------------------------------------
revno: 4561
revision-id: john at arbash-meinel.com-20090728202147-g2oqb05uvkt85jh8
parent: john at arbash-meinel.com-20090727191139-bqni7wj0x4eqacjj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.18-2a-bundle-performance
timestamp: Tue 2009-07-28 15:21:47 -0500
message:
  remove the counters, etc.
-------------- next part --------------
=== modified file 'bzrlib/bundle/serializer/v4.py'
--- a/bzrlib/bundle/serializer/v4.py	2009-07-27 19:11:39 +0000
+++ b/bzrlib/bundle/serializer/v4.py	2009-07-28 20:21:47 +0000
@@ -506,11 +506,6 @@
     target = property(_get_target)
 
 
-_counters = {}
-def update_counter(name, adjust):
-    _counters[name] = _counters.get(name, 0) + 1
-
-
 class RevisionInstaller(object):
     """Installs revisions into a repository"""
 
@@ -612,13 +607,10 @@
         cached_parent_texts = {}
         remaining_parent_ids = []
         for parent_id in parent_ids:
-            update_counter('parents', 1)
             p_text = inventory_text_cache.get(parent_id, None)
             if p_text is None:
-                update_counter('missing parent text', 1)
                 remaining_parent_ids.append(parent_id)
             else:
-                update_counter('cached parent text', 1)
                 cached_parent_texts[parent_id] = p_text
         ghosts = ()
         # TODO: Use inventory_cache to grab inventories we already have in
@@ -688,21 +680,15 @@
                 inventory_text_cache[revision_id] = inv_text
                 target_inv = self._source_serializer.read_inventory_from_string(
                     inv_text)
-                # TODO: we might try caching the parent inventories themselves,
-                #       and then using inv._make_delta and
-                #       add_inventory_by_delta instead of always using
-                #       add_inventory
                 self._handle_root(target_inv, parent_ids)
                 parent_inv = None
                 if parent_ids:
                     parent_inv = inventory_cache.get(parent_ids[0], None)
                 try:
                     if parent_inv is None:
-                        update_counter('missing parent inv', 1)
                         self._repository.add_inventory(revision_id, target_inv,
                                                        parent_ids)
                     else:
-                        update_counter('cached parent inv', 1)
                         delta = target_inv._make_delta(parent_inv)
                         self._repository.add_inventory_by_delta(parent_ids[0],
                             delta, revision_id, parent_ids)
@@ -711,8 +697,6 @@
                 inventory_cache[revision_id] = target_inv
         finally:
             pb.finished()
-            import pprint
-            pprint.pprint(_counters)
 
     def _handle_root(self, target_inv, parent_ids):
         revision_id = target_inv.revision_id



More information about the bazaar-commits mailing list