Author: tmckay Date: 2010-12-23 20:14:11 +0000 (Thu, 23 Dec 2010) New Revision: 4445
Modified: branches/scale_testing/mint/python/mint/update.py Log: Fix up null object stats cases. Apparently Python 2.4 deals with None + int differently than 2.6 (or running on grid0 directly causes a different execution path)
Modified: branches/scale_testing/mint/python/mint/update.py =================================================================== --- branches/scale_testing/mint/python/mint/update.py 2010-12-22 13:32:50 UTC (rev 4444) +++ branches/scale_testing/mint/python/mint/update.py 2010-12-23 20:14:11 UTC (rev 4445) @@ -116,6 +116,13 @@ self.objects_deleted_by_class = defaultdict(int) self.objects_dropped_by_class = defaultdict(int)
+ for pkg in app.model._packages: + for cls in pkg._classes: + self.objects_created_by_class[cls] = 0 + self.objects_updated_by_class[cls] = 0 + self.objects_deleted_by_class[cls] = 0 + self.objects_dropped_by_class[cls] = 0 + self.sql_ops = 0 self.errors = 0
@@ -351,6 +358,8 @@ except: cls = None if cls != None: + if thread.stats.objects_dropped_by_class == None: + thread.stats.objects_dropped_by_class = 0 thread.stats.objects_dropped_by_class[cls] += 1
except: @@ -510,6 +519,8 @@ self.model.print_event(3, "Created %s", obj)
stats.objects_created += 1 + if stats.objects_created_by_class[cls] == None: + stats.objects_created_by_class[cls] = 0 stats.objects_created_by_class[cls] += 1
return obj @@ -571,6 +582,8 @@ self.model.print_event(4, "Updated %s", obj)
stats.objects_updated += 1 + if stats.objects_updated_by_class[cls] == None: + stats.objects_updated_by_class[cls] = 0 stats.objects_updated_by_class[cls] += 1
def delete_object(self, cursor, stats, obj): @@ -579,6 +592,8 @@ self.model.print_event(3, "Deleted %s", obj)
stats.objects_deleted += 1 + if stats.objects_deleted_by_class[cls] == None: + stats.objects_deleted_by_class[cls] = 0 stats.objects_deleted_by_class[obj._class] += 1
def process_properties(self, obj, columns, cursor):