[rhmessaging-commits] rhmessaging commits: r2730 - in mgmt/trunk/mint: sql and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-11-03 09:37:42 -0500 (Mon, 03 Nov 2008)
New Revision: 2730

Modified:
   mgmt/trunk/mint/python/mint/schema.py
   mgmt/trunk/mint/sql/schema.sql
Log:
Changes from the latest mint>make schema

Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py	2008-11-03 13:43:01 UTC (rev 2729)
+++ mgmt/trunk/mint/python/mint/schema.py	2008-11-03 14:37:42 UTC (rev 2730)
@@ -3,6 +3,12 @@
 from datetime import datetime
 from qpid.management import objectId
 
+class Pool(SQLObject):
+  class sqlmeta:
+    lazyUpdate = True
+  sourceId = StringCol(length=1000, default=None, unique=True)
+
+
 class Slot(SQLObject):
   class sqlmeta:
     lazyUpdate = True
@@ -152,7 +158,7 @@
   Note = StringCol(length=4000, default=None)
   Out = StringCol(length=4000, default=None)
   Owner = StringCol(length=1000, default=None)
-  Juser = StringCol(length=1000, default=None)
+  GridUser = StringCol(length=1000, default=None)
   ProcId = IntCol(default=None)
   QDate = TimestampCol(default=None)
   JobUniverse = IntCol(default=None)
@@ -912,14 +918,6 @@
   byteTxnDequeues = BigIntCol(default=None)
   bytePersistEnqueues = BigIntCol(default=None)
   bytePersistDequeues = BigIntCol(default=None)
-  enqueueTxnStarts = BigIntCol(default=None)
-  enqueueTxnCommits = BigIntCol(default=None)
-  enqueueTxnRejects = BigIntCol(default=None)
-  enqueueTxnCount = IntCol(default=None)
-  dequeueTxnStarts = BigIntCol(default=None)
-  dequeueTxnCommits = BigIntCol(default=None)
-  dequeueTxnRejects = BigIntCol(default=None)
-  dequeueTxnCount = IntCol(default=None)
   consumerCount = IntCol(default=None)
   consumerCountLow = IntCol(default=None)
   consumerCountHigh = IntCol(default=None)
@@ -954,6 +952,7 @@
   name = StringCol(length=1000, default=None)
   type = StringCol(length=1000, default=None)
   durable = BoolCol(default=None)
+  arguments = PickleCol(default=None)
 
 
 class ExchangeStats(SQLObject):
@@ -996,6 +995,7 @@
   queue = ForeignKey('Queue', cascade='null', default=None)
   bindingKey = StringCol(length=1000, default=None)
   arguments = PickleCol(default=None)
+  origin = StringCol(length=1000, default=None)
 
 
 class BindingStats(SQLObject):
@@ -1027,6 +1027,8 @@
   address = StringCol(length=1000, default=None)
   incoming = BoolCol(default=None)
   SystemConnection = BoolCol(default=None)
+  federationLink = BoolCol(default=None)
+  authIdentity = StringCol(length=1000, default=None)
 
 
   def close(self, model, callback):
@@ -1045,8 +1047,6 @@
   clientConnection = ForeignKey('ClientConnection', cascade='null', default=None)
   classInfos = dict() # brokerId => classInfo
   closing = BoolCol(default=None)
-  federationLink = BoolCol(default=None)
-  authIdentity = StringCol(length=1000, default=None)
   framesFromClient = BigIntCol(default=None)
   framesToClient = BigIntCol(default=None)
   bytesFromClient = BigIntCol(default=None)
@@ -1221,6 +1221,10 @@
   session = ForeignKey('Session', cascade='null', default=None)
   classInfos = dict() # brokerId => classInfo
   framesOutstanding = IntCol(default=None)
+  TxnStarts = BigIntCol(default=None)
+  TxnCommits = BigIntCol(default=None)
+  TxnRejects = BigIntCol(default=None)
+  TxnCount = IntCol(default=None)
 
 
 
@@ -1229,7 +1233,8 @@
 schemaNameToClassMap = dict()
 schemaReservedWordsMap = {"in": "inRsv", "In": "InRsv", 
   "connection": "clientConnection", "Connection": "ClientConnection", 
-  "other": "otherRsv"}
+  "connectionRef": "clientConnectionRef", 
+  "user": "gridUser", "User": "GridUser"} 
 
 classToSchemaNameMap['Slot'] = 'Slot'
 schemaNameToClassMap['Slot'] = Slot

Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql	2008-11-03 13:43:01 UTC (rev 2729)
+++ mgmt/trunk/mint/sql/schema.sql	2008-11-03 14:37:42 UTC (rev 2730)
@@ -131,7 +131,8 @@
     exchange_id INT,
     queue_id INT,
     binding_key VARCHAR(1000),
-    arguments BYTEA
+    arguments BYTEA,
+    origin VARCHAR(1000)
 );
 
 CREATE TABLE binding_stats (
@@ -211,7 +212,9 @@
     vhost_id INT,
     address VARCHAR(1000),
     incoming BOOL,
-    system_connection BOOL
+    system_connection BOOL,
+    federation_link BOOL,
+    auth_identity VARCHAR(1000)
 );
 
 CREATE TABLE client_connection_stats (
@@ -219,8 +222,6 @@
     rec_time TIMESTAMP,
     client_connection_id INT,
     closing BOOL,
-    federation_link BOOL,
-    auth_identity VARCHAR(1000),
     frames_from_client BIGINT,
     frames_to_client BIGINT,
     bytes_from_client BIGINT,
@@ -289,7 +290,8 @@
     vhost_id INT,
     name VARCHAR(1000),
     type VARCHAR(1000),
-    durable BOOL
+    durable BOOL,
+    arguments BYTEA
 );
 
 CREATE TABLE exchange_stats (
@@ -337,7 +339,7 @@
     note VARCHAR(4000),
     out VARCHAR(4000),
     owner VARCHAR(1000),
-    juser VARCHAR(1000),
+    grid_user VARCHAR(1000),
     proc_id INT,
     q_date TIMESTAMP,
     job_universe INT,
@@ -504,6 +506,11 @@
     monitor_self_time TIMESTAMP
 );
 
+CREATE TABLE pool (
+    id SERIAL PRIMARY KEY,
+    source_id VARCHAR(1000) UNIQUE
+);
+
 CREATE TABLE queue (
     id SERIAL PRIMARY KEY,
     rec_time TIMESTAMP,
@@ -540,14 +547,6 @@
     byte_txn_dequeues BIGINT,
     byte_persist_enqueues BIGINT,
     byte_persist_dequeues BIGINT,
-    enqueue_txn_starts BIGINT,
-    enqueue_txn_commits BIGINT,
-    enqueue_txn_rejects BIGINT,
-    enqueue_txn_count INT,
-    dequeue_txn_starts BIGINT,
-    dequeue_txn_commits BIGINT,
-    dequeue_txn_rejects BIGINT,
-    dequeue_txn_count INT,
     consumer_count INT,
     consumer_count_low INT,
     consumer_count_high INT,
@@ -627,7 +626,11 @@
     id SERIAL PRIMARY KEY,
     rec_time TIMESTAMP,
     session_id INT,
-    frames_outstanding INT
+    frames_outstanding INT,
+    txn_starts BIGINT,
+    txn_commits BIGINT,
+    txn_rejects BIGINT,
+    txn_count INT
 );
 
 CREATE TABLE slot (