[rhmessaging-commits] rhmessaging commits: r2481 - in mgmt/trunk/mint: sql and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Tue Sep 16 14:14:41 EDT 2008
Author: nunofsantos
Date: 2008-09-16 14:14:41 -0400 (Tue, 16 Sep 2008)
New Revision: 2481
Modified:
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:
support argument maps through SQLObject's PickleCol
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-09-16 15:47:43 UTC (rev 2480)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-09-16 18:14:41 UTC (rev 2481)
@@ -55,28 +55,10 @@
connBacklog = SmallIntCol(default=None)
stagingThreshold = IntCol(default=None)
mgmtPubInterval = SmallIntCol(default=None)
- clusterName = StringCol(length=1000, default=None)
version = StringCol(length=1000, default=None)
dataDir = StringCol(length=1000, default=None)
- def joinCluster(self, model, callback, clusterName):
- actualArgs = dict()
- actualArgs["clusterName"] = clusterName
- conn = model.connections[self.managedBroker]
- classInfo = self.classInfos[self.managedBroker]
- originalId = objectId(None, self.sourceScopeId, self.sourceObjectId)
- conn.callMethod(originalId, classInfo, "joinCluster",
- callback, args=actualArgs)
-
- def leaveCluster(self, model, callback):
- actualArgs = dict()
- conn = model.connections[self.managedBroker]
- classInfo = self.classInfos[self.managedBroker]
- originalId = objectId(None, self.sourceScopeId, self.sourceObjectId)
- conn.callMethod(originalId, classInfo, "leaveCluster",
- callback, args=actualArgs)
-
def echo(self, model, callback, sequence, body):
"""Request a response to test the path to the management broker"""
actualArgs = dict()
@@ -192,7 +174,7 @@
durable = BoolCol(default=None)
autoDelete = BoolCol(default=None)
exclusive = BoolCol(default=None)
- arguments = StringCol(default=None)
+ arguments = PickleCol(default=None)
def purge(self, model, callback, request):
@@ -309,7 +291,7 @@
exchange = ForeignKey('Exchange', cascade='null', default=None)
queue = ForeignKey('Queue', cascade='null', default=None)
bindingKey = StringCol(length=1000, default=None)
- arguments = StringCol(default=None)
+ arguments = PickleCol(default=None)
class BindingStats(SQLObject):
@@ -340,6 +322,7 @@
vhost = ForeignKey('Vhost', cascade='null', default=None)
address = StringCol(length=1000, default=None)
incoming = BoolCol(default=None)
+ SystemConnection = BoolCol(default=None)
def close(self, model, callback):
@@ -552,13 +535,6 @@
location = StringCol(length=1000, default=None)
defaultInitialFileCount = SmallIntCol(default=None)
defaultDataFileSize = IntCol(default=None)
- tplIsInitialized = BoolCol(default=None)
- tplDirectory = StringCol(length=1000, default=None)
- tplWritePageSize = IntCol(default=None)
- tplWritePages = IntCol(default=None)
- tplInitialFileCount = SmallIntCol(default=None)
- tplDataFileSize = IntCol(default=None)
- tplCurrentFileCount = IntCol(default=None)
class StoreStats(SQLObject):
@@ -568,15 +544,6 @@
recTime = TimestampCol(default=None)
store = ForeignKey('Store', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
- tplTransactionDepth = IntCol(default=None)
- tplTransactionDepthLow = IntCol(default=None)
- tplTransactionDepthHigh = IntCol(default=None)
- tplTxnPrepares = BigIntCol(default=None)
- tplTxnCommits = BigIntCol(default=None)
- tplTxnAborts = BigIntCol(default=None)
- tplOutstandingAIOs = IntCol(default=None)
- tplOutstandingAIOsLow = IntCol(default=None)
- tplOutstandingAIOsHigh = IntCol(default=None)
@@ -594,17 +561,14 @@
statsCurr = ForeignKey('JournalStats', cascade='null', default=None)
statsPrev = ForeignKey('JournalStats', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
- queue = ForeignKey('Queue', cascade='null', default=None)
name = StringCol(length=1000, default=None)
+ queue = ForeignKey('Queue', cascade='null', default=None)
directory = StringCol(length=1000, default=None)
baseFileName = StringCol(length=1000, default=None)
writePageSize = IntCol(default=None)
writePages = IntCol(default=None)
readPageSize = IntCol(default=None)
readPages = IntCol(default=None)
- initialFileCount = SmallIntCol(default=None)
- dataFileSize = IntCol(default=None)
- currentFileCount = IntCol(default=None)
def expand(self, model, callback, by):
@@ -624,15 +588,14 @@
recTime = TimestampCol(default=None)
journal = ForeignKey('Journal', cascade='null', default=None)
classInfos = dict() # brokerId => classInfo
+ initialFileCount = SmallIntCol(default=None)
+ dataFileSize = IntCol(default=None)
+ currentFileCount = IntCol(default=None)
recordDepth = IntCol(default=None)
recordDepthLow = IntCol(default=None)
recordDepthHigh = IntCol(default=None)
- enqueues = BigIntCol(default=None)
- dequeues = BigIntCol(default=None)
- txnEnqueues = BigIntCol(default=None)
- txnDequeues = BigIntCol(default=None)
- txnCommits = BigIntCol(default=None)
- txnAborts = BigIntCol(default=None)
+ recordEnqueues = BigIntCol(default=None)
+ recordDequeues = BigIntCol(default=None)
outstandingAIOs = IntCol(default=None)
outstandingAIOsLow = IntCol(default=None)
outstandingAIOsHigh = IntCol(default=None)
@@ -817,33 +780,6 @@
conn.callMethod(originalId, classInfo, "GetAd",
callback, args=actualArgs)
- def Hold(self, model, callback, Reason):
- actualArgs = dict()
- actualArgs["Reason"] = Reason
- conn = model.connections[self.managedBroker]
- classInfo = self.classInfos[self.managedBroker]
- originalId = objectId(None, self.sourceScopeId, self.sourceObjectId)
- conn.callMethod(originalId, classInfo, "Hold",
- callback, args=actualArgs)
-
- def Release(self, model, callback, Reason):
- actualArgs = dict()
- actualArgs["Reason"] = Reason
- conn = model.connections[self.managedBroker]
- classInfo = self.classInfos[self.managedBroker]
- originalId = objectId(None, self.sourceScopeId, self.sourceObjectId)
- conn.callMethod(originalId, classInfo, "Release",
- callback, args=actualArgs)
-
- def Remove(self, model, callback, Reason):
- actualArgs = dict()
- actualArgs["Reason"] = Reason
- conn = model.connections[self.managedBroker]
- classInfo = self.classInfos[self.managedBroker]
- originalId = objectId(None, self.sourceScopeId, self.sourceObjectId)
- conn.callMethod(originalId, classInfo, "Remove",
- callback, args=actualArgs)
-
class JobStats(SQLObject):
class sqlmeta:
lazyUpdate = True
Modified: mgmt/trunk/mint/python/mint/schemaparser.py
===================================================================
--- mgmt/trunk/mint/python/mint/schemaparser.py 2008-09-16 15:47:43 UTC (rev 2480)
+++ mgmt/trunk/mint/python/mint/schemaparser.py 2008-09-16 18:14:41 UTC (rev 2481)
@@ -27,7 +27,7 @@
self.dataTypesMap["absTime"] = self.dataTypesMap["deltaTime"] = "BigIntCol"
self.dataTypesMap["bool"] = "BoolCol"
self.dataTypesMap["sstr"] = self.dataTypesMap["lstr"] = "StringCol"
- self.dataTypesMap["map"] = "StringCol"
+ self.dataTypesMap["map"] = "PickleCol"
# mapping for identifiers in the XML schema that are reserved words in either SQL or Python
self.reservedWords = {"in": "inRsv", "In": "InRsv",
"connection": "clientConnection", "Connection": "ClientConnection",
Modified: mgmt/trunk/mint/python/mint/update.py
===================================================================
--- mgmt/trunk/mint/python/mint/update.py 2008-09-16 15:47:43 UTC (rev 2480)
+++ mgmt/trunk/mint/python/mint/update.py 2008-09-16 18:14:41 UTC (rev 2481)
@@ -77,10 +77,6 @@
if "connectionRef" in attrs:
attrs["clientConnectionRef"] = attrs.pop("connectionRef")
- #XXX FIX -- fix handling of field tables
- if "arguments" in attrs:
- del attrs["arguments"]
-
for name in attrs.keys():
rename = schemaReservedWordsMap.get(name)
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2008-09-16 15:47:43 UTC (rev 2480)
+++ mgmt/trunk/mint/sql/schema.sql 2008-09-16 18:14:41 UTC (rev 2481)
@@ -105,7 +105,7 @@
exchange_id INT,
queue_id INT,
binding_key VARCHAR(1000),
- arguments TEXT
+ arguments BYTEA
);
CREATE TABLE binding_stats (
@@ -160,7 +160,6 @@
conn_backlog SMALLINT,
staging_threshold INT,
mgmt_pub_interval SMALLINT,
- cluster_name VARCHAR(1000),
version VARCHAR(1000),
data_dir VARCHAR(1000),
registration_id INT
@@ -184,7 +183,8 @@
stats_prev_id INT,
vhost_id INT,
address VARCHAR(1000),
- incoming BOOL
+ incoming BOOL,
+ system_connection BOOL
);
CREATE TABLE client_connection_stats (
@@ -283,32 +283,28 @@
managed_broker VARCHAR(1000),
stats_curr_id INT,
stats_prev_id INT,
- queue_id INT,
name VARCHAR(1000),
+ queue_id INT,
directory VARCHAR(1000),
base_file_name VARCHAR(1000),
write_page_size INT,
write_pages INT,
read_page_size INT,
- read_pages INT,
- initial_file_count SMALLINT,
- data_file_size INT,
- current_file_count INT
+ read_pages INT
);
CREATE TABLE journal_stats (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
journal_id INT,
+ initial_file_count SMALLINT,
+ data_file_size INT,
+ current_file_count INT,
record_depth INT,
record_depth_low INT,
record_depth_high INT,
- enqueues BIGINT,
- dequeues BIGINT,
- txn_enqueues BIGINT,
- txn_dequeues BIGINT,
- txn_commits BIGINT,
- txn_aborts BIGINT,
+ record_enqueues BIGINT,
+ record_dequeues BIGINT,
outstanding_ai_os INT,
outstanding_ai_os_low INT,
outstanding_ai_os_high INT,
@@ -370,7 +366,7 @@
durable BOOL,
auto_delete BOOL,
exclusive BOOL,
- arguments TEXT
+ arguments BYTEA
);
CREATE TABLE queue_stats (
@@ -597,29 +593,13 @@
broker_id INT,
location VARCHAR(1000),
default_initial_file_count SMALLINT,
- default_data_file_size INT,
- tpl_is_initialized BOOL,
- tpl_directory VARCHAR(1000),
- tpl_write_page_size INT,
- tpl_write_pages INT,
- tpl_initial_file_count SMALLINT,
- tpl_data_file_size INT,
- tpl_current_file_count INT
+ default_data_file_size INT
);
CREATE TABLE store_stats (
id SERIAL PRIMARY KEY,
rec_time TIMESTAMP,
- store_id INT,
- tpl_transaction_depth INT,
- tpl_transaction_depth_low INT,
- tpl_transaction_depth_high INT,
- tpl_txn_prepares BIGINT,
- tpl_txn_commits BIGINT,
- tpl_txn_aborts BIGINT,
- tpl_outstanding_ai_os INT,
- tpl_outstanding_ai_os_low INT,
- tpl_outstanding_ai_os_high INT
+ store_id INT
);
CREATE TABLE submitter (
More information about the rhmessaging-commits
mailing list