Author: nunofsantos Date: 2008-06-03 11:38:55 -0400 (Tue, 03 Jun 2008) New Revision: 2117 Modified: mgmt/cumin/python/cumin/client.py mgmt/cumin/python/cumin/model.py mgmt/mint/python/mint/__init__.py mgmt/mint/python/mint/schema.py mgmt/mint/python/mint/schemaparser.py mgmt/mint/sql/schema.sql Log: rename Connection to ClientConnection to avoid name conflicts Modified: mgmt/cumin/python/cumin/client.py =================================================================== --- mgmt/cumin/python/cumin/client.py 2008-06-03 15:10:09 UTC (rev 2116) +++ mgmt/cumin/python/cumin/client.py 2008-06-03 15:38:55 UTC (rev 2117) @@ -50,7 +50,7 @@ return self.unit.get(session) == "b" and "Bytes" or "Frames" def render_title(self, session, vhost): - return "Connections %s" % fmt_count(vhost.connections.count()) + return "Connections %s" % fmt_count(vhost.clientConnections.count()) def render_sql_where(self, session, vhost): elems = list() Modified: mgmt/cumin/python/cumin/model.py =================================================================== --- mgmt/cumin/python/cumin/model.py 2008-06-03 15:10:09 UTC (rev 2116) +++ mgmt/cumin/python/cumin/model.py 2008-06-03 15:38:55 UTC (rev 2117) @@ -817,8 +817,8 @@ class CuminConnection(RemoteClass): def __init__(self, model): - super(CuminConnection, self).__init__(model, "connection", Connection, - ConnectionStats) + super(CuminConnection, self).__init__(model, "clientConnection", ClientConnection, + ClientConnectionStats) prop = CuminProperty(self, "address") prop.title = "Address" Modified: mgmt/mint/python/mint/__init__.py =================================================================== --- mgmt/mint/python/mint/__init__.py 2008-06-03 15:10:09 UTC (rev 2116) +++ mgmt/mint/python/mint/__init__.py 2008-06-03 15:38:55 UTC (rev 2117) @@ -356,6 +356,8 @@ def sanitizeDict(self, d): if ("id" in d): d[self.convertIdKey("id")] = d.pop("id") + if ("connectionRef" in d): + d["clientConnectionRef"] = d.pop("connectionRef") #XXX FIX -- fix handling of field tables if ("arguments" in d): d.pop("arguments") @@ -377,21 +379,30 @@ keys.append(key) return keys + def fixClassInfo(self, classInfo): + objectName = self.initialCapital(classInfo[1]) + if (objectName == "Connection"): + objectName = "ClientConnection" + return objectName + + def initialCapital(self, string): + return string[0].upper() + string[1:] + def setCloseListener(self, connCloseListener): self.connCloseListener = connCloseListener def schemaCallback(self, brokerId, classInfo, configs, metric, methods, events): self.log("\nSCHEMA---------------------------------------------------") - self.log("BrokerId=%s , ClassInfo[1]=%s" % (brokerId, classInfo[1])) - cls = schema.schemaNameToClassMap.get(classInfo[1].capitalize()) + objectName = self.fixClassInfo(classInfo) + self.log("BrokerId=%s , objectName=%s" % (brokerId, objectName)) + cls = schema.schemaNameToClassMap.get(objectName) if cls: cls.classInfos[brokerId] = classInfo self.log("\nEND SCHEMA---------------------------------------------------") - def configCallback(self, brokerId, classInfo, list, timestamps): self.log("\nCONFIG---------------------------------------------------") - objectName = classInfo[1].capitalize() + objectName = self.fixClassInfo(classInfo) brokerUUID = classInfo[2] self.log(objectName) d = self.sanitizeDict(dict(list)) @@ -409,13 +420,12 @@ try: for parentKey in self.findParentKeys(d): convertedKey = self.convertRefKey(parentKey) - cls = schema.schemaNameToClassMap.get(convertedKey.capitalize()) - if (convertedKey == "connection"): - convertedKey = "clientConnection" + cls = schema.schemaNameToClassMap.get(self.initialCapital(convertedKey)) if cls: d[convertedKey] = conn.getByOriginalId(cls, d.pop(parentKey), brokerId) else: self.log("Error: referenced class not found: %s" % convertedKey) + obj = conn.getByOriginalId(schema.schemaNameToClassMap[objectName], d["idOriginal"], brokerId, create=True) if (not obj): self.log("Couldn't find type %s id %s" % (objectName, d["idOriginal"])) @@ -434,7 +444,7 @@ def instCallback(self, brokerId, classInfo, list, timestamps): self.log("\nINST---------------------------------------------------") - objectName = classInfo[1].capitalize() + objectName = self.fixClassInfo(classInfo) brokerUUID = classInfo[2] self.log(objectName) d = self.sanitizeDict(dict(list)) @@ -455,9 +465,7 @@ print "lion", classInfo, list return - origObjName = classInfo[1] - if (origObjName == "connection"): - origObjName = "clientConnection" + origObjName = objectName[0].lower() + objectName[1:] d[origObjName] = obj objNameStats = eval("schema.%sStats" % (schema.schemaNameToClassMap[objectName].__name__)) objStats = objNameStats.__new__(objNameStats) Modified: mgmt/mint/python/mint/schema.py =================================================================== --- mgmt/mint/python/mint/schema.py 2008-06-03 15:10:09 UTC (rev 2116) +++ mgmt/mint/python/mint/schema.py 2008-06-03 15:38:55 UTC (rev 2117) @@ -224,6 +224,7 @@ msgPersistEnqueues = BigIntCol(default=None) msgPersistDequeues = BigIntCol(default=None) msgDepth = IntCol(default=None) + byteDepth = IntCol(default=None) byteTotalEnqueues = BigIntCol(default=None) byteTotalDequeues = BigIntCol(default=None) byteTxnEnqueues = BigIntCol(default=None) @@ -344,7 +345,7 @@ Binding.sqlmeta.addJoin(SQLMultipleJoin('BindingStats', joinMethodName='stats')) -class Connection(SQLObject): +class ClientConnection(SQLObject): class sqlmeta: lazyUpdate = True @@ -353,8 +354,8 @@ creationTime = TimestampCol(default=None) deletionTime = TimestampCol(default=None) managedBroker = StringCol(length=1000, default=None) - statsCurr = ForeignKey('ConnectionStats', cascade='null', default=None) - statsPrev = ForeignKey('ConnectionStats', cascade='null', default=None) + statsCurr = ForeignKey('ClientConnectionStats', cascade='null', default=None) + statsPrev = ForeignKey('ClientConnectionStats', cascade='null', default=None) vhost = ForeignKey('Vhost', cascade='null', default=None) address = StringCol(length=1000, default=None) incoming = BoolCol(default=None) @@ -368,16 +369,16 @@ conn.callMethod(self.idOriginal, classInfo, "close", callback, args=actualArgs) -Vhost.sqlmeta.addJoin(SQLMultipleJoin('Connection', joinMethodName='connections')) +Vhost.sqlmeta.addJoin(SQLMultipleJoin('ClientConnection', joinMethodName='clientConnections')) -class ConnectionStats(SQLObject): +class ClientConnectionStats(SQLObject): class sqlmeta: lazyUpdate = True idOriginal = BigIntCol(default=None) recTime = TimestampCol(default=None) - clientConnection = ForeignKey('Connection', cascade='null', default=None) + clientConnection = ForeignKey('ClientConnection', cascade='null', default=None) closing = BoolCol(default=None) authIdentity = StringCol(length=1000, default=None) framesFromClient = BigIntCol(default=None) @@ -387,7 +388,7 @@ classInfos = dict() # brokerId => classInfo -Connection.sqlmeta.addJoin(SQLMultipleJoin('ConnectionStats', joinMethodName='stats')) +ClientConnection.sqlmeta.addJoin(SQLMultipleJoin('ClientConnectionStats', joinMethodName='stats')) class Link(SQLObject): @@ -511,8 +512,8 @@ vhost = ForeignKey('Vhost', cascade='null', default=None) name = StringCol(length=1000, default=None) channelId = SmallIntCol(default=None) - clientConnection = ForeignKey('Connection', cascade='null', default=None) - detachedLifespan = IntCol(default=None) + clientConnection = ForeignKey('ClientConnection', cascade='null', default=None) + detachedLifespan = BigIntCol(default=None) classInfos = dict() # brokerId => classInfo @@ -546,7 +547,7 @@ Vhost.sqlmeta.addJoin(SQLMultipleJoin('Session', joinMethodName='sessions')) -Connection.sqlmeta.addJoin(SQLMultipleJoin('Session', joinMethodName='sessions')) +ClientConnection.sqlmeta.addJoin(SQLMultipleJoin('Session', joinMethodName='sessions')) class SessionStats(SQLObject): @@ -581,8 +582,8 @@ schemaNameToClassMap['Exchange'] = Exchange classToSchemaNameMap['Binding'] = 'Binding' schemaNameToClassMap['Binding'] = Binding -classToSchemaNameMap['Connection'] = 'Connection' -schemaNameToClassMap['Connection'] = Connection +classToSchemaNameMap['ClientConnection'] = 'ClientConnection' +schemaNameToClassMap['ClientConnection'] = ClientConnection classToSchemaNameMap['Link'] = 'Link' schemaNameToClassMap['Link'] = Link classToSchemaNameMap['Bridge'] = 'Bridge' Modified: mgmt/mint/python/mint/schemaparser.py =================================================================== --- mgmt/mint/python/mint/schemaparser.py 2008-06-03 15:10:09 UTC (rev 2116) +++ mgmt/mint/python/mint/schemaparser.py 2008-06-03 15:38:55 UTC (rev 2117) @@ -65,7 +65,7 @@ def generateMultipleJoin(self, tableFrom, tableTo, attrib=""): if (attrib == ""): - attrib = tableTo.lower() + "s" + attrib = tableTo[0].lower() + tableTo[1:] + "s" self.additionalPythonOutput += "\n%s.sqlmeta.addJoin(SQLMultipleJoin('%s', joinMethodName='%s'))\n" % (tableFrom, tableTo, attrib) def generateLazyUpdate(self, lazyUpdate=True): @@ -80,6 +80,8 @@ if (elem["@type"] == "objId"): if (elem["(a)name"].endswith("Ref")): reference = self.style.dbTableToPythonClass(elem["@references"]) + if (reference == "Connection"): + reference = "ClientConnection" attrib = reference[0].lower() + reference[1:] self.generateForeignKeyAttrib(attrib, reference) self.generateMultipleJoin(reference, self.currentClass) @@ -102,6 +104,8 @@ self.pythonOutput += " classInfos = dict() # brokerId => classInfo\n" def startClass(self, schemaName, stats=False): + if (schemaName == "Connection"): + schemaName = "ClientConnection" if (stats): origPythonName = self.style.dbTableToPythonClass(schemaName) pythonName = self.style.dbTableToPythonClass(schemaName + "_stats") Modified: mgmt/mint/sql/schema.sql =================================================================== --- mgmt/mint/sql/schema.sql 2008-06-03 15:10:09 UTC (rev 2116) +++ mgmt/mint/sql/schema.sql 2008-06-03 15:38:55 UTC (rev 2117) @@ -154,7 +154,7 @@ broker_id INT ); -CREATE TABLE connection ( +CREATE TABLE client_connection ( id SERIAL PRIMARY KEY, id_original BIGINT, rec_time TIMESTAMP, @@ -168,7 +168,7 @@ incoming BOOL ); -CREATE TABLE connection_stats ( +CREATE TABLE client_connection_stats ( id SERIAL PRIMARY KEY, id_original BIGINT, rec_time TIMESTAMP, @@ -269,6 +269,7 @@ msg_persist_enqueues BIGINT, msg_persist_dequeues BIGINT, msg_depth INT, + byte_depth INT, byte_total_enqueues BIGINT, byte_total_dequeues BIGINT, byte_txn_enqueues BIGINT, @@ -315,7 +316,7 @@ name VARCHAR(1000), channel_id SMALLINT, client_connection_id INT, - detached_lifespan INT + detached_lifespan BIGINT ); CREATE TABLE session_stats ( @@ -416,13 +417,13 @@ ALTER TABLE broker_stats ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id) REFERENCES broker (id) ON DELETE SET NULL; -ALTER TABLE connection ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES connection_stats (id) ON DELETE SET NULL; +ALTER TABLE client_connection ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES client_connection_stats (id) ON DELETE SET NULL; -ALTER TABLE connection ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES connection_stats (id) ON DELETE SET NULL; +ALTER TABLE client_connection ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES client_connection_stats (id) ON DELETE SET NULL; -ALTER TABLE connection ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; +ALTER TABLE client_connection ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; -ALTER TABLE connection_stats ADD CONSTRAINT client_connection_id_exists FOREIGN KEY (client_connection_id) REFERENCES connection (id) ON DELETE SET NULL; +ALTER TABLE client_connection_stats ADD CONSTRAINT client_connection_id_exists FOREIGN KEY (client_connection_id) REFERENCES client_connection (id) ON DELETE SET NULL; ALTER TABLE exchange ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES exchange_stats (id) ON DELETE SET NULL; @@ -454,7 +455,7 @@ ALTER TABLE session ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; -ALTER TABLE session ADD CONSTRAINT client_connection_id_exists FOREIGN KEY (client_connection_id) REFERENCES connection (id) ON DELETE SET NULL; +ALTER TABLE session ADD CONSTRAINT client_connection_id_exists FOREIGN KEY (client_connection_id) REFERENCES client_connection (id) ON DELETE SET NULL; ALTER TABLE session_stats ADD CONSTRAINT session_id_exists FOREIGN KEY (session_id) REFERENCES session (id) ON DELETE SET NULL;