[rhmessaging-commits] rhmessaging commits: r2883 - in mgmt/trunk/mint: sql and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Tue Nov 25 17:51:11 EST 2008
Author: justi9
Date: 2008-11-25 17:51:10 -0500 (Tue, 25 Nov 2008)
New Revision: 2883
Modified:
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/python/mint/schemaparser.py
mgmt/trunk/mint/python/mint/sql.py
mgmt/trunk/mint/python/mint/update.py
mgmt/trunk/mint/sql/schema.sql
Log:
Schema renames. A reschema is required after this change.
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-11-25 21:09:24 UTC (rev 2882)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-11-25 22:51:10 UTC (rev 2883)
@@ -14,10 +14,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -135,10 +135,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -179,9 +179,9 @@
actualArgs = list()
if JobAd is not None:
actualArgs.append(JobAd)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "GetAd",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "GetAd",
+ callback, args=actualArgs)
def SetAttribute(self, model, callback, Name, Value):
actualArgs = list()
@@ -189,33 +189,33 @@
actualArgs.append(Name)
if Value is not None:
actualArgs.append(Value)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "SetAttribute",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "SetAttribute",
+ callback, args=actualArgs)
def Hold(self, model, callback, Reason):
actualArgs = list()
if Reason is not None:
actualArgs.append(Reason)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "Hold",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Hold",
+ callback, args=actualArgs)
def Release(self, model, callback, Reason):
actualArgs = list()
if Reason is not None:
actualArgs.append(Reason)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "Release",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Release",
+ callback, args=actualArgs)
def Remove(self, model, callback, Reason):
actualArgs = list()
if Reason is not None:
actualArgs.append(Reason)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "Remove",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Remove",
+ callback, args=actualArgs)
def Fetch(self, model, callback, File, Start, End, Data):
actualArgs = list()
@@ -227,9 +227,9 @@
actualArgs.append(End)
if Data is not None:
actualArgs.append(Data)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "Fetch",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Fetch",
+ callback, args=actualArgs)
class JobStats(SQLObject):
class sqlmeta:
@@ -247,10 +247,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -300,10 +300,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -336,10 +336,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -361,9 +361,9 @@
actualArgs = list()
if Limits is not None:
actualArgs.append(Limits)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "GetLimits",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "GetLimits",
+ callback, args=actualArgs)
def SetLimit(self, model, callback, Name, Max):
actualArgs = list()
@@ -371,15 +371,15 @@
actualArgs.append(Name)
if Max is not None:
actualArgs.append(Max)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "SetLimit",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "SetLimit",
+ callback, args=actualArgs)
def Reconfig(self, model, callback):
actualArgs = list()
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "Reconfig",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Reconfig",
+ callback, args=actualArgs)
class NegotiatorStats(SQLObject):
class sqlmeta:
@@ -404,10 +404,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -438,10 +438,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -465,17 +465,17 @@
actualArgs = list()
if Subsystem is not None:
actualArgs.append(Subsystem)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "Start",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Start",
+ callback, args=actualArgs)
def Stop(self, model, callback, Subsystem):
actualArgs = list()
if Subsystem is not None:
actualArgs.append(Subsystem)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "Stop",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "Stop",
+ callback, args=actualArgs)
class MasterStats(SQLObject):
class sqlmeta:
@@ -500,10 +500,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -520,9 +520,9 @@
def reloadACLFile(self, model, callback):
"""Reload the ACL file"""
actualArgs = list()
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "reloadACLFile",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "reloadACLFile",
+ callback, args=actualArgs)
class AclStats(SQLObject):
class sqlmeta:
@@ -541,10 +541,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -562,15 +562,15 @@
def stopClusterNode(self, model, callback):
actualArgs = list()
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "stopClusterNode",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "stopClusterNode",
+ callback, args=actualArgs)
def stopFullCluster(self, model, callback):
actualArgs = list()
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "stopFullCluster",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "stopFullCluster",
+ callback, args=actualArgs)
class ClusterStats(SQLObject):
class sqlmeta:
@@ -588,10 +588,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -636,10 +636,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -664,9 +664,9 @@
actualArgs = list()
if by is not None:
actualArgs.append(by)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "expand",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "expand",
+ callback, args=actualArgs)
class JournalStats(SQLObject):
class sqlmeta:
@@ -712,10 +712,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -746,10 +746,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -774,9 +774,9 @@
actualArgs.append(sequence)
if body is not None:
actualArgs.append(body)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "echo",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "echo",
+ callback, args=actualArgs)
def connect(self, model, callback, host, port, durable, authMechanism, username, password, transport):
"""Establish a connection to another broker"""
@@ -795,9 +795,9 @@
actualArgs.append(password)
if transport is not None:
actualArgs.append(transport)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "connect",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "connect",
+ callback, args=actualArgs)
def queueMoveMessages(self, model, callback, srcQueue, destQueue, qty):
"""Move messages from one queue to another"""
@@ -808,9 +808,9 @@
actualArgs.append(destQueue)
if qty is not None:
actualArgs.append(qty)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "queueMoveMessages",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "queueMoveMessages",
+ callback, args=actualArgs)
class BrokerStats(SQLObject):
class sqlmeta:
@@ -828,10 +828,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -862,10 +862,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -893,10 +893,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -916,9 +916,9 @@
actualArgs = list()
if request is not None:
actualArgs.append(request)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "purge",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "purge",
+ callback, args=actualArgs)
class QueueStats(SQLObject):
class sqlmeta:
@@ -963,10 +963,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -1008,10 +1008,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -1042,10 +1042,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -1062,9 +1062,9 @@
def close(self, model, callback):
actualArgs = list()
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "close",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "close",
+ callback, args=actualArgs)
class ClientConnectionStats(SQLObject):
class sqlmeta:
@@ -1087,10 +1087,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -1106,9 +1106,9 @@
def close(self, model, callback):
actualArgs = list()
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "close",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "close",
+ callback, args=actualArgs)
def bridge(self, model, callback, durable, src, dest, key, tag, excludes, srcIsQueue, srcIsLocal, dynamic):
"""Bridge messages over the link"""
@@ -1131,9 +1131,9 @@
actualArgs.append(srcIsLocal)
if dynamic is not None:
actualArgs.append(dynamic)
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "bridge",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "bridge",
+ callback, args=actualArgs)
class LinkStats(SQLObject):
class sqlmeta:
@@ -1153,10 +1153,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -1178,9 +1178,9 @@
def close(self, model, callback):
actualArgs = list()
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "close",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "close",
+ callback, args=actualArgs)
class BridgeStats(SQLObject):
class sqlmeta:
@@ -1198,10 +1198,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
@@ -1219,27 +1219,27 @@
def solicitAck(self, model, callback):
actualArgs = list()
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "solicitAck",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "solicitAck",
+ callback, args=actualArgs)
def detach(self, model, callback):
actualArgs = list()
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "detach",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "detach",
+ callback, args=actualArgs)
def resetLifespan(self, model, callback):
actualArgs = list()
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "resetLifespan",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "resetLifespan",
+ callback, args=actualArgs)
def close(self, model, callback):
actualArgs = list()
- originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)
- model.callMethod(self.managedBroker, originalId, self.qmfClassKey, "close",
- callback, args=actualArgs)
+ originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)
+ model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, "close",
+ callback, args=actualArgs)
class SessionStats(SQLObject):
class sqlmeta:
@@ -1262,10 +1262,10 @@
lazyUpdate = True
recTime = TimestampCol(default=None)
- managedBroker = StringCol(length=1000, default=None)
- sourceScopeId = BigIntCol(default=None)
- sourceObjectId = BigIntCol(default=None)
- source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)
+ qmfBrokerId = StringCol(length=1000, default=None)
+ qmfScopeId = BigIntCol(default=None)
+ qmfObjectId = BigIntCol(default=None)
+ source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)
qmfClassKey = StringCol(length=1000, default=None)
creationTime = TimestampCol(default=None)
deletionTime = TimestampCol(default=None)
Modified: mgmt/trunk/mint/python/mint/schemaparser.py
===================================================================
--- mgmt/trunk/mint/python/mint/schemaparser.py 2008-11-25 21:09:24 UTC (rev 2882)
+++ mgmt/trunk/mint/python/mint/schemaparser.py 2008-11-25 22:51:10 UTC (rev 2883)
@@ -92,7 +92,7 @@
self.pythonOutput += " lazyUpdate = %s\n\n" % (lazyUpdate)
def generateSourceIdsIndex(self, className):
- self.pythonOutput += " source_ids_unique = DatabaseIndex(managedBroker, sourceScopeId, sourceObjectId, unique=True)\n"
+ self.pythonOutput += " source_ids_unique = DatabaseIndex(qmfBrokerId, qmfScopeId, qmfObjectId, unique=True)\n"
def generateClassAttribs(self, schemaName, elements):
if (schemaName == "JournalStats"):
@@ -143,9 +143,9 @@
self.generateForeignKeyAttrib(colPythonName[0].lower() + colPythonName[1:], keyPythonName)
self.generateMultipleJoin(origPythonName, pythonName, "stats")
else:
- self.generateAttrib("managedBroker", "StringCol", "length=1000")
- self.generateAttrib("sourceScopeId", "BigIntCol")
- self.generateAttrib("sourceObjectId", "BigIntCol")
+ self.generateAttrib("qmfBrokerId", "StringCol", "length=1000")
+ self.generateAttrib("qmfScopeId", "BigIntCol")
+ self.generateAttrib("qmfObjectId", "BigIntCol")
self.generateSourceIdsIndex(pythonName)
self.generateAttrib("qmfClassKey", "StringCol", "length=1000")
self.generateTimestampAttrib("creation")
@@ -175,9 +175,9 @@
self.pythonOutput += "\n def %s(self, model, callback%s):\n" % (elem["@name"], formalArgs)
self.pythonOutput += comment
self.pythonOutput += actualArgs
- self.pythonOutput += " originalId = ObjectId(None, self.sourceScopeId, self.sourceObjectId)\n"
- self.pythonOutput += " model.callMethod(self.managedBroker, originalId, self.qmfClassKey, \"%s\",\n" % elem["@name"]
- self.pythonOutput += " callback, args=actualArgs)\n"
+ self.pythonOutput += " originalId = ObjectId(None, self.qmfScopeId, self.qmfObjectId)\n"
+ self.pythonOutput += " model.callMethod(self.qmfBrokerId, originalId, self.qmfClassKey, \"%s\",\n" % elem["@name"]
+ self.pythonOutput += " callback, args=actualArgs)\n"
def endClass(self):
if (self.additionalPythonOutput != ""):
Modified: mgmt/trunk/mint/python/mint/sql.py
===================================================================
--- mgmt/trunk/mint/python/mint/sql.py 2008-11-25 21:09:24 UTC (rev 2882)
+++ mgmt/trunk/mint/python/mint/sql.py 2008-11-25 22:51:10 UTC (rev 2883)
@@ -70,9 +70,9 @@
return """
select id from %s
- where source_scope_id = %%(sourceScopeId)s
- and source_object_id = %%(sourceObjectId)s
- and managed_broker = %%(managedBroker)s
+ where qmf_scope_id = %%(qmfScopeId)s
+ and qmf_object_id = %%(qmfObjectId)s
+ and qmf_broker_id = %%(qmfBrokerId)s
""" % table
class SqlSetStatsRefs(SqlOperation):
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-11-25 21:09:24 UTC (rev 2882)
+++ mgmt/trunk/mint/python/mint/update.py 2008-11-25 22:51:10 UTC (rev 2883)
@@ -200,10 +200,10 @@
log.debug("%s(%s) marked deleted", cls.__name__, oid)
- attrs["sourceScopeId"] = oid.first
- attrs["sourceObjectId"] = oid.second
+ attrs["qmfScopeId"] = oid.first
+ attrs["qmfObjectId"] = oid.second
attrs["qmfClassKey"] = str(self.object.getClassKey())
- attrs["managedBroker"] = self.broker.qmfId
+ attrs["qmfBrokerId"] = self.broker.qmfId
cursor = conn.cursor()
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-11-25 21:09:24 UTC (rev 2882)
+++ mgmt/trunk/mint/sql/schema.sql 2008-11-25 22:51:10 UTC (rev 2883)
@@ -65,9 +65,9 @@
CREATE TABLE acl (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -79,7 +79,7 @@
transfer_acl BOOL,
last_acl_load TIMESTAMP
);
-CREATE UNIQUE INDEX acl_source_ids_unique ON acl (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX acl_source_ids_unique ON acl (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE acl_stats (
id SERIAL PRIMARY KEY,
@@ -91,9 +91,9 @@
CREATE TABLE agent (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -106,7 +106,7 @@
broker_bank BIGINT,
agent_bank BIGINT
);
-CREATE UNIQUE INDEX agent_source_ids_unique ON agent (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX agent_source_ids_unique ON agent (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE agent_stats (
id SERIAL PRIMARY KEY,
@@ -117,9 +117,9 @@
CREATE TABLE binding (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -131,7 +131,7 @@
arguments BYTEA,
origin VARCHAR(1000)
);
-CREATE UNIQUE INDEX binding_source_ids_unique ON binding (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX binding_source_ids_unique ON binding (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE binding_stats (
id SERIAL PRIMARY KEY,
@@ -143,9 +143,9 @@
CREATE TABLE bridge (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -163,7 +163,7 @@
excludes VARCHAR(1000),
dynamic BOOL
);
-CREATE UNIQUE INDEX bridge_source_ids_unique ON bridge (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX bridge_source_ids_unique ON bridge (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE bridge_stats (
id SERIAL PRIMARY KEY,
@@ -174,9 +174,9 @@
CREATE TABLE broker (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -193,7 +193,7 @@
data_dir VARCHAR(1000),
registration_id INT
);
-CREATE UNIQUE INDEX broker_source_ids_unique ON broker (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX broker_source_ids_unique ON broker (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE broker_stats (
id SERIAL PRIMARY KEY,
@@ -204,9 +204,9 @@
CREATE TABLE client_connection (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -219,7 +219,7 @@
federation_link BOOL,
auth_identity VARCHAR(1000)
);
-CREATE UNIQUE INDEX client_connection_source_ids_unique ON client_connection (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX client_connection_source_ids_unique ON client_connection (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE client_connection_stats (
id SERIAL PRIMARY KEY,
@@ -235,9 +235,9 @@
CREATE TABLE cluster (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -251,7 +251,7 @@
status VARCHAR(1000),
members VARCHAR(4000)
);
-CREATE UNIQUE INDEX cluster_source_ids_unique ON cluster (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX cluster_source_ids_unique ON cluster (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE cluster_stats (
id SERIAL PRIMARY KEY,
@@ -262,9 +262,9 @@
CREATE TABLE collector (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -277,7 +277,7 @@
name VARCHAR(1000),
public_network_ip_addr VARCHAR(1000)
);
-CREATE UNIQUE INDEX collector_source_ids_unique ON collector (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX collector_source_ids_unique ON collector (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE collector_stats (
id SERIAL PRIMARY KEY,
@@ -288,9 +288,9 @@
CREATE TABLE exchange (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -302,7 +302,7 @@
durable BOOL,
arguments BYTEA
);
-CREATE UNIQUE INDEX exchange_source_ids_unique ON exchange (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX exchange_source_ids_unique ON exchange (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE exchange_stats (
id SERIAL PRIMARY KEY,
@@ -325,9 +325,9 @@
CREATE TABLE job (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -362,7 +362,7 @@
dag_man_job_id BIGINT,
ad BYTEA
);
-CREATE UNIQUE INDEX job_source_ids_unique ON job (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX job_source_ids_unique ON job (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE job_stats (
id SERIAL PRIMARY KEY,
@@ -373,9 +373,9 @@
CREATE TABLE journal (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -393,7 +393,7 @@
data_file_size BIGINT,
current_file_count BIGINT
);
-CREATE UNIQUE INDEX journal_source_ids_unique ON journal (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX journal_source_ids_unique ON journal (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE journal_stats (
id SERIAL PRIMARY KEY,
@@ -432,9 +432,9 @@
CREATE TABLE link (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -446,7 +446,7 @@
transport VARCHAR(1000),
durable BOOL
);
-CREATE UNIQUE INDEX link_source_ids_unique ON link (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX link_source_ids_unique ON link (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE link_stats (
id SERIAL PRIMARY KEY,
@@ -459,9 +459,9 @@
CREATE TABLE master (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -478,7 +478,7 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX master_source_ids_unique ON master (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX master_source_ids_unique ON master (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE master_stats (
id SERIAL PRIMARY KEY,
@@ -495,9 +495,9 @@
CREATE TABLE negotiator (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -512,7 +512,7 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX negotiator_source_ids_unique ON negotiator (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX negotiator_source_ids_unique ON negotiator (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE negotiator_stats (
id SERIAL PRIMARY KEY,
@@ -534,9 +534,9 @@
CREATE TABLE queue (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -549,7 +549,7 @@
exclusive BOOL,
arguments BYTEA
);
-CREATE UNIQUE INDEX queue_source_ids_unique ON queue (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX queue_source_ids_unique ON queue (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE queue_stats (
id SERIAL PRIMARY KEY,
@@ -587,9 +587,9 @@
CREATE TABLE scheduler (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -607,7 +607,7 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX scheduler_source_ids_unique ON scheduler (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX scheduler_source_ids_unique ON scheduler (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE scheduler_stats (
id SERIAL PRIMARY KEY,
@@ -630,9 +630,9 @@
CREATE TABLE session (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -646,7 +646,7 @@
attached BOOL,
expire_time TIMESTAMP
);
-CREATE UNIQUE INDEX session_source_ids_unique ON session (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX session_source_ids_unique ON session (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE session_stats (
id SERIAL PRIMARY KEY,
@@ -662,9 +662,9 @@
CREATE TABLE slot (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -724,7 +724,7 @@
condor_version VARCHAR(1000),
daemon_start_time TIMESTAMP
);
-CREATE UNIQUE INDEX slot_source_ids_unique ON slot (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX slot_source_ids_unique ON slot (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE slot_stats (
id SERIAL PRIMARY KEY,
@@ -773,9 +773,9 @@
CREATE TABLE store (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -793,7 +793,7 @@
tpl_data_file_size BIGINT,
tpl_current_file_count BIGINT
);
-CREATE UNIQUE INDEX store_source_ids_unique ON store (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX store_source_ids_unique ON store (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE store_stats (
id SERIAL PRIMARY KEY,
@@ -813,9 +813,9 @@
CREATE TABLE submitter (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -827,7 +827,7 @@
name VARCHAR(1000),
schedd_name VARCHAR(1000)
);
-CREATE UNIQUE INDEX submitter_source_ids_unique ON submitter (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX submitter_source_ids_unique ON submitter (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE submitter_stats (
id SERIAL PRIMARY KEY,
@@ -841,9 +841,9 @@
CREATE TABLE sysimage (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -858,7 +858,7 @@
mem_total BIGINT,
swap_total BIGINT
);
-CREATE UNIQUE INDEX sysimage_source_ids_unique ON sysimage (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX sysimage_source_ids_unique ON sysimage (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE sysimage_stats (
id SERIAL PRIMARY KEY,
@@ -876,9 +876,9 @@
CREATE TABLE system (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -891,7 +891,7 @@
version VARCHAR(1000),
machine VARCHAR(1000)
);
-CREATE UNIQUE INDEX system_source_ids_unique ON system (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX system_source_ids_unique ON system (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE system_stats (
id SERIAL PRIMARY KEY,
@@ -902,9 +902,9 @@
CREATE TABLE vhost (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- managed_broker VARCHAR(1000),
- source_scope_id BIGINT,
- source_object_id BIGINT,
+ qmf_broker_id VARCHAR(1000),
+ qmf_scope_id BIGINT,
+ qmf_object_id BIGINT,
qmf_class_key VARCHAR(1000),
creation_time TIMESTAMP,
deletion_time TIMESTAMP,
@@ -914,7 +914,7 @@
name VARCHAR(1000),
federation_tag VARCHAR(1000)
);
-CREATE UNIQUE INDEX vhost_source_ids_unique ON vhost (managed_broker, source_scope_id, source_object_id);
+CREATE UNIQUE INDEX vhost_source_ids_unique ON vhost (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE TABLE vhost_stats (
id SERIAL PRIMARY KEY,
More information about the rhmessaging-commits
mailing list