Author: nunofsantos Date: 2008-10-10 16:27:37 -0400 (Fri, 10 Oct 2008) New Revision: 2622 Modified: mgmt/trunk/mint/python/mint/schema.py mgmt/trunk/mint/python/mint/schemaparser.py mgmt/trunk/mint/sql/schema.sql Log: temporarily discard : from namespace Modified: mgmt/trunk/mint/python/mint/schema.py =================================================================== --- mgmt/trunk/mint/python/mint/schema.py 2008-10-10 18:32:04 UTC (rev 2621) +++ mgmt/trunk/mint/python/mint/schema.py 2008-10-10 20:27:37 UTC (rev 2622) @@ -153,10 +153,14 @@ Owner = StringCol(length=1000, default=None) ProcId = IntCol(default=None) QDate = TimestampCol(default=None) - Requirements = StringCol(length=4000, default=None) + JobUniverse = IntCol(default=None) Title = StringCol(length=1000, default=None) UserLog = StringCol(length=4000, default=None) HoldReason = StringCol(length=4000, default=None) + DAGNodeName = StringCol(length=1000, default=None) + DAGParentNodeNames = StringCol(length=4000, default=None) + DAGManJobId = IntCol(default=None) + Ad = PickleCol(default=None) def GetAd(self, model, callback, JobAd): @@ -742,7 +746,8 @@ label = StringCol(length=1000, default=None) broker = ForeignKey('Broker', cascade='null', default=None) systemId = BLOBCol(default=None) - objectIdBank = IntCol(default=None) + brokerBank = IntCol(default=None) + agentBank = IntCol(default=None) class AgentStats(SQLObject): @@ -1007,7 +1012,7 @@ conn.callMethod(originalId, classInfo, "close", callback, args=actualArgs) - def bridge(self, model, callback, durable, src, dest, key, tag, excludes, srcIsQueue, srcIsLocal): + def bridge(self, model, callback, durable, src, dest, key, tag, excludes, srcIsQueue, srcIsLocal, dynamic): """Bridge messages over the link""" actualArgs = dict() actualArgs["durable"] = durable @@ -1018,6 +1023,7 @@ actualArgs["excludes"] = excludes actualArgs["srcIsQueue"] = srcIsQueue actualArgs["srcIsLocal"] = srcIsLocal + actualArgs["dynamic"] = dynamic conn = model.connections[self.managedBroker] classInfo = self.classInfos[self.managedBroker] originalId = objectId(None, self.sourceScopeId, self.sourceObjectId) @@ -1060,6 +1066,7 @@ srcIsLocal = BoolCol(default=None) tag = StringCol(length=1000, default=None) excludes = StringCol(length=1000, default=None) + dynamic = BoolCol(default=None) def close(self, model, callback): @@ -1099,6 +1106,8 @@ channelId = SmallIntCol(default=None) clientConnection = ForeignKey('ClientConnection', cascade='null', default=None) detachedLifespan = IntCol(default=None) + attached = BoolCol(default=None) + expireTime = TimestampCol(default=None) def solicitAck(self, model, callback): @@ -1140,8 +1149,6 @@ recTime = TimestampCol(default=None) session = ForeignKey('Session', cascade='null', default=None) classInfos = dict() # brokerId => classInfo - attached = BoolCol(default=None) - expireTime = TimestampCol(default=None) framesOutstanding = IntCol(default=None) Modified: mgmt/trunk/mint/python/mint/schemaparser.py =================================================================== --- mgmt/trunk/mint/python/mint/schemaparser.py 2008-10-10 18:32:04 UTC (rev 2621) +++ mgmt/trunk/mint/python/mint/schemaparser.py 2008-10-10 20:27:37 UTC (rev 2622) @@ -94,9 +94,9 @@ if (elem["@type"] == "objId"): reference = elem["@references"] #XXX: TO-DO: properly handle namespaces - # handle cases where the referenced class is in a different namespace (ie, contains a "."); + # handle cases where the referenced class is in a different namespace (ie, contains a "." or a ":"); # for now, discard namespace - namespaceIndex = reference.rfind(".") + namespaceIndex = max(reference.rfind("."), reference.rfind(":")) if (namespaceIndex > 0): reference = reference[namespaceIndex + 1:] reference = self.style.dbTableToPythonClass(reference) Modified: mgmt/trunk/mint/sql/schema.sql =================================================================== --- mgmt/trunk/mint/sql/schema.sql 2008-10-10 18:32:04 UTC (rev 2621) +++ mgmt/trunk/mint/sql/schema.sql 2008-10-10 20:27:37 UTC (rev 2622) @@ -108,7 +108,8 @@ label VARCHAR(1000), broker_id INT, system_id BYTEA, - object_id_bank INT + broker_bank INT, + agent_bank INT ); CREATE TABLE agent_stats ( @@ -159,7 +160,8 @@ src_is_queue BOOL, src_is_local BOOL, tag VARCHAR(1000), - excludes VARCHAR(1000) + excludes VARCHAR(1000), + dynamic BOOL ); CREATE TABLE bridge_stats ( @@ -335,10 +337,14 @@ owner VARCHAR(1000), proc_id INT, q_date TIMESTAMP, - requirements VARCHAR(4000), + job_universe INT, title VARCHAR(1000), user_log VARCHAR(4000), - hold_reason VARCHAR(4000) + hold_reason VARCHAR(4000), + dag_node_name VARCHAR(1000), + dag_parent_node_names VARCHAR(4000), + dag_man_job_id INT, + ad BYTEA ); CREATE TABLE job_stats ( @@ -571,15 +577,15 @@ name VARCHAR(1000), channel_id SMALLINT, client_connection_id INT, - detached_lifespan INT + detached_lifespan INT, + attached BOOL, + expire_time TIMESTAMP ); CREATE TABLE session_stats ( id SERIAL PRIMARY KEY, rec_time TIMESTAMP, session_id INT, - attached BOOL, - expire_time TIMESTAMP, frames_outstanding INT );