Author: eallen Date: 2009-03-27 13:10:46 -0400 (Fri, 27 Mar 2009) New Revision: 3234 Modified: mgmt/trunk/cumin/python/cumin/pool.py mgmt/trunk/cumin/python/cumin/slot.py mgmt/trunk/cumin/python/cumin/slot.strings Log: Remove unused MachineSet class Modified: mgmt/trunk/cumin/python/cumin/pool.py =================================================================== --- mgmt/trunk/cumin/python/cumin/pool.py 2009-03-27 15:00:51 UTC (rev 3233) +++ mgmt/trunk/cumin/python/cumin/pool.py 2009-03-27 17:10:46 UTC (rev 3234) @@ -17,7 +17,7 @@ from collector import CollectorSet, CollectorFrame, CollectorStart, CollectorStop from negotiator import NegotiatorSet, NegotiatorFrame, NegStart, NegStop from limits import LimitsSet, LimitsFrame -from slot import SlotSet, MachineSet, SlotStatSet +from slot import SlotSet, SlotStatSet from visualizations import SlotMap strings = StringCatalog(__file__) Modified: mgmt/trunk/cumin/python/cumin/slot.py =================================================================== --- mgmt/trunk/cumin/python/cumin/slot.py 2009-03-27 15:00:51 UTC (rev 3233) +++ mgmt/trunk/cumin/python/cumin/slot.py 2009-03-27 17:10:46 UTC (rev 3234) @@ -47,8 +47,5 @@ return writer.to_string() -class MachineSet(UniqueSlot): - pass - class SlotStatSet(UniqueSlot): pass Modified: mgmt/trunk/cumin/python/cumin/slot.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/slot.strings 2009-03-27 15:00:51 UTC (rev 3233) +++ mgmt/trunk/cumin/python/cumin/slot.strings 2009-03-27 17:10:46 UTC (rev 3234) @@ -34,27 +34,3 @@ [SlotStatSet.count_sql] 1 - -[MachineSet.sql] -select - machine as id, - machine, - sum(case activity when 'Busy' then 1 else 0 end) as busy, - sum(case activity when 'Idle' then 1 else 0 end) as idle, - sum(1) as total -from -(select - s.name, - s.machine, - s.pool, - s.qmf_update_time, - c.activity - from slot as s - left outer join slot_stats as c on c.id = s.stats_curr_id) as s -{sql_where} -group by machine -{sql_orderby} - -[MachineSet.count_sql] -select count(1) -from (select distinct machine from slot) as s