[rhmessaging-commits] rhmessaging commits: r2286 - in mgmt/trunk/mint: sql and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Tue Aug 12 17:35:11 EDT 2008
Author: justi9
Date: 2008-08-12 17:35:11 -0400 (Tue, 12 Aug 2008)
New Revision: 2286
Modified:
mgmt/trunk/mint/python/mint/__init__.py
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/sql/schema.sql
Log:
Add basic pool navigation. Add a pool data object, and update the
schema.
Modified: mgmt/trunk/mint/python/mint/__init__.py
===================================================================
--- mgmt/trunk/mint/python/mint/__init__.py 2008-08-12 20:25:47 UTC (rev 2285)
+++ mgmt/trunk/mint/python/mint/__init__.py 2008-08-12 21:35:11 UTC (rev 2286)
@@ -110,6 +110,12 @@
value = StringCol(length=1000, default=None)
type = StringCol(length=1, default="s")
+class Pool(SQLObject):
+ class sqlmeta:
+ lazyUpdate = True
+
+ name = StringCol(length=1000, default=None)
+
class ConsoleUser(SQLObject):
class sqlmeta:
lazyUpdate = True
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-08-12 20:25:47 UTC (rev 2285)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-08-12 21:35:11 UTC (rev 2286)
@@ -32,7 +32,6 @@
classInfos = dict() # brokerId => classInfo
-System.sqlmeta.addJoin(SQLMultipleJoin('SystemStats', joinMethodName='stats'))
class Broker(SQLObject):
@@ -100,9 +99,6 @@
conn.callMethod(self.idOriginal, classInfo, "connect",
callback, args=actualArgs)
-System.sqlmeta.addJoin(SQLMultipleJoin('Broker', joinMethodName='brokers'))
-
-
class BrokerStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -113,7 +109,6 @@
classInfos = dict() # brokerId => classInfo
-Broker.sqlmeta.addJoin(SQLMultipleJoin('BrokerStats', joinMethodName='stats'))
class Agent(SQLObject):
@@ -127,7 +122,7 @@
managedBroker = StringCol(length=1000, default=None)
statsCurr = ForeignKey('AgentStats', cascade='null', default=None)
statsPrev = ForeignKey('AgentStats', cascade='null', default=None)
- sessionId = BLOBCol(default=None)
+ sessionName = StringCol(length=1000, default=None)
label = StringCol(length=1000, default=None)
registeredTo = BigIntCol(default=None)
systemId = BLOBCol(default=None)
@@ -144,7 +139,6 @@
classInfos = dict() # brokerId => classInfo
-Agent.sqlmeta.addJoin(SQLMultipleJoin('AgentStats', joinMethodName='stats'))
class Vhost(SQLObject):
@@ -163,9 +157,6 @@
classInfos = dict() # brokerId => classInfo
-Broker.sqlmeta.addJoin(SQLMultipleJoin('Vhost', joinMethodName='vhosts'))
-
-
class VhostStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -176,7 +167,6 @@
classInfos = dict() # brokerId => classInfo
-Vhost.sqlmeta.addJoin(SQLMultipleJoin('VhostStats', joinMethodName='stats'))
class Queue(SQLObject):
@@ -207,9 +197,6 @@
conn.callMethod(self.idOriginal, classInfo, "purge",
callback, args=actualArgs)
-Vhost.sqlmeta.addJoin(SQLMultipleJoin('Queue', joinMethodName='queues'))
-
-
class QueueStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -255,7 +242,6 @@
classInfos = dict() # brokerId => classInfo
-Queue.sqlmeta.addJoin(SQLMultipleJoin('QueueStats', joinMethodName='stats'))
class Exchange(SQLObject):
@@ -276,9 +262,6 @@
classInfos = dict() # brokerId => classInfo
-Vhost.sqlmeta.addJoin(SQLMultipleJoin('Exchange', joinMethodName='exchanges'))
-
-
class ExchangeStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -301,7 +284,6 @@
classInfos = dict() # brokerId => classInfo
-Exchange.sqlmeta.addJoin(SQLMultipleJoin('ExchangeStats', joinMethodName='stats'))
class Binding(SQLObject):
@@ -322,11 +304,6 @@
classInfos = dict() # brokerId => classInfo
-Exchange.sqlmeta.addJoin(SQLMultipleJoin('Binding', joinMethodName='bindings'))
-
-Queue.sqlmeta.addJoin(SQLMultipleJoin('Binding', joinMethodName='bindings'))
-
-
class BindingStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -338,7 +315,6 @@
classInfos = dict() # brokerId => classInfo
-Binding.sqlmeta.addJoin(SQLMultipleJoin('BindingStats', joinMethodName='stats'))
class ClientConnection(SQLObject):
@@ -365,9 +341,6 @@
conn.callMethod(self.idOriginal, classInfo, "close",
callback, args=actualArgs)
-Vhost.sqlmeta.addJoin(SQLMultipleJoin('ClientConnection', joinMethodName='clientConnections'))
-
-
class ClientConnectionStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -384,7 +357,6 @@
classInfos = dict() # brokerId => classInfo
-ClientConnection.sqlmeta.addJoin(SQLMultipleJoin('ClientConnectionStats', joinMethodName='stats'))
class Link(SQLObject):
@@ -429,9 +401,6 @@
conn.callMethod(self.idOriginal, classInfo, "bridge",
callback, args=actualArgs)
-Vhost.sqlmeta.addJoin(SQLMultipleJoin('Link', joinMethodName='links'))
-
-
class LinkStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -444,7 +413,6 @@
classInfos = dict() # brokerId => classInfo
-Link.sqlmeta.addJoin(SQLMultipleJoin('LinkStats', joinMethodName='stats'))
class Bridge(SQLObject):
@@ -478,9 +446,6 @@
conn.callMethod(self.idOriginal, classInfo, "close",
callback, args=actualArgs)
-Link.sqlmeta.addJoin(SQLMultipleJoin('Bridge', joinMethodName='bridges'))
-
-
class BridgeStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -491,7 +456,6 @@
classInfos = dict() # brokerId => classInfo
-Bridge.sqlmeta.addJoin(SQLMultipleJoin('BridgeStats', joinMethodName='stats'))
class Session(SQLObject):
@@ -541,11 +505,6 @@
conn.callMethod(self.idOriginal, classInfo, "close",
callback, args=actualArgs)
-Vhost.sqlmeta.addJoin(SQLMultipleJoin('Session', joinMethodName='sessions'))
-
-ClientConnection.sqlmeta.addJoin(SQLMultipleJoin('Session', joinMethodName='sessions'))
-
-
class SessionStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -559,36 +518,8 @@
classInfos = dict() # brokerId => classInfo
-Session.sqlmeta.addJoin(SQLMultipleJoin('SessionStats', joinMethodName='stats'))
-classToSchemaNameMap = dict()
-schemaNameToClassMap = dict()
-classToSchemaNameMap['System'] = 'System'
-schemaNameToClassMap['System'] = System
-classToSchemaNameMap['Broker'] = 'Broker'
-schemaNameToClassMap['Broker'] = Broker
-classToSchemaNameMap['Agent'] = 'Agent'
-schemaNameToClassMap['Agent'] = Agent
-classToSchemaNameMap['Vhost'] = 'Vhost'
-schemaNameToClassMap['Vhost'] = Vhost
-classToSchemaNameMap['Queue'] = 'Queue'
-schemaNameToClassMap['Queue'] = Queue
-classToSchemaNameMap['Exchange'] = 'Exchange'
-schemaNameToClassMap['Exchange'] = Exchange
-classToSchemaNameMap['Binding'] = 'Binding'
-schemaNameToClassMap['Binding'] = Binding
-classToSchemaNameMap['ClientConnection'] = 'ClientConnection'
-schemaNameToClassMap['ClientConnection'] = ClientConnection
-classToSchemaNameMap['Link'] = 'Link'
-schemaNameToClassMap['Link'] = Link
-classToSchemaNameMap['Bridge'] = 'Bridge'
-schemaNameToClassMap['Bridge'] = Bridge
-classToSchemaNameMap['Session'] = 'Session'
-schemaNameToClassMap['Session'] = Session
-
-
-
class Store(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -608,9 +539,6 @@
classInfos = dict() # brokerId => classInfo
-Broker.sqlmeta.addJoin(SQLMultipleJoin('Store', joinMethodName='stores'))
-
-
class StoreStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -621,7 +549,6 @@
classInfos = dict() # brokerId => classInfo
-Store.sqlmeta.addJoin(SQLMultipleJoin('StoreStats', joinMethodName='stats'))
class Journal(SQLObject):
@@ -655,9 +582,6 @@
conn.callMethod(self.idOriginal, classInfo, "expand",
callback, args=actualArgs)
-Queue.sqlmeta.addJoin(SQLMultipleJoin('Journal', joinMethodName='journals'))
-
-
class JournalStats(SQLObject):
class sqlmeta:
lazyUpdate = True
@@ -695,9 +619,109 @@
classInfos = dict() # brokerId => classInfo
-Journal.sqlmeta.addJoin(SQLMultipleJoin('JournalStats', joinMethodName='stats'))
+
+classToSchemaNameMap = dict()
+schemaNameToClassMap = dict()
+classToSchemaNameMap['System'] = 'System'
+schemaNameToClassMap['System'] = System
+
+System.sqlmeta.addJoin(SQLMultipleJoin('SystemStats', joinMethodName='stats'))
+
+classToSchemaNameMap['Broker'] = 'Broker'
+schemaNameToClassMap['Broker'] = Broker
+
+System.sqlmeta.addJoin(SQLMultipleJoin('Broker', joinMethodName='brokers'))
+
+
+Broker.sqlmeta.addJoin(SQLMultipleJoin('BrokerStats', joinMethodName='stats'))
+
+classToSchemaNameMap['Agent'] = 'Agent'
+schemaNameToClassMap['Agent'] = Agent
+
+Agent.sqlmeta.addJoin(SQLMultipleJoin('AgentStats', joinMethodName='stats'))
+
+classToSchemaNameMap['Vhost'] = 'Vhost'
+schemaNameToClassMap['Vhost'] = Vhost
+
+Broker.sqlmeta.addJoin(SQLMultipleJoin('Vhost', joinMethodName='vhosts'))
+
+
+Vhost.sqlmeta.addJoin(SQLMultipleJoin('VhostStats', joinMethodName='stats'))
+
+classToSchemaNameMap['Queue'] = 'Queue'
+schemaNameToClassMap['Queue'] = Queue
+
+Vhost.sqlmeta.addJoin(SQLMultipleJoin('Queue', joinMethodName='queues'))
+
+
+Queue.sqlmeta.addJoin(SQLMultipleJoin('QueueStats', joinMethodName='stats'))
+
+classToSchemaNameMap['Exchange'] = 'Exchange'
+schemaNameToClassMap['Exchange'] = Exchange
+
+Vhost.sqlmeta.addJoin(SQLMultipleJoin('Exchange', joinMethodName='exchanges'))
+
+
+Exchange.sqlmeta.addJoin(SQLMultipleJoin('ExchangeStats', joinMethodName='stats'))
+
+classToSchemaNameMap['Binding'] = 'Binding'
+schemaNameToClassMap['Binding'] = Binding
+
+Exchange.sqlmeta.addJoin(SQLMultipleJoin('Binding', joinMethodName='bindings'))
+
+Queue.sqlmeta.addJoin(SQLMultipleJoin('Binding', joinMethodName='bindings'))
+
+
+Binding.sqlmeta.addJoin(SQLMultipleJoin('BindingStats', joinMethodName='stats'))
+
+classToSchemaNameMap['ClientConnection'] = 'ClientConnection'
+schemaNameToClassMap['ClientConnection'] = ClientConnection
+
+Vhost.sqlmeta.addJoin(SQLMultipleJoin('ClientConnection', joinMethodName='clientConnections'))
+
+
+ClientConnection.sqlmeta.addJoin(SQLMultipleJoin('ClientConnectionStats', joinMethodName='stats'))
+
+classToSchemaNameMap['Link'] = 'Link'
+schemaNameToClassMap['Link'] = Link
+
+Vhost.sqlmeta.addJoin(SQLMultipleJoin('Link', joinMethodName='links'))
+
+
+Link.sqlmeta.addJoin(SQLMultipleJoin('LinkStats', joinMethodName='stats'))
+
+classToSchemaNameMap['Bridge'] = 'Bridge'
+schemaNameToClassMap['Bridge'] = Bridge
+
+Link.sqlmeta.addJoin(SQLMultipleJoin('Bridge', joinMethodName='bridges'))
+
+
+Bridge.sqlmeta.addJoin(SQLMultipleJoin('BridgeStats', joinMethodName='stats'))
+
+classToSchemaNameMap['Session'] = 'Session'
+schemaNameToClassMap['Session'] = Session
+
+Vhost.sqlmeta.addJoin(SQLMultipleJoin('Session', joinMethodName='sessions'))
+
+ClientConnection.sqlmeta.addJoin(SQLMultipleJoin('Session', joinMethodName='sessions'))
+
+
+Session.sqlmeta.addJoin(SQLMultipleJoin('SessionStats', joinMethodName='stats'))
+
classToSchemaNameMap['Store'] = 'Store'
schemaNameToClassMap['Store'] = Store
+
+Broker.sqlmeta.addJoin(SQLMultipleJoin('Store', joinMethodName='stores'))
+
+
+Store.sqlmeta.addJoin(SQLMultipleJoin('StoreStats', joinMethodName='stats'))
+
classToSchemaNameMap['Journal'] = 'Journal'
schemaNameToClassMap['Journal'] = Journal
+
+Queue.sqlmeta.addJoin(SQLMultipleJoin('Journal', joinMethodName='journals'))
+
+
+Journal.sqlmeta.addJoin(SQLMultipleJoin('JournalStats', joinMethodName='stats'))
+
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-08-12 20:25:47 UTC (rev 2285)
+++ mgmt/trunk/mint/sql/schema.sql 2008-08-12 21:35:11 UTC (rev 2286)
@@ -51,6 +51,11 @@
version VARCHAR(1000) NOT NULL
);
+CREATE TABLE pool (
+ id SERIAL PRIMARY KEY,
+ name VARCHAR(1000)
+);
+
CREATE TABLE agent (
id SERIAL PRIMARY KEY,
id_original BIGINT,
@@ -60,7 +65,7 @@
managed_broker VARCHAR(1000),
stats_curr_id INT,
stats_prev_id INT,
- session_id BYTEA,
+ session_name VARCHAR(1000),
label VARCHAR(1000),
registered_to BIGINT,
system_id BYTEA
More information about the rhmessaging-commits
mailing list