[kupfer: 17/51] grouping: Reduce debug output



commit 52035633057bb94050a69285db64e18bb5777c86
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Thu Jan 7 03:43:58 2010 +0100

    grouping: Reduce debug output

 kupfer/obj/grouping.py |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/kupfer/obj/grouping.py b/kupfer/obj/grouping.py
index f3c318e..dcf638e 100644
--- a/kupfer/obj/grouping.py
+++ b/kupfer/obj/grouping.py
@@ -65,13 +65,10 @@ class GroupingSource (Source):
 		self.sources = sources
 
 	def get_leaves(self, force_update=False):
-		st = time.time()
-		self.output_debug("START")
-
+		starttime = time.time()
 		# map (slot, value) -> group
 		groups = {}
 		for src in self.sources:
-			self.output_debug("Merging", src)
 			leaves = Source.get_leaves(src, force_update)
 			for leaf in leaves:
 				try:
@@ -89,8 +86,6 @@ class GroupingSource (Source):
 					self.output_error("GroupingLeaf has no grouping slots",
 							repr(leaf))
 
-		self.output_debug("LISTED ALL", time.time() -st)
-
 		# Keep track of keys that are only duplicate references
 		redundant_keys = set()
 
@@ -110,8 +105,6 @@ class GroupingSource (Source):
 				for slot2 in leaf.grouping_slots:
 					for value2 in leaf.all(slot2):
 						merge_groups((slot, value), (slot2, value2))
-		self.output_debug("MERGED ALL", time.time() - st)
-
 		if self.should_sort_lexically():
 			sort_func = utils.locale_sort
 		else:
@@ -121,7 +114,10 @@ class GroupingSource (Source):
 		keys.difference_update(redundant_keys)
 		for leaf in sort_func(self._make_group_leader(groups[K]) for K in keys):
 			yield leaf
-		self.output_debug("END", time.time() - st)
+		mergetime = time.time() - starttime
+		if mergetime > 0.05:
+			self.output_debug("Warning(?): merged in %s seconds" % mergetime)
+
 
 	@classmethod
 	def _make_group_leader(cls, leaves):



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]