[rhmessaging-commits] rhmessaging commits: r3616 - in mgmt/trunk/mint: sql and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Thu Sep 3 12:04:50 EDT 2009
Author: justi9
Date: 2009-09-03 12:04:50 -0400 (Thu, 03 Sep 2009)
New Revision: 3616
Modified:
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/python/mint/schemaparser.py
mgmt/trunk/mint/sql/schema.sql
Log:
* Remove the classInfos attr from schema objects; it's no longer used
* Make the parser blow up if an objId attr doesn't have a references
* Regenerate the schema
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2009-09-03 15:45:27 UTC (rev 3615)
+++ mgmt/trunk/mint/python/mint/schema.py 2009-09-03 16:04:50 UTC (rev 3616)
@@ -26,7 +26,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SlotStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
Pool = StringCol(length=1000, default=None)
System = StringCol(length=1000, default=None)
AccountingGroup = StringCol(length=1000, default=None)
@@ -39,7 +38,6 @@
Disk = BigIntCol(default=None)
FileSystemDomain = StringCol(length=1000, default=None)
GlobalJobId = StringCol(length=1000, default=None)
- ImageSize = BigIntCol(default=None)
IsValidCheckpointPlatform = StringCol(length=4000, default=None)
JobId = StringCol(length=1000, default=None)
JobStart = TimestampCol(default=None)
@@ -88,7 +86,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
slot = ForeignKey('Slot', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
Activity = StringCol(length=1000, default=None)
ClockDay = BigIntCol(default=None)
ClockMin = BigIntCol(default=None)
@@ -96,6 +93,7 @@
ConsoleIdle = BigIntCol(default=None)
EnteredCurrentActivity = TimestampCol(default=None)
EnteredCurrentState = TimestampCol(default=None)
+ ImageSize = BigIntCol(default=None)
KeyboardIdle = BigIntCol(default=None)
LastBenchmark = TimestampCol(default=None)
LastFetchWorkCompleted = TimestampCol(default=None)
@@ -149,7 +147,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('JobStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
scheduler = ForeignKey('Scheduler', cascade='null', default=None)
submitter = ForeignKey('Submitter', cascade='null', default=None)
AccountingGroup = StringCol(length=1000, default=None)
@@ -241,7 +238,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
job = ForeignKey('Job', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
@@ -263,7 +259,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SchedulerStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
Pool = StringCol(length=1000, default=None)
System = StringCol(length=1000, default=None)
JobQueueBirthdate = TimestampCol(default=None)
@@ -393,7 +388,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
scheduler = ForeignKey('Scheduler', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
NumUsers = BigIntCol(default=None)
TotalHeldJobs = BigIntCol(default=None)
TotalIdleJobs = BigIntCol(default=None)
@@ -428,7 +422,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SubmitterStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
scheduler = ForeignKey('Scheduler', cascade='null', default=None)
JobQueueBirthdate = TimestampCol(default=None)
Machine = StringCol(length=1000, default=None)
@@ -441,7 +434,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
submitter = ForeignKey('Submitter', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
HeldJobs = BigIntCol(default=None)
IdleJobs = BigIntCol(default=None)
RunningJobs = BigIntCol(default=None)
@@ -466,7 +458,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('NegotiatorStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
Pool = StringCol(length=1000, default=None)
System = StringCol(length=1000, default=None)
Name = StringCol(length=1000, default=None)
@@ -567,7 +558,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
negotiator = ForeignKey('Negotiator', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
MonitorSelfAge = BigIntCol(default=None)
MonitorSelfCPUUsage = FloatCol(default=None)
@@ -596,7 +586,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('CollectorStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
Pool = StringCol(length=1000, default=None)
System = StringCol(length=1000, default=None)
CondorPlatform = StringCol(length=1000, default=None)
@@ -610,7 +599,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
collector = ForeignKey('Collector', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
RunningJobs = BigIntCol(default=None)
IdleJobs = BigIntCol(default=None)
HostsTotal = BigIntCol(default=None)
@@ -638,7 +626,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('MasterStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
Pool = StringCol(length=1000, default=None)
System = StringCol(length=1000, default=None)
Name = StringCol(length=1000, default=None)
@@ -673,7 +660,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
master = ForeignKey('Master', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
MonitorSelfAge = BigIntCol(default=None)
MonitorSelfCPUUsage = FloatCol(default=None)
@@ -702,7 +688,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('GridStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
Pool = StringCol(length=1000, default=None)
Name = StringCol(length=1000, default=None)
ScheddName = StringCol(length=1000, default=None)
@@ -717,7 +702,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
grid = ForeignKey('Grid', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
NumJobs = BigIntCol(default=None)
SubmitsInProgress = BigIntCol(default=None)
SubmitsQueued = BigIntCol(default=None)
@@ -746,7 +730,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SubmissionStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
scheduler = ForeignKey('Scheduler', cascade='null', default=None)
submitter = ForeignKey('Submitter', cascade='null', default=None)
Name = StringCol(length=1000, default=None)
@@ -757,7 +740,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
submission = ForeignKey('Submission', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
Idle = BigIntCol(default=None)
Running = BigIntCol(default=None)
Removed = BigIntCol(default=None)
@@ -784,7 +766,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('AclStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
broker = ForeignKey('Broker', cascade='null', default=None)
policyFile = StringCol(length=1000, default=None)
enforcingAcl = BoolCol(default=None)
@@ -804,7 +785,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
acl = ForeignKey('Acl', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
aclDenyCount = BigIntCol(default=None)
@@ -827,7 +807,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('ClusterStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
broker = ForeignKey('Broker', cascade='null', default=None)
clusterName = StringCol(length=1000, default=None)
clusterID = StringCol(length=1000, default=None)
@@ -858,7 +837,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
cluster = ForeignKey('Cluster', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
@@ -880,7 +858,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('StoreStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
broker = ForeignKey('Broker', cascade='null', default=None)
location = StringCol(length=1000, default=None)
defaultInitialFileCount = IntCol(default=None)
@@ -899,7 +876,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
store = ForeignKey('Store', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
tplTransactionDepth = BigIntCol(default=None)
tplTransactionDepthLow = BigIntCol(default=None)
tplTransactionDepthHigh = BigIntCol(default=None)
@@ -930,7 +906,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('JournalStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
queue = ForeignKey('Queue', cascade='null', default=None)
name = StringCol(length=1000, default=None)
directory = StringCol(length=1000, default=None)
@@ -960,7 +935,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
journal = ForeignKey('Journal', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
recordDepth = BigIntCol(default=None)
recordDepthLow = BigIntCol(default=None)
recordDepthHigh = BigIntCol(default=None)
@@ -1011,7 +985,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SystemStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
systemId = BLOBCol(default=None)
osName = StringCol(length=1000, default=None)
nodeName = StringCol(length=1000, default=None)
@@ -1025,7 +998,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
system = ForeignKey('System', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
@@ -1047,7 +1019,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('BrokerStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
system = ForeignKey('System', cascade='null', default=None)
port = BigIntCol(default=None)
workerThreads = IntCol(default=None)
@@ -1109,7 +1080,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
broker = ForeignKey('Broker', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
uptime = BigIntCol(default=None)
@@ -1132,7 +1102,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('AgentStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
clientConnection = ForeignKey('ClientConnection', cascade='null', default=None)
label = StringCol(length=1000, default=None)
broker = ForeignKey('Broker', cascade='null', default=None)
@@ -1146,7 +1115,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
agent = ForeignKey('Agent', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
@@ -1168,7 +1136,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('VhostStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
broker = ForeignKey('Broker', cascade='null', default=None)
name = StringCol(length=1000, default=None)
federationTag = StringCol(length=1000, default=None)
@@ -1179,7 +1146,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
vhost = ForeignKey('Vhost', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
@@ -1201,7 +1167,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('QueueStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
name = StringCol(length=1000, default=None)
durable = BoolCol(default=None)
@@ -1224,7 +1189,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
queue = ForeignKey('Queue', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
msgTotalEnqueues = BigIntCol(default=None)
msgTotalDequeues = BigIntCol(default=None)
msgTxnEnqueues = BigIntCol(default=None)
@@ -1273,11 +1237,12 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('ExchangeStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
name = StringCol(length=1000, default=None)
type = StringCol(length=1000, default=None)
durable = BoolCol(default=None)
+ autoDelete = BoolCol(default=None)
+ exchange = ForeignKey('Exchange', cascade='null', default=None)
arguments = PickleCol(default=None)
@@ -1286,7 +1251,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
exchange = ForeignKey('Exchange', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
producerCount = BigIntCol(default=None)
producerCountLow = BigIntCol(default=None)
producerCountHigh = BigIntCol(default=None)
@@ -1320,7 +1284,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('BindingStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
exchange = ForeignKey('Exchange', cascade='null', default=None)
queue = ForeignKey('Queue', cascade='null', default=None)
bindingKey = StringCol(length=1000, default=None)
@@ -1333,7 +1296,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
binding = ForeignKey('Binding', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
msgMatched = BigIntCol(default=None)
@@ -1356,7 +1318,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('ClientConnectionStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
address = StringCol(length=1000, default=None)
incoming = BoolCol(default=None)
@@ -1379,7 +1340,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
clientConnection = ForeignKey('ClientConnection', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
closing = BoolCol(default=None)
framesFromClient = BigIntCol(default=None)
framesToClient = BigIntCol(default=None)
@@ -1406,7 +1366,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('LinkStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
host = StringCol(length=1000, default=None)
port = BigIntCol(default=None)
@@ -1452,7 +1411,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
link = ForeignKey('Link', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
state = StringCol(length=1000, default=None)
lastError = StringCol(length=1000, default=None)
@@ -1476,7 +1434,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('BridgeStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
link = ForeignKey('Link', cascade='null', default=None)
channelId = IntCol(default=None)
durable = BoolCol(default=None)
@@ -1502,7 +1459,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
bridge = ForeignKey('Bridge', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
@@ -1524,7 +1480,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SessionStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
vhost = ForeignKey('Vhost', cascade='null', default=None)
name = StringCol(length=1000, default=None)
channelId = IntCol(default=None)
@@ -1564,7 +1519,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
session = ForeignKey('Session', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
framesOutstanding = BigIntCol(default=None)
TxnStarts = BigIntCol(default=None)
TxnCommits = BigIntCol(default=None)
@@ -1592,7 +1546,6 @@
statsCurrIndex = DatabaseIndex(statsCurr)
statsPrev = ForeignKey('SysimageStats', cascade='null', default=None)
statsPrevIndex = DatabaseIndex(statsPrev)
- classInfos = dict() # brokerId => classInfo
uuid = BLOBCol(default=None)
osName = StringCol(length=1000, default=None)
nodeName = StringCol(length=1000, default=None)
@@ -1609,7 +1562,6 @@
lazyUpdate = True
qmfUpdateTime = TimestampCol(default=None)
sysimage = ForeignKey('Sysimage', cascade='null', default=None)
- classInfos = dict() # brokerId => classInfo
memFree = BigIntCol(default=None)
swapFree = BigIntCol(default=None)
loadAverage1Min = FloatCol(default=None)
@@ -1764,7 +1716,9 @@
Vhost.sqlmeta.addJoin(SQLMultipleJoin('Exchange', joinMethodName='exchanges'))
+Exchange.sqlmeta.addJoin(SQLMultipleJoin('Exchange', joinMethodName='exchanges'))
+
Exchange.sqlmeta.addJoin(SQLMultipleJoin('ExchangeStats', joinMethodName='stats'))
classToSchemaNameMap['Binding'] = 'Binding'
Modified: mgmt/trunk/mint/python/mint/schemaparser.py
===================================================================
--- mgmt/trunk/mint/python/mint/schemaparser.py 2009-09-03 15:45:27 UTC (rev 3615)
+++ mgmt/trunk/mint/python/mint/schemaparser.py 2009-09-03 16:04:50 UTC (rev 3616)
@@ -117,6 +117,8 @@
elemName = self.renameReservedWord(elem["@name"])
if (elem["@type"] == "objId"):
reference = elem["@references"]
+ if not reference:
+ raise Exception("Attribute of objId type is missing references value")
#XXX: TO-DO: properly handle namespaces
# handle cases where the referenced class is in a different namespace (ie, contains a "." or a ":");
# for now, discard namespace
@@ -176,8 +178,6 @@
self.generateForeignKeyAttribWithIndex("statsPrev", statsPythonName)
self.finalPythonOutput += "classToSchemaNameMap['%s'] = '%s'\n" % (pythonName, schemaName)
self.finalPythonOutput += "schemaNameToClassMap['%s'] = %s\n" % (schemaName, pythonName)
- # XXX get rid of this
- self.pythonOutput += " classInfos = dict() # brokerId => classInfo\n"
def generateMethod(self, elem):
if (elem["@desc"] != None):
Modified: mgmt/trunk/mint/sql/schema.sql
===================================================================
--- mgmt/trunk/mint/sql/schema.sql 2009-09-03 15:45:27 UTC (rev 3615)
+++ mgmt/trunk/mint/sql/schema.sql 2009-09-03 16:04:50 UTC (rev 3616)
@@ -10,20 +10,6 @@
);
CREATE UNIQUE INDEX broker_group_mapping_unique ON broker_group_mapping (broker_id, broker_group_id);
-CREATE TABLE broker_registration (
- id SERIAL PRIMARY KEY,
- name VARCHAR(1000) NOT NULL UNIQUE,
- url VARCHAR(1000),
- broker_id INT
-);
-CREATE UNIQUE INDEX broker_registration_url_unique ON broker_registration (url);
-
-CREATE TABLE collector_registration (
- id SERIAL PRIMARY KEY,
- name VARCHAR(1000),
- collector_id VARCHAR(1000)
-);
-
CREATE TABLE mint_info (
id SERIAL PRIMARY KEY,
version VARCHAR(1000) NOT NULL
@@ -130,8 +116,8 @@
origin VARCHAR(1000)
);
CREATE UNIQUE INDEX binding_qmfIdsUnique ON binding (qmf_broker_id, qmf_scope_id, qmf_object_id);
-CREATE INDEX binding_statsCurrIndex ON binding (stats_curr_id);
CREATE INDEX binding_statsPrevIndex ON binding (stats_prev_id);
+CREATE INDEX binding_statsCurrIndex ON binding (stats_curr_id);
CREATE TABLE binding_stats (
id SERIAL PRIMARY KEY,
@@ -197,8 +183,7 @@
staging_threshold BIGINT,
mgmt_pub_interval INT,
version VARCHAR(1000),
- data_dir VARCHAR(1000),
- registration_id INT
+ data_dir VARCHAR(1000)
);
CREATE UNIQUE INDEX broker_qmfIdsUnique ON broker (qmf_broker_id, qmf_scope_id, qmf_object_id);
CREATE INDEX broker_statsCurrIndex ON broker (stats_curr_id);
@@ -335,6 +320,8 @@
name VARCHAR(1000),
type VARCHAR(1000),
durable BOOL,
+ auto_delete BOOL,
+ exchange_id INT,
arguments BYTEA
);
CREATE UNIQUE INDEX exchange_qmfIdsUnique ON exchange (qmf_broker_id, qmf_scope_id, qmf_object_id);
@@ -381,8 +368,8 @@
grid_resource_unavailable_time TIMESTAMP
);
CREATE UNIQUE INDEX grid_qmfIdsUnique ON grid (qmf_broker_id, qmf_scope_id, qmf_object_id);
-CREATE INDEX grid_statsPrevIndex ON grid (stats_prev_id);
CREATE INDEX grid_statsCurrIndex ON grid (stats_curr_id);
+CREATE INDEX grid_statsPrevIndex ON grid (stats_prev_id);
CREATE TABLE grid_stats (
id SERIAL PRIMARY KEY,
@@ -796,7 +783,6 @@
disk BIGINT,
file_system_domain VARCHAR(1000),
global_job_id VARCHAR(1000),
- image_size BIGINT,
is_valid_checkpoint_platform VARCHAR(4000),
job_id VARCHAR(1000),
job_start TIMESTAMP,
@@ -853,6 +839,7 @@
console_idle BIGINT,
entered_current_activity TIMESTAMP,
entered_current_state TIMESTAMP,
+ image_size BIGINT,
keyboard_idle BIGINT,
last_benchmark TIMESTAMP,
last_fetch_work_completed TIMESTAMP,
@@ -982,8 +969,8 @@
schedd_name VARCHAR(1000)
);
CREATE UNIQUE INDEX submitter_qmfIdsUnique ON submitter (qmf_broker_id, qmf_scope_id, qmf_object_id);
-CREATE INDEX submitter_statsCurrIndex ON submitter (stats_curr_id);
CREATE INDEX submitter_statsPrevIndex ON submitter (stats_prev_id);
+CREATE INDEX submitter_statsCurrIndex ON submitter (stats_curr_id);
CREATE TABLE submitter_stats (
id SERIAL PRIMARY KEY,
@@ -1095,8 +1082,6 @@
ALTER TABLE broker_group_mapping ADD CONSTRAINT broker_group_id_exists FOREIGN KEY (broker_group_id) REFERENCES broker_group (id) ON DELETE CASCADE;
-ALTER TABLE broker_registration ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id) REFERENCES broker (id) ON DELETE SET NULL;
-
ALTER TABLE subject_role_mapping ADD CONSTRAINT subject_id_exists FOREIGN KEY (subject_id) REFERENCES subject (id) ON DELETE CASCADE;
ALTER TABLE subject_role_mapping ADD CONSTRAINT role_id_exists FOREIGN KEY (role_id) REFERENCES role (id) ON DELETE CASCADE;
@@ -1143,8 +1128,6 @@
ALTER TABLE broker ADD CONSTRAINT system_id_exists FOREIGN KEY (system_id) REFERENCES system (id) ON DELETE SET NULL;
-ALTER TABLE broker ADD CONSTRAINT registration_id_exists FOREIGN KEY (registration_id) REFERENCES broker_registration (id) ON DELETE SET NULL;
-
ALTER TABLE broker_stats ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id) REFERENCES broker (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;
@@ -1175,6 +1158,8 @@
ALTER TABLE exchange ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL;
+ALTER TABLE exchange ADD CONSTRAINT exchange_id_exists FOREIGN KEY (exchange_id) REFERENCES exchange (id) ON DELETE SET NULL;
+
ALTER TABLE exchange_stats ADD CONSTRAINT exchange_id_exists FOREIGN KEY (exchange_id) REFERENCES exchange (id) ON DELETE SET NULL;
ALTER TABLE grid ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES grid_stats (id) ON DELETE SET NULL;
More information about the rhmessaging-commits
mailing list