Author: justi9 Date: 2010-01-06 15:32:23 -0500 (Wed, 06 Jan 2010) New Revision: 3762 Modified: mgmt/trunk/mint/python/mint/model.py mgmt/trunk/mint/python/mint/schema.py mgmt/trunk/mint/python/mint/schemaparser.py mgmt/trunk/mint/sql/schema.sql Log: Remove length limits from string columns; make qmf id fields and timestamps not null where appropriate Modified: mgmt/trunk/mint/python/mint/model.py =================================================================== --- mgmt/trunk/mint/python/mint/model.py 2010-01-06 20:18:27 UTC (rev 3761) +++ mgmt/trunk/mint/python/mint/model.py 2010-01-06 20:32:23 UTC (rev 3762) @@ -27,8 +27,8 @@ class sqlmeta: lazyUpdate = True - name = StringCol(length=1000, default=None, unique=True, notNone=True) - password = StringCol(length=1000, default=None) + name = StringCol(unique=True, notNone=True) + password = StringCol() lastChallenged = TimestampCol(default=None) lastLoggedIn = TimestampCol(default=None) lastLoggedOut = TimestampCol(default=None) @@ -47,7 +47,7 @@ class sqlmeta: lazyUpdate = True - name = StringCol(length=1000, default=None, unique=True, notNone=True) + name = StringCol(unique=True, notNone=True) subjects = SQLRelatedJoin("Subject", intermediateTable="subject_role_mapping", createRelatedTable=False) @@ -75,13 +75,13 @@ class sqlmeta: lazyUpdate = True - version = StringCol(length=1000, default="0.1", notNone=True) + version = StringCol(default="0.1", notNone=True) class BrokerGroup(SQLObject): class sqlmeta: lazyUpdate = True - name = StringCol(length=1000, default=None, unique=True, notNone=True) + name = StringCol(unique=True, notNone=True) brokers = SQLRelatedJoin("Broker", intermediateTable="broker_group_mapping", createRelatedTable=False) Modified: mgmt/trunk/mint/python/mint/schema.py =================================================================== --- mgmt/trunk/mint/python/mint/schema.py 2010-01-06 20:18:27 UTC (rev 3761) +++ mgmt/trunk/mint/python/mint/schema.py 2010-01-06 20:32:23 UTC (rev 3762) @@ -6,59 +6,59 @@ class Pool(SQLObject): class sqlmeta: lazyUpdate = True - sourceId = StringCol(length=1000, default=None, unique=True) + sourceId = StringCol(default=None, unique=True) class Slot(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('SlotStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('SlotStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) - Pool = StringCol(length=1000, default=None) - System = StringCol(length=1000, default=None) - AccountingGroup = StringCol(length=1000, default=None) - Arch = StringCol(length=1000, default=None) - CheckpointPlatform = StringCol(length=1000, default=None) - ClientMachine = StringCol(length=1000, default=None) - ConcurrencyLimits = StringCol(length=1000, default=None) + Pool = StringCol(default=None) + System = StringCol(default=None) + AccountingGroup = StringCol(default=None) + Arch = StringCol(default=None) + CheckpointPlatform = StringCol(default=None) + ClientMachine = StringCol(default=None) + ConcurrencyLimits = StringCol(default=None) Cpus = BigIntCol(default=None) CurrentRank = FloatCol(default=None) Disk = BigIntCol(default=None) - FileSystemDomain = StringCol(length=1000, default=None) - GlobalJobId = StringCol(length=1000, default=None) - IsValidCheckpointPlatform = StringCol(length=4000, default=None) - JobId = StringCol(length=1000, default=None) + FileSystemDomain = StringCol(default=None) + GlobalJobId = StringCol(default=None) + IsValidCheckpointPlatform = StringCol(default=None) + JobId = StringCol(default=None) JobStart = TimestampCol(default=None) KFlops = BigIntCol(default=None) - Machine = StringCol(length=1000, default=None) - MaxJobRetirementTime = StringCol(length=4000, default=None) + Machine = StringCol(default=None) + MaxJobRetirementTime = StringCol(default=None) Memory = BigIntCol(default=None) Mips = BigIntCol(default=None) - MyAddress = StringCol(length=1000, default=None) - Name = StringCol(length=1000, default=None) - OpSys = StringCol(length=1000, default=None) - PreemptingConcurrencyLimits = StringCol(length=1000, default=None) - PreemptingOwner = StringCol(length=1000, default=None) - PreemptingUser = StringCol(length=1000, default=None) + MyAddress = StringCol(default=None) + Name = StringCol(default=None) + OpSys = StringCol(default=None) + PreemptingConcurrencyLimits = StringCol(default=None) + PreemptingOwner = StringCol(default=None) + PreemptingUser = StringCol(default=None) PreemptingRank = FloatCol(default=None) - RemoteOwner = StringCol(length=1000, default=None) - RemoteUser = StringCol(length=1000, default=None) - Requirements = StringCol(length=4000, default=None) - PublicNetworkIpAddr = StringCol(length=1000, default=None) - Rank = StringCol(length=4000, default=None) + RemoteOwner = StringCol(default=None) + RemoteUser = StringCol(default=None) + Requirements = StringCol(default=None) + PublicNetworkIpAddr = StringCol(default=None) + Rank = StringCol(default=None) SlotID = BigIntCol(default=None) - Start = StringCol(length=4000, default=None) - StarterAbilityList = StringCol(length=4000, default=None) + Start = StringCol(default=None) + StarterAbilityList = StringCol(default=None) TotalClaimRunTime = BigIntCol(default=None) TotalClaimSuspendTime = BigIntCol(default=None) TotalCpus = BigIntCol(default=None) @@ -68,23 +68,23 @@ TotalMemory = BigIntCol(default=None) TotalSlots = BigIntCol(default=None) TotalVirtualMemory = BigIntCol(default=None) - UidDomain = StringCol(length=1000, default=None) + UidDomain = StringCol(default=None) VirtualMemory = BigIntCol(default=None) WindowsBuildNumber = BigIntCol(default=None) WindowsMajorVersion = BigIntCol(default=None) WindowsMinorVersion = BigIntCol(default=None) - CondorPlatform = StringCol(length=1000, default=None) - CondorVersion = StringCol(length=1000, default=None) + CondorPlatform = StringCol(default=None) + CondorVersion = StringCol(default=None) DaemonStartTime = TimestampCol(default=None) class SlotStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) slot = ForeignKey('Slot', cascade='null', default=None) - Activity = StringCol(length=1000, default=None) + Activity = StringCol(default=None) ClockDay = BigIntCol(default=None) ClockMin = BigIntCol(default=None) CondorLoadAvg = FloatCol(default=None) @@ -100,7 +100,7 @@ LoadAvg = FloatCol(default=None) MyCurrentTime = TimestampCol(default=None) NextFetchWorkDelay = IntCol(default=None) - State = StringCol(length=1000, default=None) + State = StringCol(default=None) TimeToLive = BigIntCol(default=None) TotalCondorLoadAvg = FloatCol(default=None) TotalLoadAvg = FloatCol(default=None) @@ -131,29 +131,29 @@ class Scheduler(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('SchedulerStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('SchedulerStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) - Pool = StringCol(length=1000, default=None) - System = StringCol(length=1000, default=None) + Pool = StringCol(default=None) + System = StringCol(default=None) JobQueueBirthdate = TimestampCol(default=None) MaxJobsRunning = BigIntCol(default=None) - Machine = StringCol(length=1000, default=None) - MyAddress = StringCol(length=1000, default=None) - Name = StringCol(length=1000, default=None) - PublicNetworkIpAddr = StringCol(length=1000, default=None) + Machine = StringCol(default=None) + MyAddress = StringCol(default=None) + Name = StringCol(default=None) + PublicNetworkIpAddr = StringCol(default=None) - CondorPlatform = StringCol(length=1000, default=None) - CondorVersion = StringCol(length=1000, default=None) + CondorPlatform = StringCol(default=None) + CondorVersion = StringCol(default=None) DaemonStartTime = TimestampCol(default=None) @@ -250,7 +250,7 @@ class SchedulerStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) scheduler = ForeignKey('Scheduler', cascade='null', default=None) NumUsers = BigIntCol(default=None) TotalHeldJobs = BigIntCol(default=None) @@ -272,13 +272,13 @@ class Submitter(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('SubmitterStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) @@ -286,15 +286,15 @@ statsPrevIndex = DatabaseIndex(statsPrev) scheduler = ForeignKey('Scheduler', cascade='null', default=None) JobQueueBirthdate = TimestampCol(default=None) - Machine = StringCol(length=1000, default=None) - Name = StringCol(length=1000, default=None) - ScheddName = StringCol(length=1000, default=None) + Machine = StringCol(default=None) + Name = StringCol(default=None) + ScheddName = StringCol(default=None) class SubmitterStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) submitter = ForeignKey('Submitter', cascade='null', default=None) HeldJobs = BigIntCol(default=None) IdleJobs = BigIntCol(default=None) @@ -306,26 +306,26 @@ class Negotiator(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('NegotiatorStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('NegotiatorStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) - Pool = StringCol(length=1000, default=None) - System = StringCol(length=1000, default=None) - Name = StringCol(length=1000, default=None) - Machine = StringCol(length=1000, default=None) - MyAddress = StringCol(length=1000, default=None) + Pool = StringCol(default=None) + System = StringCol(default=None) + Name = StringCol(default=None) + Machine = StringCol(default=None) + MyAddress = StringCol(default=None) - CondorPlatform = StringCol(length=1000, default=None) - CondorVersion = StringCol(length=1000, default=None) + CondorPlatform = StringCol(default=None) + CondorVersion = StringCol(default=None) DaemonStartTime = TimestampCol(default=None) @@ -398,7 +398,7 @@ class NegotiatorStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) negotiator = ForeignKey('Negotiator', cascade='null', default=None) MonitorSelfAge = BigIntCol(default=None) @@ -414,30 +414,30 @@ class Collector(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('CollectorStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('CollectorStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) - Pool = StringCol(length=1000, default=None) - System = StringCol(length=1000, default=None) - CondorPlatform = StringCol(length=1000, default=None) - CondorVersion = StringCol(length=1000, default=None) - Name = StringCol(length=1000, default=None) - PublicNetworkIpAddr = StringCol(length=1000, default=None) + Pool = StringCol(default=None) + System = StringCol(default=None) + CondorPlatform = StringCol(default=None) + CondorVersion = StringCol(default=None) + Name = StringCol(default=None) + PublicNetworkIpAddr = StringCol(default=None) class CollectorStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) collector = ForeignKey('Collector', cascade='null', default=None) RunningJobs = BigIntCol(default=None) IdleJobs = BigIntCol(default=None) @@ -452,28 +452,28 @@ class Master(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('MasterStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('MasterStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) - Pool = StringCol(length=1000, default=None) - System = StringCol(length=1000, default=None) - Name = StringCol(length=1000, default=None) - Machine = StringCol(length=1000, default=None) - PublicNetworkIpAddr = StringCol(length=1000, default=None) - MyAddress = StringCol(length=1000, default=None) + Pool = StringCol(default=None) + System = StringCol(default=None) + Name = StringCol(default=None) + Machine = StringCol(default=None) + PublicNetworkIpAddr = StringCol(default=None) + MyAddress = StringCol(default=None) RealUid = IntCol(default=None) - CondorPlatform = StringCol(length=1000, default=None) - CondorVersion = StringCol(length=1000, default=None) + CondorPlatform = StringCol(default=None) + CondorVersion = StringCol(default=None) DaemonStartTime = TimestampCol(default=None) @@ -492,7 +492,7 @@ class MasterStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) master = ForeignKey('Master', cascade='null', default=None) MonitorSelfAge = BigIntCol(default=None) @@ -508,22 +508,22 @@ class Grid(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('GridStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('GridStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) - Pool = StringCol(length=1000, default=None) - Name = StringCol(length=1000, default=None) - ScheddName = StringCol(length=1000, default=None) - Owner = StringCol(length=1000, default=None) + Pool = StringCol(default=None) + Name = StringCol(default=None) + ScheddName = StringCol(default=None) + Owner = StringCol(default=None) JobLimit = BigIntCol(default=None) SubmitLimit = BigIntCol(default=None) GridResourceUnavailableTime = TimestampCol(default=None) @@ -532,7 +532,7 @@ class GridStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) grid = ForeignKey('Grid', cascade='null', default=None) NumJobs = BigIntCol(default=None) SubmitsInProgress = BigIntCol(default=None) @@ -548,27 +548,27 @@ class Submission(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('SubmissionStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('SubmissionStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) scheduler = ForeignKey('Scheduler', cascade='null', default=None) - Name = StringCol(length=1000, default=None) - Owner = StringCol(length=1000, default=None) + Name = StringCol(default=None) + Owner = StringCol(default=None) class SubmissionStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) submission = ForeignKey('Submission', cascade='null', default=None) Idle = BigIntCol(default=None) Running = BigIntCol(default=None) @@ -582,20 +582,20 @@ class Acl(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('AclStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('AclStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) broker = ForeignKey('Broker', cascade='null', default=None) - policyFile = StringCol(length=1000, default=None) + policyFile = StringCol(default=None) enforcingAcl = BoolCol(default=None) transferAcl = BoolCol(default=None) lastAclLoad = TimestampCol(default=None) @@ -609,7 +609,7 @@ class AclStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) acl = ForeignKey('Acl', cascade='null', default=None) aclDenyCount = BigIntCol(default=None) @@ -619,27 +619,27 @@ class Cluster(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('ClusterStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('ClusterStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) broker = ForeignKey('Broker', cascade='null', default=None) - clusterName = StringCol(length=1000, default=None) - clusterID = StringCol(length=1000, default=None) - memberID = StringCol(length=1000, default=None) - publishedURL = StringCol(length=1000, default=None) + clusterName = StringCol(default=None) + clusterID = StringCol(default=None) + memberID = StringCol(default=None) + publishedURL = StringCol(default=None) clusterSize = IntCol(default=None) - status = StringCol(length=1000, default=None) - members = StringCol(length=4000, default=None) - memberIDs = StringCol(length=4000, default=None) + status = StringCol(default=None) + members = StringCol(default=None) + memberIDs = StringCol(default=None) def stopClusterNode(self, model, callback, brokerId): @@ -655,7 +655,7 @@ class ClusterStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) cluster = ForeignKey('Cluster', cascade='null', default=None) @@ -664,24 +664,24 @@ class Store(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('StoreStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('StoreStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) broker = ForeignKey('Broker', cascade='null', default=None) - location = StringCol(length=1000, default=None) + location = StringCol(default=None) defaultInitialFileCount = IntCol(default=None) defaultDataFileSize = BigIntCol(default=None) tplIsInitialized = BoolCol(default=None) - tplDirectory = StringCol(length=1000, default=None) + tplDirectory = StringCol(default=None) tplWritePageSize = BigIntCol(default=None) tplWritePages = BigIntCol(default=None) tplInitialFileCount = IntCol(default=None) @@ -692,7 +692,7 @@ class StoreStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) store = ForeignKey('Store', cascade='null', default=None) tplTransactionDepth = BigIntCol(default=None) tplTransactionDepthLow = BigIntCol(default=None) @@ -710,22 +710,22 @@ class Journal(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('JournalStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('JournalStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) queue = ForeignKey('Queue', cascade='null', default=None) - name = StringCol(length=1000, default=None) - directory = StringCol(length=1000, default=None) - baseFileName = StringCol(length=1000, default=None) + name = StringCol(default=None) + directory = StringCol(default=None) + baseFileName = StringCol(default=None) writePageSize = BigIntCol(default=None) writePages = BigIntCol(default=None) readPageSize = BigIntCol(default=None) @@ -747,7 +747,7 @@ class JournalStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) journal = ForeignKey('Journal', cascade='null', default=None) recordDepth = BigIntCol(default=None) recordDepthLow = BigIntCol(default=None) @@ -785,30 +785,30 @@ class System(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('SystemStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('SystemStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) systemId = BLOBCol(default=None) - osName = StringCol(length=1000, default=None) - nodeName = StringCol(length=1000, default=None) - release = StringCol(length=1000, default=None) - version = StringCol(length=1000, default=None) - machine = StringCol(length=1000, default=None) + osName = StringCol(default=None) + nodeName = StringCol(default=None) + release = StringCol(default=None) + version = StringCol(default=None) + machine = StringCol(default=None) class SystemStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) system = ForeignKey('System', cascade='null', default=None) @@ -817,13 +817,13 @@ class Broker(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('BrokerStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) @@ -836,8 +836,8 @@ connBacklog = IntCol(default=None) stagingThreshold = BigIntCol(default=None) mgmtPubInterval = IntCol(default=None) - version = StringCol(length=1000, default=None) - dataDir = StringCol(length=1000, default=None) + version = StringCol(default=None) + dataDir = StringCol(default=None) def echo(self, model, callback, sequence, body): @@ -882,7 +882,7 @@ class BrokerStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) broker = ForeignKey('Broker', cascade='null', default=None) uptime = BigIntCol(default=None) @@ -892,20 +892,20 @@ class Agent(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('AgentStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('AgentStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) clientConnection = ForeignKey('ClientConnection', cascade='null', default=None) - label = StringCol(length=1000, default=None) + label = StringCol(default=None) broker = ForeignKey('Broker', cascade='null', default=None) systemId = BLOBCol(default=None) brokerBank = BigIntCol(default=None) @@ -915,7 +915,7 @@ class AgentStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) agent = ForeignKey('Agent', cascade='null', default=None) @@ -924,27 +924,27 @@ class Vhost(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('VhostStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('VhostStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) broker = ForeignKey('Broker', cascade='null', default=None) - name = StringCol(length=1000, default=None) - federationTag = StringCol(length=1000, default=None) + name = StringCol(default=None) + federationTag = StringCol(default=None) class VhostStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) vhost = ForeignKey('Vhost', cascade='null', default=None) @@ -953,20 +953,20 @@ class Queue(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('QueueStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('QueueStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) vhost = ForeignKey('Vhost', cascade='null', default=None) - name = StringCol(length=1000, default=None) + name = StringCol(default=None) durable = BoolCol(default=None) autoDelete = BoolCol(default=None) exclusive = BoolCol(default=None) @@ -984,7 +984,7 @@ class QueueStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) queue = ForeignKey('Queue', cascade='null', default=None) msgTotalEnqueues = BigIntCol(default=None) msgTotalDequeues = BigIntCol(default=None) @@ -1020,21 +1020,21 @@ class Exchange(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('ExchangeStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('ExchangeStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) vhost = ForeignKey('Vhost', cascade='null', default=None) - name = StringCol(length=1000, default=None) - type = StringCol(length=1000, default=None) + name = StringCol(default=None) + type = StringCol(default=None) durable = BoolCol(default=None) autoDelete = BoolCol(default=None) exchange = ForeignKey('Exchange', cascade='null', default=None) @@ -1044,7 +1044,7 @@ class ExchangeStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) exchange = ForeignKey('Exchange', cascade='null', default=None) producerCount = BigIntCol(default=None) producerCountLow = BigIntCol(default=None) @@ -1065,13 +1065,13 @@ class Binding(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('BindingStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) @@ -1079,15 +1079,15 @@ statsPrevIndex = DatabaseIndex(statsPrev) exchange = ForeignKey('Exchange', cascade='null', default=None) queue = ForeignKey('Queue', cascade='null', default=None) - bindingKey = StringCol(length=1000, default=None) + bindingKey = StringCol(default=None) arguments = PickleCol(default=None) - origin = StringCol(length=1000, default=None) + origin = StringCol(default=None) class BindingStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) binding = ForeignKey('Binding', cascade='null', default=None) msgMatched = BigIntCol(default=None) @@ -1097,13 +1097,13 @@ class Subscription(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('SubscriptionStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) @@ -1111,18 +1111,18 @@ statsPrevIndex = DatabaseIndex(statsPrev) session = ForeignKey('Session', cascade='null', default=None) queue = ForeignKey('Queue', cascade='null', default=None) - name = StringCol(length=1000, default=None) + name = StringCol(default=None) browsing = BoolCol(default=None) acknowledged = BoolCol(default=None) exclusive = BoolCol(default=None) - creditMode = StringCol(length=1000, default=None) + creditMode = StringCol(default=None) arguments = PickleCol(default=None) class SubscriptionStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) subscription = ForeignKey('Subscription', cascade='null', default=None) delivered = BigIntCol(default=None) @@ -1132,25 +1132,25 @@ class ClientConnection(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('ClientConnectionStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('ClientConnectionStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) vhost = ForeignKey('Vhost', cascade='null', default=None) - address = StringCol(length=1000, default=None) + address = StringCol(default=None) incoming = BoolCol(default=None) SystemConnection = BoolCol(default=None) federationLink = BoolCol(default=None) - authIdentity = StringCol(length=1000, default=None) - remoteProcessName = StringCol(length=1000, default=None) + authIdentity = StringCol(default=None) + remoteProcessName = StringCol(default=None) remotePid = BigIntCol(default=None) remoteParentPid = BigIntCol(default=None) @@ -1162,7 +1162,7 @@ class ClientConnectionStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) clientConnection = ForeignKey('ClientConnection', cascade='null', default=None) closing = BoolCol(default=None) framesFromClient = BigIntCol(default=None) @@ -1176,22 +1176,22 @@ class Link(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('LinkStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('LinkStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) vhost = ForeignKey('Vhost', cascade='null', default=None) - host = StringCol(length=1000, default=None) + host = StringCol(default=None) port = BigIntCol(default=None) - transport = StringCol(length=1000, default=None) + transport = StringCol(default=None) durable = BoolCol(default=None) @@ -1227,10 +1227,10 @@ class LinkStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) link = ForeignKey('Link', cascade='null', default=None) - state = StringCol(length=1000, default=None) - lastError = StringCol(length=1000, default=None) + state = StringCol(default=None) + lastError = StringCol(default=None) @@ -1238,13 +1238,13 @@ class Bridge(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('BridgeStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) @@ -1253,13 +1253,13 @@ link = ForeignKey('Link', cascade='null', default=None) channelId = IntCol(default=None) durable = BoolCol(default=None) - src = StringCol(length=1000, default=None) - dest = StringCol(length=1000, default=None) - key = StringCol(length=1000, default=None) + src = StringCol(default=None) + dest = StringCol(default=None) + key = StringCol(default=None) srcIsQueue = BoolCol(default=None) srcIsLocal = BoolCol(default=None) - tag = StringCol(length=1000, default=None) - excludes = StringCol(length=1000, default=None) + tag = StringCol(default=None) + excludes = StringCol(default=None) dynamic = BoolCol(default=None) syncRsv = IntCol(default=None) @@ -1271,7 +1271,7 @@ class BridgeStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) bridge = ForeignKey('Bridge', cascade='null', default=None) @@ -1280,20 +1280,20 @@ class Session(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('SessionStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('SessionStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) vhost = ForeignKey('Vhost', cascade='null', default=None) - name = StringCol(length=1000, default=None) + name = StringCol(default=None) channelId = IntCol(default=None) clientConnection = ForeignKey('ClientConnection', cascade='null', default=None) detachedLifespan = BigIntCol(default=None) @@ -1321,7 +1321,7 @@ class SessionStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) session = ForeignKey('Session', cascade='null', default=None) framesOutstanding = BigIntCol(default=None) TxnStarts = BigIntCol(default=None) @@ -1336,25 +1336,25 @@ class Sysimage(SQLObject): class sqlmeta: lazyUpdate = True - qmfAgentId = StringCol(length=1000, default=None) - qmfObjectId = StringCol(length=1000, default=None) + qmfAgentId = StringCol(notNone=True, default=None) + qmfObjectId = StringCol(notNone=True, default=None) qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True) - qmfClassKey = StringCol(length=1000, default=None) - qmfPersistent = BoolCol(default=None) - qmfUpdateTime = TimestampCol(default=None) - qmfCreateTime = TimestampCol(default=None) + qmfClassKey = StringCol(notNone=True, default=None) + qmfPersistent = BoolCol(notNone=True, default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) + qmfCreateTime = TimestampCol(notNone=True, default=None) qmfDeleteTime = TimestampCol(default=None) statsCurr = ForeignKey('SysimageStats', cascade='null', default=None) statsCurrIndex = DatabaseIndex(statsCurr) statsPrev = ForeignKey('SysimageStats', cascade='null', default=None) statsPrevIndex = DatabaseIndex(statsPrev) uuid = BLOBCol(default=None) - osName = StringCol(length=1000, default=None) - nodeName = StringCol(length=1000, default=None) - release = StringCol(length=1000, default=None) - version = StringCol(length=1000, default=None) - machine = StringCol(length=1000, default=None) - distro = StringCol(length=1000, default=None) + osName = StringCol(default=None) + nodeName = StringCol(default=None) + release = StringCol(default=None) + version = StringCol(default=None) + machine = StringCol(default=None) + distro = StringCol(default=None) memTotal = BigIntCol(default=None) swapTotal = BigIntCol(default=None) @@ -1362,7 +1362,7 @@ class SysimageStats(SQLObject): class sqlmeta: lazyUpdate = True - qmfUpdateTime = TimestampCol(default=None) + qmfUpdateTime = TimestampCol(notNone=True, default=None) sysimage = ForeignKey('Sysimage', cascade='null', default=None) memFree = BigIntCol(default=None) swapFree = BigIntCol(default=None) Modified: mgmt/trunk/mint/python/mint/schemaparser.py =================================================================== --- mgmt/trunk/mint/python/mint/schemaparser.py 2010-01-06 20:18:27 UTC (rev 3761) +++ mgmt/trunk/mint/python/mint/schemaparser.py 2010-01-06 20:32:23 UTC (rev 3762) @@ -67,8 +67,8 @@ attribType = self.dataTypesMap["uint32"] self.pythonOutput += " %s = %s(%s)\n" % (attribName, attribType, params) - def generateTimestampAttrib(self, col): - self.generateAttrib("qmf" + col + "Time", "TimestampCol") #, "default=datetime.min") + def generateTimestampAttrib(self, col, args=""): + self.generateAttrib("qmf" + col + "Time", "TimestampCol", args) #, "default=datetime.min") def generateForeignKeyAttrib(self, name, reference): params = "'%s', cascade='null'" % (reference) @@ -98,14 +98,14 @@ def generateLazyUpdate(self, lazyUpdate=True): self.pythonOutput += " class sqlmeta:\n" - self.pythonOutput += " lazyUpdate = %s\n" % (lazyUpdate) + self.pythonOutput += " lazyUpdate = %s\n" % lazyUpdate def generateQmfIdsIndex(self): - self.generateAttrib("qmfAgentId", "StringCol", "length=1000") - self.generateAttrib("qmfObjectId", "StringCol", "length=1000") + self.generateAttrib("qmfAgentId", "StringCol", "notNone=True") + self.generateAttrib("qmfObjectId", "StringCol", "notNone=True") self.pythonOutput += " qmfIdsUnique = DatabaseIndex(qmfAgentId, qmfObjectId, unique=True)\n" - self.generateAttrib("qmfClassKey", "StringCol", "length=1000") - self.generateAttrib("qmfPersistent", "BoolCol") + self.generateAttrib("qmfClassKey", "StringCol", "notNone=True") + self.generateAttrib("qmfPersistent", "BoolCol", "notNone=True") def generateClassAttribs(self, schemaName, elements): if (schemaName == "JournalStats"): @@ -132,12 +132,7 @@ elif (elem[&quot;(a)type&quot;].startswith(&quot;mma&quot;)): self.generateMinMaxAvgAttrib(self.attrNameFromDbColumn(elemName), self.dataTypesMap[elem["@type"]]) else: - args = "" - if (elem["@type"] == "sstr"): - args += "length=1000" - elif (elem["@type"] == "lstr" or elem["@type"] == "ftable"): - args += "length=4000" - self.generateAttrib(self.attrNameFromDbColumn(elemName), self.dataTypesMap[elem["@type"]], args) + self.generateAttrib(self.attrNameFromDbColumn(elemName), self.dataTypesMap[elem["@type"]]) self.pythonOutput += "\n" def startClass(self, schemaName, stats=False): @@ -162,14 +157,14 @@ self.generateLazyUpdate() if (stats): self.statsClasses.append(str(pythonName)) - self.generateTimestampAttrib("Update") + self.generateTimestampAttrib("Update", "notNone=True") self.generateForeignKeyAttrib(colPythonName[0].lower() + colPythonName[1:], keyPythonName) self.generateMultipleJoin(origPythonName, pythonName, "stats") else: self.entityClasses.append(str(pythonName)) self.generateQmfIdsIndex() - self.generateTimestampAttrib("Update") - self.generateTimestampAttrib("Create") + self.generateTimestampAttrib("Update", "notNone=True") + self.generateTimestampAttrib("Create", "notNone=True") self.generateTimestampAttrib("Delete") self.generateForeignKeyAttribWithIndex("statsCurr", statsPythonName) self.generateForeignKeyAttribWithIndex("statsPrev", statsPythonName) @@ -214,7 +209,7 @@ self.pythonOutput += "class Pool(SQLObject):\n" self.pythonOutput += " class sqlmeta:\n" self.pythonOutput += " lazyUpdate = True\n" - self.pythonOutput += " sourceId = StringCol(length=1000, default=None, unique=True)\n\n" + self.pythonOutput += " sourceId = StringCol(default=None, unique=True)\n\n" self.finalPythonOutput += "\nclassToSchemaNameMap = dict()\n" self.finalPythonOutput += "schemaNameToClassMap = dict()\n" self.finalPythonOutput += 'schemaReservedWordsMap = {"in": "inRsv", "In": "InRsv", \n' @@ -292,7 +287,8 @@ import sys if len(sys.argv) < 3: - print "Usage: schemaparser.py OUTPUT-PYTHON-FILE OUTPUT-SQL-TRIGGERS-FILE INPUT-XML-SCHEMA [INPUT-XML-SCHEMA]*" + print "Usage: schemaparser.py OUTPUT-PYTHON-FILE ", + print "OUTPUT-SQL-TRIGGERS-FILE INPUT-XML-SCHEMA [INPUT-XML-SCHEMA]*" sys.exit(1) else: parser = SchemaParser(sys.argv[1], sys.argv[2], sys.argv[3:]) Modified: mgmt/trunk/mint/sql/schema.sql =================================================================== --- mgmt/trunk/mint/sql/schema.sql 2010-01-06 20:18:27 UTC (rev 3761) +++ mgmt/trunk/mint/sql/schema.sql 2010-01-06 20:32:23 UTC (rev 3762) @@ -1,6 +1,6 @@ CREATE TABLE broker_group ( id SERIAL PRIMARY KEY, - name VARCHAR(1000) NOT NULL UNIQUE + name TEXT NOT NULL UNIQUE ); CREATE TABLE broker_group_mapping ( @@ -12,18 +12,18 @@ CREATE TABLE mint_info ( id SERIAL PRIMARY KEY, - version VARCHAR(1000) NOT NULL + version TEXT NOT NULL ); CREATE TABLE role ( id SERIAL PRIMARY KEY, - name VARCHAR(1000) NOT NULL UNIQUE + name TEXT NOT NULL UNIQUE ); CREATE TABLE subject ( id SERIAL PRIMARY KEY, - name VARCHAR(1000) NOT NULL UNIQUE, - password VARCHAR(1000), + name TEXT NOT NULL UNIQUE, + password TEXT, last_challenged TIMESTAMP, last_logged_in TIMESTAMP, last_logged_out TIMESTAMP @@ -38,17 +38,17 @@ CREATE TABLE acl ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, broker_id INT, - policy_file VARCHAR(1000), + policy_file TEXT, enforcing_acl BOOL, transfer_acl BOOL, last_acl_load TIMESTAMP @@ -59,24 +59,24 @@ CREATE TABLE acl_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, acl_id INT, acl_deny_count BIGINT ); CREATE TABLE agent ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, client_connection_id INT, - label VARCHAR(1000), + label TEXT, broker_id INT, system_id BYTEA, broker_bank BIGINT, @@ -88,26 +88,26 @@ CREATE TABLE agent_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, agent_id INT ); CREATE TABLE binding ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, exchange_id INT, queue_id INT, - binding_key VARCHAR(1000), + binding_key TEXT, arguments BYTEA, - origin VARCHAR(1000) + origin TEXT ); CREATE UNIQUE INDEX binding_qmfIdsUnique ON binding (qmf_agent_id, qmf_object_id); CREATE INDEX binding_statsPrevIndex ON binding (stats_prev_id); @@ -115,32 +115,32 @@ CREATE TABLE binding_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, binding_id INT, msg_matched BIGINT ); CREATE TABLE bridge ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, link_id INT, channel_id INT, durable BOOL, - src VARCHAR(1000), - dest VARCHAR(1000), - key VARCHAR(1000), + src TEXT, + dest TEXT, + key TEXT, src_is_queue BOOL, src_is_local BOOL, - tag VARCHAR(1000), - excludes VARCHAR(1000), + tag TEXT, + excludes TEXT, dynamic BOOL, sync_rsv INT ); @@ -150,18 +150,18 @@ CREATE TABLE bridge_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, bridge_id INT ); CREATE TABLE broker ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, @@ -172,8 +172,8 @@ conn_backlog INT, staging_threshold BIGINT, mgmt_pub_interval INT, - version VARCHAR(1000), - data_dir VARCHAR(1000) + version TEXT, + data_dir TEXT ); CREATE UNIQUE INDEX broker_qmfIdsUnique ON broker (qmf_agent_id, qmf_object_id); CREATE INDEX broker_statsCurrIndex ON broker (stats_curr_id); @@ -181,29 +181,29 @@ CREATE TABLE broker_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, broker_id INT, uptime BIGINT ); CREATE TABLE client_connection ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, vhost_id INT, - address VARCHAR(1000), + address TEXT, incoming BOOL, system_connection BOOL, federation_link BOOL, - auth_identity VARCHAR(1000), - remote_process_name VARCHAR(1000), + auth_identity TEXT, + remote_process_name TEXT, remote_pid BIGINT, remote_parent_pid BIGINT ); @@ -213,7 +213,7 @@ CREATE TABLE client_connection_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, client_connection_id INT, closing BOOL, frames_from_client BIGINT, @@ -224,24 +224,24 @@ CREATE TABLE cluster ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, broker_id INT, - cluster_name VARCHAR(1000), - cluster_id VARCHAR(1000), - member_id VARCHAR(1000), - published_ur_l VARCHAR(1000), + cluster_name TEXT, + cluster_id TEXT, + member_id TEXT, + published_ur_l TEXT, cluster_size INT, - status VARCHAR(1000), - members VARCHAR(4000), - member_i_ds VARCHAR(4000) + status TEXT, + members TEXT, + member_i_ds TEXT ); CREATE UNIQUE INDEX cluster_qmfIdsUnique ON cluster (qmf_agent_id, qmf_object_id); CREATE INDEX cluster_statsCurrIndex ON cluster (stats_curr_id); @@ -249,27 +249,27 @@ CREATE TABLE cluster_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, cluster_id INT ); CREATE TABLE collector ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, - pool VARCHAR(1000), - system VARCHAR(1000), - condor_platform VARCHAR(1000), - condor_version VARCHAR(1000), - name VARCHAR(1000), - public_network_ip_addr VARCHAR(1000) + pool TEXT, + system TEXT, + condor_platform TEXT, + condor_version TEXT, + name TEXT, + public_network_ip_addr TEXT ); CREATE UNIQUE INDEX collector_qmfIdsUnique ON collector (qmf_agent_id, qmf_object_id); CREATE INDEX collector_statsPrevIndex ON collector (stats_prev_id); @@ -277,7 +277,7 @@ CREATE TABLE collector_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, collector_id INT, running_jobs BIGINT, idle_jobs BIGINT, @@ -289,18 +289,18 @@ CREATE TABLE exchange ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, vhost_id INT, - name VARCHAR(1000), - type VARCHAR(1000), + name TEXT, + type TEXT, durable BOOL, auto_delete BOOL, exchange_id INT, @@ -312,7 +312,7 @@ CREATE TABLE exchange_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, exchange_id INT, producer_count BIGINT, producer_count_low BIGINT, @@ -330,19 +330,19 @@ CREATE TABLE grid ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, - pool VARCHAR(1000), - name VARCHAR(1000), - schedd_name VARCHAR(1000), - owner VARCHAR(1000), + pool TEXT, + name TEXT, + schedd_name TEXT, + owner TEXT, job_limit BIGINT, submit_limit BIGINT, grid_resource_unavailable_time TIMESTAMP @@ -353,7 +353,7 @@ CREATE TABLE grid_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, grid_id INT, num_jobs BIGINT, submits_in_progress BIGINT, @@ -366,19 +366,19 @@ CREATE TABLE journal ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, queue_id INT, - name VARCHAR(1000), - directory VARCHAR(1000), - base_file_name VARCHAR(1000), + name TEXT, + directory TEXT, + base_file_name TEXT, write_page_size BIGINT, write_pages BIGINT, read_page_size BIGINT, @@ -395,7 +395,7 @@ CREATE TABLE journal_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, journal_id INT, record_depth BIGINT, record_depth_low BIGINT, @@ -430,19 +430,19 @@ CREATE TABLE link ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, vhost_id INT, - host VARCHAR(1000), + host TEXT, port BIGINT, - transport VARCHAR(1000), + transport TEXT, durable BOOL ); CREATE UNIQUE INDEX link_qmfIdsUnique ON link (qmf_agent_id, qmf_object_id); @@ -451,32 +451,32 @@ CREATE TABLE link_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, link_id INT, - state VARCHAR(1000), - last_error VARCHAR(1000) + state TEXT, + last_error TEXT ); CREATE TABLE master ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, - pool VARCHAR(1000), - system VARCHAR(1000), - name VARCHAR(1000), - machine VARCHAR(1000), - public_network_ip_addr VARCHAR(1000), - my_address VARCHAR(1000), + pool TEXT, + system TEXT, + name TEXT, + machine TEXT, + public_network_ip_addr TEXT, + my_address TEXT, real_uid INT, - condor_platform VARCHAR(1000), - condor_version VARCHAR(1000), + condor_platform TEXT, + condor_version TEXT, daemon_start_time TIMESTAMP ); CREATE UNIQUE INDEX master_qmfIdsUnique ON master (qmf_agent_id, qmf_object_id); @@ -485,7 +485,7 @@ CREATE TABLE master_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, master_id INT, monitor_self_age BIGINT, monitor_self_cpu_usage FLOAT, @@ -497,22 +497,22 @@ CREATE TABLE negotiator ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, - pool VARCHAR(1000), - system VARCHAR(1000), - name VARCHAR(1000), - machine VARCHAR(1000), - my_address VARCHAR(1000), - condor_platform VARCHAR(1000), - condor_version VARCHAR(1000), + pool TEXT, + system TEXT, + name TEXT, + machine TEXT, + my_address TEXT, + condor_platform TEXT, + condor_version TEXT, daemon_start_time TIMESTAMP ); CREATE UNIQUE INDEX negotiator_qmfIdsUnique ON negotiator (qmf_agent_id, qmf_object_id); @@ -521,7 +521,7 @@ CREATE TABLE negotiator_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, negotiator_id INT, monitor_self_age BIGINT, monitor_self_cpu_usage FLOAT, @@ -533,22 +533,22 @@ CREATE TABLE pool ( id SERIAL PRIMARY KEY, - source_id VARCHAR(1000) UNIQUE + source_id TEXT UNIQUE ); CREATE TABLE queue ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, vhost_id INT, - name VARCHAR(1000), + name TEXT, durable BOOL, auto_delete BOOL, exclusive BOOL, @@ -561,7 +561,7 @@ CREATE TABLE queue_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, queue_id INT, msg_total_enqueues BIGINT, msg_total_dequeues BIGINT, @@ -594,25 +594,25 @@ CREATE TABLE scheduler ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, - pool VARCHAR(1000), - system VARCHAR(1000), + pool TEXT, + system TEXT, job_queue_birthdate TIMESTAMP, max_jobs_running BIGINT, - machine VARCHAR(1000), - my_address VARCHAR(1000), - name VARCHAR(1000), - public_network_ip_addr VARCHAR(1000), - condor_platform VARCHAR(1000), - condor_version VARCHAR(1000), + machine TEXT, + my_address TEXT, + name TEXT, + public_network_ip_addr TEXT, + condor_platform TEXT, + condor_version TEXT, daemon_start_time TIMESTAMP ); CREATE UNIQUE INDEX scheduler_qmfIdsUnique ON scheduler (qmf_agent_id, qmf_object_id); @@ -621,7 +621,7 @@ CREATE TABLE scheduler_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, scheduler_id INT, num_users BIGINT, total_held_jobs BIGINT, @@ -639,17 +639,17 @@ CREATE TABLE session ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, vhost_id INT, - name VARCHAR(1000), + name TEXT, channel_id INT, client_connection_id INT, detached_lifespan BIGINT, @@ -663,7 +663,7 @@ CREATE TABLE session_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, session_id INT, frames_outstanding BIGINT, txn_starts BIGINT, @@ -675,50 +675,50 @@ CREATE TABLE slot ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, - pool VARCHAR(1000), - system VARCHAR(1000), - accounting_group VARCHAR(1000), - arch VARCHAR(1000), - checkpoint_platform VARCHAR(1000), - client_machine VARCHAR(1000), - concurrency_limits VARCHAR(1000), + pool TEXT, + system TEXT, + accounting_group TEXT, + arch TEXT, + checkpoint_platform TEXT, + client_machine TEXT, + concurrency_limits TEXT, cpus BIGINT, current_rank FLOAT, disk BIGINT, - file_system_domain VARCHAR(1000), - global_job_id VARCHAR(1000), - is_valid_checkpoint_platform VARCHAR(4000), - job_id VARCHAR(1000), + file_system_domain TEXT, + global_job_id TEXT, + is_valid_checkpoint_platform TEXT, + job_id TEXT, job_start TIMESTAMP, k_flops BIGINT, - machine VARCHAR(1000), - max_job_retirement_time VARCHAR(4000), + machine TEXT, + max_job_retirement_time TEXT, memory BIGINT, mips BIGINT, - my_address VARCHAR(1000), - name VARCHAR(1000), - op_sys VARCHAR(1000), - preempting_concurrency_limits VARCHAR(1000), - preempting_owner VARCHAR(1000), - preempting_user VARCHAR(1000), + my_address TEXT, + name TEXT, + op_sys TEXT, + preempting_concurrency_limits TEXT, + preempting_owner TEXT, + preempting_user TEXT, preempting_rank FLOAT, - remote_owner VARCHAR(1000), - remote_user VARCHAR(1000), - requirements VARCHAR(4000), - public_network_ip_addr VARCHAR(1000), - rank VARCHAR(4000), + remote_owner TEXT, + remote_user TEXT, + requirements TEXT, + public_network_ip_addr TEXT, + rank TEXT, slot_id BIGINT, - start VARCHAR(4000), - starter_ability_list VARCHAR(4000), + start TEXT, + starter_ability_list TEXT, total_claim_run_time BIGINT, total_claim_suspend_time BIGINT, total_cpus BIGINT, @@ -728,13 +728,13 @@ total_memory BIGINT, total_slots BIGINT, total_virtual_memory BIGINT, - uid_domain VARCHAR(1000), + uid_domain TEXT, virtual_memory BIGINT, windows_build_number BIGINT, windows_major_version BIGINT, windows_minor_version BIGINT, - condor_platform VARCHAR(1000), - condor_version VARCHAR(1000), + condor_platform TEXT, + condor_version TEXT, daemon_start_time TIMESTAMP ); CREATE UNIQUE INDEX slot_qmfIdsUnique ON slot (qmf_agent_id, qmf_object_id); @@ -743,9 +743,9 @@ CREATE TABLE slot_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, slot_id INT, - activity VARCHAR(1000), + activity TEXT, clock_day BIGINT, clock_min BIGINT, condor_load_avg FLOAT, @@ -761,7 +761,7 @@ load_avg FLOAT, my_current_time TIMESTAMP, next_fetch_work_delay INT, - state VARCHAR(1000), + state TEXT, time_to_live BIGINT, total_condor_load_avg FLOAT, total_load_avg FLOAT, @@ -788,21 +788,21 @@ CREATE TABLE store ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, broker_id INT, - location VARCHAR(1000), + location TEXT, default_initial_file_count INT, default_data_file_size BIGINT, tpl_is_initialized BOOL, - tpl_directory VARCHAR(1000), + tpl_directory TEXT, tpl_write_page_size BIGINT, tpl_write_pages BIGINT, tpl_initial_file_count INT, @@ -815,7 +815,7 @@ CREATE TABLE store_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, store_id INT, tpl_transaction_depth BIGINT, tpl_transaction_depth_low BIGINT, @@ -830,18 +830,18 @@ CREATE TABLE submission ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, scheduler_id INT, - name VARCHAR(1000), - owner VARCHAR(1000) + name TEXT, + owner TEXT ); CREATE UNIQUE INDEX submission_qmfIdsUnique ON submission (qmf_agent_id, qmf_object_id); CREATE INDEX submission_statsPrevIndex ON submission (stats_prev_id); @@ -849,7 +849,7 @@ CREATE TABLE submission_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, submission_id INT, idle BIGINT, running BIGINT, @@ -860,20 +860,20 @@ CREATE TABLE submitter ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, scheduler_id INT, job_queue_birthdate TIMESTAMP, - machine VARCHAR(1000), - name VARCHAR(1000), - schedd_name VARCHAR(1000) + machine TEXT, + name TEXT, + schedd_name TEXT ); CREATE UNIQUE INDEX submitter_qmfIdsUnique ON submitter (qmf_agent_id, qmf_object_id); CREATE INDEX submitter_statsPrevIndex ON submitter (stats_prev_id); @@ -881,7 +881,7 @@ CREATE TABLE submitter_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, submitter_id INT, held_jobs BIGINT, idle_jobs BIGINT, @@ -890,22 +890,22 @@ CREATE TABLE subscription ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, session_id INT, queue_id INT, - name VARCHAR(1000), + name TEXT, browsing BOOL, acknowledged BOOL, exclusive BOOL, - credit_mode VARCHAR(1000), + credit_mode TEXT, arguments BYTEA ); CREATE UNIQUE INDEX subscription_qmfIdsUnique ON subscription (qmf_agent_id, qmf_object_id); @@ -914,29 +914,29 @@ CREATE TABLE subscription_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, subscription_id INT, delivered BIGINT ); CREATE TABLE sysimage ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, uuid BYTEA, - os_name VARCHAR(1000), - node_name VARCHAR(1000), - release VARCHAR(1000), - version VARCHAR(1000), - machine VARCHAR(1000), - distro VARCHAR(1000), + os_name TEXT, + node_name TEXT, + release TEXT, + version TEXT, + machine TEXT, + distro TEXT, mem_total BIGINT, swap_total BIGINT ); @@ -946,7 +946,7 @@ CREATE TABLE sysimage_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, sysimage_id INT, mem_free BIGINT, swap_free BIGINT, @@ -959,21 +959,21 @@ CREATE TABLE system ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, system_id BYTEA, - os_name VARCHAR(1000), - node_name VARCHAR(1000), - release VARCHAR(1000), - version VARCHAR(1000), - machine VARCHAR(1000) + os_name TEXT, + node_name TEXT, + release TEXT, + version TEXT, + machine TEXT ); CREATE UNIQUE INDEX system_qmfIdsUnique ON system (qmf_agent_id, qmf_object_id); CREATE INDEX system_statsPrevIndex ON system (stats_prev_id); @@ -981,24 +981,24 @@ CREATE TABLE system_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, system_id INT ); CREATE TABLE vhost ( id SERIAL PRIMARY KEY, - qmf_agent_id VARCHAR(1000), - qmf_object_id VARCHAR(1000), - qmf_class_key VARCHAR(1000), - qmf_persistent BOOL, - qmf_update_time TIMESTAMP, - qmf_create_time TIMESTAMP, + qmf_agent_id TEXT NOT NULL, + qmf_object_id TEXT NOT NULL, + qmf_class_key TEXT NOT NULL, + qmf_persistent BOOL NOT NULL, + qmf_update_time TIMESTAMP NOT NULL, + qmf_create_time TIMESTAMP NOT NULL, qmf_delete_time TIMESTAMP, stats_curr_id INT, stats_prev_id INT, broker_id INT, - name VARCHAR(1000), - federation_tag VARCHAR(1000) + name TEXT, + federation_tag TEXT ); CREATE UNIQUE INDEX vhost_qmfIdsUnique ON vhost (qmf_agent_id, qmf_object_id); CREATE INDEX vhost_statsPrevIndex ON vhost (stats_prev_id); @@ -1006,7 +1006,7 @@ CREATE TABLE vhost_stats ( id SERIAL PRIMARY KEY, - qmf_update_time TIMESTAMP, + qmf_update_time TIMESTAMP NOT NULL, vhost_id INT );