[rhmessaging-commits] rhmessaging commits: r2889 - in mgmt/trunk: mint/python/mint and 1 other directories.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Wed Nov 26 13:25:56 EST 2008
Author: justi9
Date: 2008-11-26 13:25:55 -0500 (Wed, 26 Nov 2008)
New Revision: 2889
Modified:
mgmt/trunk/cumin/python/cumin/binding.py
mgmt/trunk/cumin/python/cumin/brokerlink.py
mgmt/trunk/cumin/python/cumin/brokerlink.strings
mgmt/trunk/cumin/python/cumin/client.strings
mgmt/trunk/cumin/python/cumin/collector.py
mgmt/trunk/cumin/python/cumin/exchange.strings
mgmt/trunk/cumin/python/cumin/job.py
mgmt/trunk/cumin/python/cumin/job.strings
mgmt/trunk/cumin/python/cumin/limits.py
mgmt/trunk/cumin/python/cumin/model.py
mgmt/trunk/cumin/python/cumin/negotiator.py
mgmt/trunk/cumin/python/cumin/queue.py
mgmt/trunk/cumin/python/cumin/queue.strings
mgmt/trunk/cumin/python/cumin/system.py
mgmt/trunk/cumin/python/cumin/test.py
mgmt/trunk/cumin/python/cumin/util.py
mgmt/trunk/cumin/python/cumin/widgets.py
mgmt/trunk/cumin/python/cumin/widgets.strings
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/python/mint/schemaparser.py
mgmt/trunk/mint/python/mint/update.py
mgmt/trunk/mint/sql/schema.sql
Log:
Rename timestamp fields to reflect their origin in the qmf
infrastructure.
Note! With this change, a reschema is required.
Modified: mgmt/trunk/cumin/python/cumin/binding.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/binding.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/binding.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -298,7 +298,7 @@
writer = Writer()
for exchange in sortedExchanges:
if ExchangeInfo.is_builtin(exchange) or \
- (not exchange._get_deletionTime() and \
+ (not exchange._get_qmfDeleteTime() and \
not (self.state.is_active(session) and not is_active(exchange))):
# instance_key gives us a unique path for each exchange
# we will be rendering
Modified: mgmt/trunk/cumin/python/cumin/brokerlink.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -153,7 +153,7 @@
return "Link Routes %s" % fmt_count(count)
def render_sql_where(self, session, link):
- return "where l.id = %(link_id)r and b.deletion_time is null"
+ return "where l.id = %(link_id)r and b.qmf_delete_time is null"
def get_sql_values(self, session, link):
return {"link_id": link.id}
@@ -352,7 +352,7 @@
for exchange in sortedExchanges:
if ExchangeInfo.is_builtin(exchange) or \
- (not exchange._get_deletionTime() and \
+ (not exchange._get_qmfDeleteTime() and \
not (self.state.is_active(session) and not is_active(exchange))):
if not exchange.name in ["qpid.management", ""]:
if not self.param.get(session):
@@ -426,7 +426,7 @@
def process_display(self, session, *args):
if not self.tag.get(session):
- self.tag.set(session, args[0].managedBroker)
+ self.tag.set(session, args[0].qmfBrokerId)
if not self.excludes.get(session):
self.excludes.set(session, "%s:%s" % (args[0].host, args[0].port))
Modified: mgmt/trunk/cumin/python/cumin/brokerlink.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/brokerlink.strings 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/brokerlink.strings 2008-11-26 18:25:55 UTC (rev 2889)
@@ -57,7 +57,7 @@
b.excludes,
l.host,
l.port,
- l.managed_broker
+ l.qmf_broker_id
from bridge as b
join link as l on l.id = b.link_id
left outer join bridge_stats as c on c.id = b.stats_curr_id
Modified: mgmt/trunk/cumin/python/cumin/client.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/client.strings 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/client.strings 2008-11-26 18:25:55 UTC (rev 2889)
@@ -6,18 +6,18 @@
l.federation_link as fedlink,
l.address as addr,
(c.bytes_from_client - p.bytes_from_client)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as bs,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as bs,
case when p.bytes_from_client is null then true else false end as bs_is_null,
(c.frames_from_client - p.frames_from_client)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as fs,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as fs,
case when p.frames_from_client is null then true else false end as fs_is_null,
(c.bytes_to_client - p.bytes_to_client)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as br,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as br,
case when p.bytes_to_client is null then true else false end as br_is_null,
(c.frames_to_client - p.frames_to_client)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as fr,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as fr,
case when p.frames_to_client is null then true else false end as fr_is_null,
- c.rec_time
+ c.qmf_update_time
from client_connection as l
left outer join client_connection_stats as c on c.id = l.stats_curr_id
left outer join client_connection_stats as p on p.id = l.stats_prev_id
Modified: mgmt/trunk/cumin/python/cumin/collector.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/collector.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/collector.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -44,10 +44,10 @@
return "Collectors %s" % fmt_count(count)
def render_sql_where(self, session, collector):
- sql = "deletion_time is null"
- #sql = "((cs.rec_time is null and c.rec_time > now() - interval '10 minutes') or " + \
- # "(cs.rec_time > now() - interval '10 minutes')" + \
- # " and deletion_time is null)"
+ sql = "qmf_delete_time is null"
+ #sql = "((cs.qmf_update_time is null and c.qmf_update_time > now() - interval '10 minutes') or " + \
+ # "(cs.qmf_update_time > now() - interval '10 minutes')" + \
+ # " and qmf_delete_time is null)"
return "where %s" % sql
class NameColumn(SqlTableColumn):
Modified: mgmt/trunk/cumin/python/cumin/exchange.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/exchange.strings 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/exchange.strings 2008-11-26 18:25:55 UTC (rev 2889)
@@ -11,20 +11,20 @@
c.producer_count as producers,
c.binding_count as bindings,
(c.msg_receives - p.msg_receives)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as mreceived,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as mreceived,
case when p.msg_receives is null then true else false end as mreceived_is_null,
(c.byte_receives - p.byte_receives)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as breceived,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as breceived,
case when p.byte_receives is null then true else false end as breceived_is_null,
(c.msg_routes - p.msg_routes)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as mrouted,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as mrouted,
case when p.msg_routes is null then true else false end as mrouted_is_null,
(c.byte_routes - p.byte_routes)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as brouted,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as brouted,
case when p.byte_routes is null then true else false end as brouted_is_null,
c.msg_drops as mdropped,
c.byte_drops as bdropped,
- c.rec_time
+ c.qmf_update_time
from exchange as e
left outer join exchange_stats as c on c.id = e.stats_curr_id
left outer join exchange_stats as p on p.id = e.stats_prev_id
Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/job.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -1253,9 +1253,9 @@
if not phase:
phase = self.get(session)
- alive = "((c.rec_time is null or " + \
- "c.rec_time <= now() - interval '10 minutes')" + \
- " and j.deletion_time is null and j.job_status != %i)" % JobStatusInfo.get_status_int("Removed")
+ alive = "((c.qmf_update_time is null or " + \
+ "c.qmf_update_time <= now() - interval '10 minutes')" + \
+ " and j.qmf_delete_time is null and j.job_status != %i)" % JobStatusInfo.get_status_int("Removed")
if phase == "a":
sql = alive
@@ -1269,12 +1269,12 @@
sql = "(j.job_status = %i" % JobStatusInfo.get_status_int("Held") + \
" and %s)" % alive
elif phase == "c":
- comotose = "(c.rec_time is null or " + \
- "c.rec_time <= now() - interval '10 minutes')"
+ comotose = "(c.qmf_update_time is null or " + \
+ "c.qmf_update_time <= now() - interval '10 minutes')"
sql = "(j.job_status = %i" % JobStatusInfo.get_status_int("Completed") + \
" and %s)" % comotose
else:
- not_completed = "(j.deletion_time is not null and j.job_status <> %i )" % JobStatusInfo.get_status_int("Completed")
+ not_completed = "(j.qmf_delete_time is not null and j.job_status <> %i )" % JobStatusInfo.get_status_int("Completed")
is_removed = "j.job_status = %i" % JobStatusInfo.get_status_int("Removed")
sql = " or ".join((not_completed, is_removed))
Modified: mgmt/trunk/cumin/python/cumin/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.strings 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/job.strings 2008-11-26 18:25:55 UTC (rev 2889)
@@ -15,7 +15,7 @@
j.scheduler_id,
j.submitter_id,
j.cmd,
- j.deletion_time
+ j.qmf_delete_time
from job as j
left outer join job_stats as c on c.id = j.stats_curr_id
left outer join job_stats as p on p.id = j.stats_prev_id
Modified: mgmt/trunk/cumin/python/cumin/limits.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/limits.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/limits.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -33,10 +33,11 @@
most_recent = None
negotiators = Negotiator.select("pool='%s'" % pool.id)
for negotiator in negotiators:
- if negotiator.managedBroker:
+ if negotiator.qmfBrokerId:
if not most_recent:
most_recent = negotiator
- if negotiator.statsCurr.recTime > most_recent.statsCurr.recTime:
+ if negotiator.statsCurr.qmfUpdateTime > \
+ most_recent.statsCurr.qmfUpdateTime:
most_recent = negotiator
return most_recent
Modified: mgmt/trunk/cumin/python/cumin/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/model.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/model.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -257,9 +257,9 @@
def get_session_by_registration(self, reg):
assert reg.broker
- assert reg.broker.managedBroker in self.model.data.mintBrokers
+ assert reg.broker.qmfBrokerId in self.model.data.mintBrokers
- broker = self.model.data.mintBrokers[reg.broker.managedBroker]
+ broker = self.model.data.mintBrokers[reg.broker.qmfBrokerId]
return broker.getAmqpSession()
class CuminActionInvocation(object):
@@ -321,17 +321,17 @@
def samples(self, object, secs):
stats = object.stats
- col = self.cumin_class.mint_stats_class.q.recTime
+ col = self.cumin_class.mint_stats_class.q.qmfUpdateTime
dt = datetime.now() - timedelta(seconds=secs)
stats = stats.filter(col >= dt)
- stats = stats.orderBy("-recTime")
+ stats = stats.orderBy("-qmfUpdateTime")
samples = list()
for stat in stats:
value = getattr(stat, self.name, 0)
- samples.append((stat.recTime, value))
+ samples.append((stat.qmfUpdateTime, value))
return samples
@@ -392,14 +392,14 @@
threshold = datetime.now() - timedelta(minutes=10)
try:
- if object.statsCurr and object.statsCurr.recTime > threshold:
+ if object.statsCurr and object.statsCurr.qmfUpdateTime > threshold:
curr = getattr(object.statsCurr, self.name)
- ctime = object.statsCurr.recTime
+ ctime = object.statsCurr.qmfUpdateTime
csecs = mktime(ctime.timetuple())
if object.statsPrev:
prev = getattr(object.statsPrev, self.name)
- ptime = object.statsPrev.recTime
+ ptime = object.statsPrev.qmfUpdateTime
psecs = mktime(ptime.timetuple())
if curr is not None and prev is not None:
@@ -510,16 +510,16 @@
self.mint_stats_class = mint_stats_class
- prop = CuminProperty(self, "sourceObjectId")
+ prop = CuminProperty(self, "qmfObjectId")
prop.title = "Management ID"
- prop = CuminProperty(self, "creationTime")
+ prop = CuminProperty(self, "qmfCreateTime")
prop.title = "Creation Time"
- prop = CuminProperty(self, "deletionTime")
+ prop = CuminProperty(self, "qmfDeleteTime")
prop.title = "Deletion Time"
- prop = CuminProperty(self, "recTime")
+ prop = CuminProperty(self, "qmfUpdateTime")
prop.title = "Last Updated"
prop.summary = True
@@ -1999,13 +1999,13 @@
class IdlePercentStat(PercentStat):
def get_sql_and_elem(self):
# manually removed jobs will have a state of Idle
- # with a deletion_time
- return "job.deletion_time is null"
+ # with a qmf_delete_time
+ return "job.qmf_delete_time is null"
class RemovedPercentStat(PercentStat):
def get_sql_or_elem(self):
- # if a job is idle, but has a deletion_time, it's actually Removed
- return "(job.deletion_time is not null and job_status = %i)" % \
+ # if a job is idle, but has a qmf_delete_time, it's actually Removed
+ return "(job.qmf_delete_time is not null and job_status = %i)" % \
JobStatusInfo.get_status_int("Idle")
class PoolSlotVisualization(SlotVisualization):
@@ -2485,7 +2485,7 @@
def get_enabled(self, session, job):
is_held = JobStatusInfo.get_status_int("Held") == job.JobStatus
- is_deleted = job.deletionTime is not None
+ is_deleted = job.qmfDeleteTime is not None
return not (is_held or is_deleted)
class Release(CuminAction):
@@ -2502,7 +2502,7 @@
def get_enabled(self, session, job):
is_held = JobStatusInfo.get_status_int("Held") == job.JobStatus
- is_deleted = job.deletionTime is not None
+ is_deleted = job.qmfDeleteTime is not None
return is_held and not is_deleted
class Remove(CuminAction):
@@ -2518,7 +2518,7 @@
job.Remove(self.model.data, completion, reason)
def get_enabled(self, session, job):
- is_deleted = job.deletionTime is not None
+ is_deleted = job.qmfDeleteTime is not None
return not is_deleted
class SetAttribute(CuminAction):
@@ -2535,10 +2535,11 @@
class GetStartedAction(CuminAction):
def get_xml_response(self, session, object, *args):
- recTime = object.statsCurr and object.statsCurr.recTime or object.recTime
- delta = secs(recTime) - secs(datetime.now())
+ updateTime = object.statsCurr and object.statsCurr.qmfUpdateTime \
+ or object.qmfUpdateTime
+ delta = secs(updateTime) - secs(datetime.now())
conf = "<age>%i</age>" % -delta
- rect = "<rectime>%s</rectime>" % fmt_duration(delta)
+ rect = "<updatetime>%s</updatetime>" % fmt_duration(delta)
return "%s%s" % (conf, rect)
Modified: mgmt/trunk/cumin/python/cumin/negotiator.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/negotiator.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/negotiator.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -44,9 +44,9 @@
return "Negotiators %s" % fmt_count(count)
def render_sql_where(self, session, negotiator):
- sql = "((c.rec_time is not null and " + \
- "c.rec_time > now() - interval '10 minutes')" + \
- " and deletion_time is null)"
+ sql = "((c.qmf_update_time is not null and " + \
+ "c.qmf_update_time > now() - interval '10 minutes')" + \
+ " and qmf_delete_time is null)"
return "where %s" % sql
class NameColumn(SqlTableColumn):
Modified: mgmt/trunk/cumin/python/cumin/queue.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/queue.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/queue.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -963,7 +963,7 @@
delta = timedelta(minutes=10)
queue_list = []
for _queue in queue_list_full:
- if (_queue.recTime > (datetime.now() - delta)) and (_queue.name != queue.name):
+ if (_queue.qmfUpdateTime > (datetime.now() - delta)) and (_queue.name != queue.name):
queue_list.append(_queue)
return queue_list
Modified: mgmt/trunk/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/queue.strings 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/queue.strings 2008-11-26 18:25:55 UTC (rev 2889)
@@ -5,22 +5,22 @@
c.consumer_count as consumers,
c.binding_count as bindings,
(c.msg_total_enqueues - p.msg_total_enqueues)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as menqueued,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as menqueued,
case when p.msg_total_enqueues is null then true else false end as menqueued_is_null,
(c.byte_total_enqueues - p.byte_total_enqueues)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as benqueued,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as benqueued,
case when p.byte_total_enqueues is null then true else false end as benqueued_is_null,
(c.msg_total_dequeues - p.msg_total_dequeues)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as mdequeued,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as mdequeued,
case when p.msg_total_dequeues is null then true else false end as mdequeued_is_null,
(c.byte_total_dequeues - p.byte_total_dequeues)
- / (extract(epoch from (c.rec_time - p.rec_time)) + 0.0001) as bdequeued,
+ / (extract(epoch from (c.qmf_update_time - p.qmf_update_time)) + 0.0001) as bdequeued,
case when p.byte_total_dequeues is null then true else false end as bdequeued_is_null,
c.msg_depth as mdepth,
c.byte_depth as bdepth,
1 as mdepthaccel,
1 as bdepthaccel,
- c.rec_time
+ c.qmf_update_time
from queue as q
left outer join queue_stats as c on c.id = q.stats_curr_id
left outer join queue_stats as p on p.id = q.stats_prev_id
Modified: mgmt/trunk/cumin/python/cumin/system.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/system.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/system.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -144,7 +144,7 @@
def render_sql_where(self, session, system):
elems = list()
elems.append("system = %(nodeName)s")
- elems.append("s.deletion_time is null")
+ elems.append("s.qmf_delete_time is null")
return "where %s" % " and ".join(elems)
def get_sql_values(self, session, system):
@@ -212,4 +212,4 @@
-
\ No newline at end of file
+
Modified: mgmt/trunk/cumin/python/cumin/test.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/test.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/test.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -299,7 +299,7 @@
self.env.check_redirect(p, s)
def predicate():
- return self.env.link.deletionTime
+ return self.env.link.qmfDeleteTime
wait(predicate)
@@ -361,7 +361,7 @@
self.env.check_redirect(p, s)
def predicate():
- return self.env.bridge.deletionTime
+ return self.env.bridge.qmfDeleteTime
wait(predicate)
@@ -584,7 +584,7 @@
self.env.check_redirect(p, s)
def predicate():
- return self.env.binding_direct.deletionTime
+ return self.env.binding_direct.qmfDeleteTime
wait(predicate)
@@ -638,7 +638,7 @@
self.env.check_redirect(p, s)
def predicate():
- return self.env.binding_topic.deletionTime
+ return self.env.binding_topic.qmfDeleteTime
wait(predicate)
@@ -692,7 +692,7 @@
self.env.check_redirect(p, s)
def predicate():
- return self.env.binding_fanout.deletionTime
+ return self.env.binding_fanout.qmfDeleteTime
wait(predicate)
@@ -812,7 +812,7 @@
# wait for newly created queue to get marked as deleted
def predicate():
- return self.env.queue.deletionTime
+ return self.env.queue.qmfDeleteTime
wait(predicate)
@@ -883,7 +883,7 @@
# wait for newly created exchange to get marked as deleted
def predicate():
- return self.env.added_exchange.deletionTime
+ return self.env.added_exchange.qmfDeleteTime
wait(predicate)
Modified: mgmt/trunk/cumin/python/cumin/util.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/util.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/util.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -43,12 +43,12 @@
return host, port
def is_active(obj):
- delTime = obj._get_deletionTime()
+ delTime = obj._get_qmfDeleteTime()
if not delTime:
- recTime = obj.statsCurr.recTime
+ updateTime = obj.statsCurr.qmfUpdateTime
delta = timedelta(minutes=10)
# mirroring logic in widgets/PhaseSwitch.get_sql_constraint
- if not recTime or (recTime > datetime.now() - delta):
+ if not updateTime or (updateTime > datetime.now() - delta):
return True
class Identifiable(object):
Modified: mgmt/trunk/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/widgets.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -607,15 +607,15 @@
phase = self.get(session)
if phase == "a":
- sql = "((c.rec_time is null or " + \
- "c.rec_time > now() - interval '10 minutes')" + \
- " and deletion_time is null)"
+ sql = "((c.qmf_update_time is null or " + \
+ "c.qmf_update_time > now() - interval '10 minutes')" + \
+ " and qmf_delete_time is null)"
elif phase == "i":
- sql = "((c.rec_time is null or " + \
- "c.rec_time <= now() - interval '10 minutes')" + \
- " and deletion_time is null)"
+ sql = "((c.qmf_update_time is null or " + \
+ "c.qmf_update_time <= now() - interval '10 minutes')" + \
+ " and qmf_delete_time is null)"
else:
- sql = "deletion_time is not null"
+ sql = "qmf_delete_time is not null"
return sql
@@ -716,7 +716,7 @@
def render_content(self, session, data):
key = self.get_column_key(session)
- value = data["rec_time"]
+ value = data["qmf_update_time"]
if value and value > self.__ago.get(session):
html = self.render_value(session, data[key])
Modified: mgmt/trunk/cumin/python/cumin/widgets.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/widgets.strings 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/cumin/python/cumin/widgets.strings 2008-11-26 18:25:55 UTC (rev 2889)
@@ -1076,21 +1076,21 @@
function got_startstop_status(obj, id) {
var elem = document.getElementById(id);
if (elem) {
- var recTime = obj.rectime;
- var age = obj.age;
+ var updateTime = obj.updatetime;
+ var age = obj.age;
var color = "clear";
-
- var oRecTime = document.getElementById("recTime");
- if (oRecTime) {
- oRecTime.innerHTML = recTime;
- if (age > 150) { /* hasn't changed in 2.5 minutes */
- color = "yellow";
- } else {
- color = "green";
- }
- elem.className = "CuminStatus " + color;
- }
- setTimeout("get_status()", 5000);
+
+ var oUpdateTime = document.getElementById("updateTime");
+ if (oUpdateTime) {
+ oUpdateTime.innerHTML = updateTime;
+ if (age > 150) { /* hasn't changed in 2.5 minutes */
+ color = "yellow";
+ } else {
+ color = "green";
+ }
+ elem.className = "CuminStatus " + color;
+ }
+ setTimeout("get_status()", 5000);
}
}
@@ -1098,7 +1098,7 @@
<div id="{id}" class="CuminStatus {color}">
<h2>{title}</h2>
<div class="status_time">
- Last update was <span id="recTime"></span>
+ Last update was <span id="updateTime"></span>
</div>
</div>{start_stop_script}
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -13,14 +13,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SlotStats', cascade='null', default=None)
statsPrev = ForeignKey('SlotStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -84,7 +84,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
slot = ForeignKey('Slot', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
Activity = StringCol(length=1000, default=None)
@@ -134,14 +134,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('JobStats', cascade='null', default=None)
statsPrev = ForeignKey('JobStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -235,7 +235,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
job = ForeignKey('Job', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -246,14 +246,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SchedulerStats', cascade='null', default=None)
statsPrev = ForeignKey('SchedulerStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -275,7 +275,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
scheduler = ForeignKey('Scheduler', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
NumUsers = BigIntCol(default=None)
@@ -299,14 +299,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SubmitterStats', cascade='null', default=None)
statsPrev = ForeignKey('SubmitterStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -321,7 +321,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
submitter = ForeignKey('Submitter', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
HeldJobs = BigIntCol(default=None)
@@ -335,14 +335,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('NegotiatorStats', cascade='null', default=None)
statsPrev = ForeignKey('NegotiatorStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -385,7 +385,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
negotiator = ForeignKey('Negotiator', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -403,14 +403,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('CollectorStats', cascade='null', default=None)
statsPrev = ForeignKey('CollectorStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -426,7 +426,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
collector = ForeignKey('Collector', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -437,14 +437,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('MasterStats', cascade='null', default=None)
statsPrev = ForeignKey('MasterStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -481,7 +481,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
master = ForeignKey('Master', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -499,14 +499,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('AclStats', cascade='null', default=None)
statsPrev = ForeignKey('AclStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -528,7 +528,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
acl = ForeignKey('Acl', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
aclDenyCount = BigIntCol(default=None)
@@ -540,14 +540,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('ClusterStats', cascade='null', default=None)
statsPrev = ForeignKey('ClusterStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -576,7 +576,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
cluster = ForeignKey('Cluster', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -587,14 +587,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('StoreStats', cascade='null', default=None)
statsPrev = ForeignKey('StoreStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -615,7 +615,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
store = ForeignKey('Store', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
tplTransactionDepth = IntCol(default=None)
@@ -635,14 +635,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('JournalStats', cascade='null', default=None)
statsPrev = ForeignKey('JournalStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -672,7 +672,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
journal = ForeignKey('Journal', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
recordDepth = IntCol(default=None)
@@ -711,14 +711,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SystemStats', cascade='null', default=None)
statsPrev = ForeignKey('SystemStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -734,7 +734,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
system = ForeignKey('System', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -745,14 +745,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('BrokerStats', cascade='null', default=None)
statsPrev = ForeignKey('BrokerStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -816,7 +816,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
broker = ForeignKey('Broker', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -827,14 +827,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('AgentStats', cascade='null', default=None)
statsPrev = ForeignKey('AgentStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -850,7 +850,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
agent = ForeignKey('Agent', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -861,14 +861,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('VhostStats', cascade='null', default=None)
statsPrev = ForeignKey('VhostStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -881,7 +881,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
vhost = ForeignKey('Vhost', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -892,14 +892,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('QueueStats', cascade='null', default=None)
statsPrev = ForeignKey('QueueStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -924,7 +924,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
queue = ForeignKey('Queue', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
msgTotalEnqueues = BigIntCol(default=None)
@@ -962,14 +962,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('ExchangeStats', cascade='null', default=None)
statsPrev = ForeignKey('ExchangeStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -984,7 +984,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
exchange = ForeignKey('Exchange', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
producerCount = IntCol(default=None)
@@ -1007,14 +1007,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('BindingStats', cascade='null', default=None)
statsPrev = ForeignKey('BindingStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -1029,7 +1029,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
binding = ForeignKey('Binding', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
msgMatched = BigIntCol(default=None)
@@ -1041,14 +1041,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('ClientConnectionStats', cascade='null', default=None)
statsPrev = ForeignKey('ClientConnectionStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -1070,7 +1070,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
clientConnection = ForeignKey('ClientConnection', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
closing = BoolCol(default=None)
@@ -1086,14 +1086,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('LinkStats', cascade='null', default=None)
statsPrev = ForeignKey('LinkStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -1139,7 +1139,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
link = ForeignKey('Link', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
state = StringCol(length=1000, default=None)
@@ -1152,14 +1152,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('BridgeStats', cascade='null', default=None)
statsPrev = ForeignKey('BridgeStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -1186,7 +1186,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
bridge = ForeignKey('Bridge', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -1197,14 +1197,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SessionStats', cascade='null', default=None)
statsPrev = ForeignKey('SessionStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -1245,7 +1245,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
session = ForeignKey('Session', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
framesOutstanding = IntCol(default=None)
@@ -1261,14 +1261,14 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
qmfBrokerId = StringCol(length=1000, default=None)
qmfScopeId = BigIntCol(default=None)
qmfObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
+ qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
- creationTime = TimestampCol(default=None)
- deletionTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
+ qmfCreateTime = TimestampCol(default=None)
+ qmfDeleteTime = TimestampCol(default=None)
statsCurr = ForeignKey('SysimageStats', cascade='null', default=None)
statsPrev = ForeignKey('SysimageStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
@@ -1286,7 +1286,7 @@
class sqlmeta:
lazyUpdate = True
- recTime = TimestampCol(default=None)
+ qmfUpdateTime = TimestampCol(default=None)
sysimage = ForeignKey('Sysimage', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
memFree = BigIntCol(default=None)
Modified: mgmt/trunk/mint/python/mint/schemaparser.py
===================================================================
--- mgmt/trunk/mint/python/mint/schemaparser.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/mint/python/mint/schemaparser.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -64,7 +64,7 @@
self.pythonOutput += " %s = %s(%s)\n" % (attribName, attribType, params)
def generateTimestampAttrib(self, col):
- self.generateAttrib(col + "Time", "TimestampCol") #, "default=datetime.min")
+ self.generateAttrib("qmf" + col + "Time", "TimestampCol") #, "default=datetime.min")
def generateForeignKeyAttrib(self, name, reference):
params = "'%s', cascade='null'" % (reference)
@@ -91,8 +91,8 @@
self.pythonOutput += " class sqlmeta:\n"
self.pythonOutput += " lazyUpdate = %s\n\n" % (lazyUpdate)
- def generateSourceIdsIndex(self, className):
- self.pythonOutput += " source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)\n"
+ def generateQmfIdsIndex(self, className):
+ self.pythonOutput += " qmf_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)\n"
def generateClassAttribs(self, schemaName, elements):
if (schemaName == "JournalStats"):
@@ -138,18 +138,19 @@
self.currentClass = pythonName
self.pythonOutput += "\nclass %s(SQLObject):\n" % (pythonName)
self.generateLazyUpdate()
- self.generateTimestampAttrib("rec")
if (stats):
+ self.generateTimestampAttrib("Update")
self.generateForeignKeyAttrib(colPythonName[0].lower() + colPythonName[1:], keyPythonName)
self.generateMultipleJoin(origPythonName, pythonName, "stats")
else:
self.generateAttrib("qmfBrokerId", "StringCol", "length=1000")
self.generateAttrib("qmfScopeId", "BigIntCol")
self.generateAttrib("qmfObjectId", "BigIntCol")
- self.generateSourceIdsIndex(pythonName)
+ self.generateQmfIdsIndex(pythonName)
self.generateAttrib("qmfClassKey", "StringCol", "length=1000")
- self.generateTimestampAttrib("creation")
- self.generateTimestampAttrib("deletion")
+ self.generateTimestampAttrib("Update")
+ self.generateTimestampAttrib("Create")
+ self.generateTimestampAttrib("Delete")
self.generateForeignKeyAttrib("statsCurr", statsPythonName)
self.generateForeignKeyAttrib("statsPrev", statsPythonName)
self.finalPythonOutput += "classToSchemaNameMap['%s'] = '%s'\n" % (pythonName, schemaName)
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/mint/python/mint/update.py 2008-11-26 18:25:55 UTC (rev 2889)
@@ -192,11 +192,11 @@
timestamps = self.object.getTimestamps()
- self.processTimestamp("recTime", timestamps[0], attrs)
- self.processTimestamp("creationTime", timestamps[1], attrs)
+ self.processTimestamp("qmfUpdateTime", timestamps[0], attrs)
+ self.processTimestamp("qmfCreateTime", timestamps[1], attrs)
if timestamps[2] != 0:
- self.processTimestamp("deletionTime", timestamps[2], attrs)
+ self.processTimestamp("qmfDeleteTime", timestamps[2], attrs)
log.debug("%s(%s) marked deleted", cls.__name__, oid)
@@ -317,7 +317,7 @@
timestamps = self.object.getTimestamps()
- self.processTimestamp("recTime", timestamps[0], attrs)
+ self.processTimestamp("qmfUpdateTime", timestamps[0], attrs)
attrs["%s_id" % cls.sqlmeta.table] = id
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-11-26 16:52:44 UTC (rev 2888)
+++ mgmt/trunk/mint/sql/schema.sql 2008-11-26 18:25:55 UTC (rev 2889)
@@ -64,13 +64,13 @@
CREATE TABLE acl (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
broker_id INT,
@@ -79,24 +79,24 @@
transfer_acl BOOL,
last_acl_load TIMESTAMP
);
-CREATE UNIQUE INDEX acl_source_ids_unique ON acl (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX acl_qmf_ids_unique ON acl (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE acl_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
acl_id INT,
acl_deny_count BIGINT
);
CREATE TABLE agent (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
client_connection_id INT,
@@ -106,23 +106,23 @@
broker_bank BIGINT,
agent_bank BIGINT
);
-CREATE UNIQUE INDEX agent_source_ids_unique ON agent (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX agent_qmf_ids_unique ON agent (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE agent_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
agent_id INT
);
CREATE TABLE binding (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
exchange_id INT,
@@ -131,24 +131,24 @@
arguments BYTEA,
origin VARCHAR(1000)
);
-CREATE UNIQUE INDEX binding_source_ids_unique ON binding (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX binding_qmf_ids_unique ON binding (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE binding_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
binding_id INT,
msg_matched BIGINT
);
CREATE TABLE bridge (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
link_id INT,
@@ -163,23 +163,23 @@
excludes VARCHAR(1000),
dynamic BOOL
);
-CREATE UNIQUE INDEX bridge_source_ids_unique ON bridge (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX bridge_qmf_ids_unique ON bridge (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE bridge_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
bridge_id INT
);
CREATE TABLE broker (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
system_id INT,
@@ -193,23 +193,23 @@
data_dir VARCHAR(1000),
registration_id INT
);
-CREATE UNIQUE INDEX broker_source_ids_unique ON broker (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX broker_qmf_ids_unique ON broker (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE broker_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
broker_id INT
);
CREATE TABLE client_connection (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
vhost_id INT,
@@ -219,11 +219,11 @@
federation_link BOOL,
auth_identity VARCHAR(1000)
);
-CREATE UNIQUE INDEX client_connection_source_ids_unique ON client_connection (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX client_connection_qmf_ids_unique ON client_connection (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE client_connection_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
client_connection_id INT,
closing BOOL,
frames_from_client BIGINT,
@@ -234,13 +234,13 @@
CREATE TABLE cluster (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
broker_id INT,
@@ -251,23 +251,23 @@
status VARCHAR(1000),
members VARCHAR(4000)
);
-CREATE UNIQUE INDEX cluster_source_ids_unique ON cluster (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX cluster_qmf_ids_unique ON cluster (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE cluster_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
cluster_id INT
);
CREATE TABLE collector (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
pool VARCHAR(1000),
@@ -277,23 +277,23 @@
name VARCHAR(1000),
public_network_ip_addr VARCHAR(1000)
);
-CREATE UNIQUE INDEX collector_source_ids_unique ON collector (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX collector_qmf_ids_unique ON collector (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE collector_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
collector_id INT
);
CREATE TABLE exchange (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
vhost_id INT,
@@ -302,11 +302,11 @@
durable BOOL,
arguments BYTEA
);
-CREATE UNIQUE INDEX exchange_source_ids_unique ON exchange (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX exchange_qmf_ids_unique ON exchange (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE exchange_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
exchange_id INT,
producer_count INT,
producer_count_low INT,
@@ -324,13 +324,13 @@
CREATE TABLE job (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
scheduler_id INT,
@@ -362,23 +362,23 @@
dag_man_job_id BIGINT,
ad BYTEA
);
-CREATE UNIQUE INDEX job_source_ids_unique ON job (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX job_qmf_ids_unique ON job (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE job_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
job_id INT
);
CREATE TABLE journal (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
queue_id INT,
@@ -393,11 +393,11 @@
data_file_size BIGINT,
current_file_count BIGINT
);
-CREATE UNIQUE INDEX journal_source_ids_unique ON journal (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX journal_qmf_ids_unique ON journal (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE journal_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
journal_id INT,
record_depth INT,
record_depth_low INT,
@@ -431,13 +431,13 @@
CREATE TABLE link (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
vhost_id INT,
@@ -446,11 +446,11 @@
transport VARCHAR(1000),
durable BOOL
);
-CREATE UNIQUE INDEX link_source_ids_unique ON link (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX link_qmf_ids_unique ON link (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE link_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
link_id INT,
state VARCHAR(1000),
last_error VARCHAR(1000)
@@ -458,13 +458,13 @@
CREATE TABLE master (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
pool VARCHAR(1000),
@@ -478,11 +478,11 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX master_source_ids_unique ON master (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX master_qmf_ids_unique ON master (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE master_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
master_id INT,
monitor_self_age BIGINT,
monitor_self_cpu_usage FLOAT,
@@ -494,13 +494,13 @@
CREATE TABLE negotiator (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
pool VARCHAR(1000),
@@ -512,11 +512,11 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX negotiator_source_ids_unique ON negotiator (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX negotiator_qmf_ids_unique ON negotiator (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE negotiator_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
negotiator_id INT,
monitor_self_age BIGINT,
monitor_self_cpu_usage FLOAT,
@@ -533,13 +533,13 @@
CREATE TABLE queue (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
vhost_id INT,
@@ -549,11 +549,11 @@
exclusive BOOL,
arguments BYTEA
);
-CREATE UNIQUE INDEX queue_source_ids_unique ON queue (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX queue_qmf_ids_unique ON queue (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE queue_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
queue_id INT,
msg_total_enqueues BIGINT,
msg_total_dequeues BIGINT,
@@ -586,13 +586,13 @@
CREATE TABLE scheduler (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
pool VARCHAR(1000),
@@ -607,11 +607,11 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX scheduler_source_ids_unique ON scheduler (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX scheduler_qmf_ids_unique ON scheduler (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE scheduler_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
scheduler_id INT,
num_users BIGINT,
total_held_jobs BIGINT,
@@ -629,13 +629,13 @@
CREATE TABLE session (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
vhost_id INT,
@@ -646,11 +646,11 @@
attached BOOL,
expire_time TIMESTAMP
);
-CREATE UNIQUE INDEX session_source_ids_unique ON session (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX session_qmf_ids_unique ON session (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE session_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
session_id INT,
frames_outstanding INT,
txn_starts BIGINT,
@@ -661,13 +661,13 @@
CREATE TABLE slot (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
pool VARCHAR(1000),
@@ -724,11 +724,11 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX slot_source_ids_unique ON slot (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX slot_qmf_ids_unique ON slot (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE slot_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
slot_id INT,
activity VARCHAR(1000),
clock_day BIGINT,
@@ -772,13 +772,13 @@
CREATE TABLE store (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
broker_id INT,
@@ -793,11 +793,11 @@
tpl_data_file_size BIGINT,
tpl_current_file_count BIGINT
);
-CREATE UNIQUE INDEX store_source_ids_unique ON store (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX store_qmf_ids_unique ON store (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE store_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
store_id INT,
tpl_transaction_depth INT,
tpl_transaction_depth_low INT,
@@ -812,13 +812,13 @@
CREATE TABLE submitter (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
scheduler_id INT,
@@ -827,11 +827,11 @@
name VARCHAR(1000),
schedd_name VARCHAR(1000)
);
-CREATE UNIQUE INDEX submitter_source_ids_unique ON submitter (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX submitter_qmf_ids_unique ON submitter (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE submitter_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
submitter_id INT,
held_jobs BIGINT,
idle_jobs BIGINT,
@@ -840,13 +840,13 @@
CREATE TABLE sysimage (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
uuid BYTEA,
@@ -858,11 +858,11 @@
mem_total BIGINT,
swap_total BIGINT
);
-CREATE UNIQUE INDEX sysimage_source_ids_unique ON sysimage (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX sysimage_qmf_ids_unique ON sysimage (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE sysimage_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
sysimage_id INT,
mem_free BIGINT,
swap_free BIGINT,
@@ -875,13 +875,13 @@
CREATE TABLE system (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
system_id BYTEA,
@@ -891,34 +891,34 @@
version VARCHAR(1000),
machine VARCHAR(1000)
);
-CREATE UNIQUE INDEX system_source_ids_unique ON system (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX system_qmf_ids_unique ON system (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE system_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
system_id INT
);
CREATE TABLE vhost (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
qmf_broker_id VARCHAR(1000),
qmf_scope_id BIGINT,
qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
- creation_time TIMESTAMP,
- deletion_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
+ qmf_create_time TIMESTAMP,
+ qmf_delete_time TIMESTAMP,
stats_curr_id INT,
stats_prev_id INT,
broker_id INT,
name VARCHAR(1000),
federation_tag VARCHAR(1000)
);
-CREATE UNIQUE INDEX vhost_source_ids_unique ON vhost (qmf_broker_id, qmf_scope_id, qmf_object_id);
+CREATE UNIQUE INDEX vhost_qmf_ids_unique ON vhost (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE vhost_stats (
id SERIAL PRIMARY KEY,
- rec_time TIMESTAMP,
+ qmf_update_time TIMESTAMP,
vhost_id INT
);
More information about the rhmessaging-commits
mailing list