Author: justi9 Date: 2008-12-18 10:58:17 -0500 (Thu, 18 Dec 2008) New Revision: 3023 Modified: mgmt/trunk/mint/python/mint/__init__.py mgmt/trunk/mint/python/mint/schema.py mgmt/trunk/mint/python/mint/schemaparser.py mgmt/trunk/mint/sql/schema.sql Log: Use BigIntCol for count32 and mma32, since those types are unsigned Modified: mgmt/trunk/mint/python/mint/__init__.py =================================================================== --- mgmt/trunk/mint/python/mint/__init__.py 2008-12-18 15:03:14 UTC (rev 3022) +++ mgmt/trunk/mint/python/mint/__init__.py 2008-12-18 15:58:17 UTC (rev 3023) @@ -535,12 +535,12 @@ if not self.updateObjects: return + if record.getClassKey().getClassName() == "job": + return + mbroker = self.getMintBrokerByQmfBroker(broker) up = update.StatisticUpdate(self, mbroker, record) - if record.getClassKey().getClassName() == "job": - up.priority = 1 - self.updateThread.enqueue(up) def event(self, broker, event): Modified: mgmt/trunk/mint/python/mint/schema.py =================================================================== --- mgmt/trunk/mint/python/mint/schema.py 2008-12-18 15:03:14 UTC (rev 3022) +++ mgmt/trunk/mint/python/mint/schema.py 2008-12-18 15:58:17 UTC (rev 3023) @@ -638,15 +638,15 @@ qmfUpdateTime = TimestampCol(default=None) store = ForeignKey('Store', cascade='null', default=None) classInfos = dict() # brokerId => classInfo - tplTransactionDepth = IntCol(default=None) - tplTransactionDepthLow = IntCol(default=None) - tplTransactionDepthHigh = IntCol(default=None) + tplTransactionDepth = BigIntCol(default=None) + tplTransactionDepthLow = BigIntCol(default=None) + tplTransactionDepthHigh = BigIntCol(default=None) tplTxnPrepares = BigIntCol(default=None) tplTxnCommits = BigIntCol(default=None) tplTxnAborts = BigIntCol(default=None) - tplOutstandingAIOs = IntCol(default=None) - tplOutstandingAIOsLow = IntCol(default=None) - tplOutstandingAIOsHigh = IntCol(default=None) + tplOutstandingAIOs = BigIntCol(default=None) + tplOutstandingAIOsLow = BigIntCol(default=None) + tplOutstandingAIOsHigh = BigIntCol(default=None) @@ -697,34 +697,34 @@ qmfUpdateTime = TimestampCol(default=None) journal = ForeignKey('Journal', cascade='null', default=None) classInfos = dict() # brokerId => classInfo - recordDepth = IntCol(default=None) - recordDepthLow = IntCol(default=None) - recordDepthHigh = IntCol(default=None) + recordDepth = BigIntCol(default=None) + recordDepthLow = BigIntCol(default=None) + recordDepthHigh = BigIntCol(default=None) enqueues = BigIntCol(default=None) dequeues = BigIntCol(default=None) txnEnqueues = BigIntCol(default=None) txnDequeues = BigIntCol(default=None) txnCommits = BigIntCol(default=None) txnAborts = BigIntCol(default=None) - outstandingAIOs = IntCol(default=None) - outstandingAIOsLow = IntCol(default=None) - outstandingAIOsHigh = IntCol(default=None) - freeFileCount = IntCol(default=None) - freeFileCountLow = IntCol(default=None) - freeFileCountHigh = IntCol(default=None) - availableFileCount = IntCol(default=None) - availableFileCountLow = IntCol(default=None) - availableFileCountHigh = IntCol(default=None) + outstandingAIOs = BigIntCol(default=None) + outstandingAIOsLow = BigIntCol(default=None) + outstandingAIOsHigh = BigIntCol(default=None) + freeFileCount = BigIntCol(default=None) + freeFileCountLow = BigIntCol(default=None) + freeFileCountHigh = BigIntCol(default=None) + availableFileCount = BigIntCol(default=None) + availableFileCountLow = BigIntCol(default=None) + availableFileCountHigh = BigIntCol(default=None) writeWaitFailures = BigIntCol(default=None) writeBusyFailures = BigIntCol(default=None) readRecordCount = BigIntCol(default=None) readBusyFailures = BigIntCol(default=None) - writePageCacheDepth = IntCol(default=None) - writePageCacheDepthLow = IntCol(default=None) - writePageCacheDepthHigh = IntCol(default=None) - readPageCacheDepth = IntCol(default=None) - readPageCacheDepthLow = IntCol(default=None) - readPageCacheDepthHigh = IntCol(default=None) + writePageCacheDepth = BigIntCol(default=None) + writePageCacheDepthLow = BigIntCol(default=None) + writePageCacheDepthHigh = BigIntCol(default=None) + readPageCacheDepth = BigIntCol(default=None) + readPageCacheDepthLow = BigIntCol(default=None) + readPageCacheDepthHigh = BigIntCol(default=None) @@ -965,23 +965,23 @@ msgTxnDequeues = BigIntCol(default=None) msgPersistEnqueues = BigIntCol(default=None) msgPersistDequeues = BigIntCol(default=None) - msgDepth = IntCol(default=None) - byteDepth = IntCol(default=None) + msgDepth = BigIntCol(default=None) + byteDepth = BigIntCol(default=None) byteTotalEnqueues = BigIntCol(default=None) byteTotalDequeues = BigIntCol(default=None) byteTxnEnqueues = BigIntCol(default=None) byteTxnDequeues = BigIntCol(default=None) bytePersistEnqueues = BigIntCol(default=None) bytePersistDequeues = BigIntCol(default=None) - consumerCount = IntCol(default=None) - consumerCountLow = IntCol(default=None) - consumerCountHigh = IntCol(default=None) - bindingCount = IntCol(default=None) - bindingCountLow = IntCol(default=None) - bindingCountHigh = IntCol(default=None) - unackedMessages = IntCol(default=None) - unackedMessagesLow = IntCol(default=None) - unackedMessagesHigh = IntCol(default=None) + consumerCount = BigIntCol(default=None) + consumerCountLow = BigIntCol(default=None) + consumerCountHigh = BigIntCol(default=None) + bindingCount = BigIntCol(default=None) + bindingCountLow = BigIntCol(default=None) + bindingCountHigh = BigIntCol(default=None) + unackedMessages = BigIntCol(default=None) + unackedMessagesLow = BigIntCol(default=None) + unackedMessagesHigh = BigIntCol(default=None) messageLatencyMin = BigIntCol(default=None) messageLatencyMax = BigIntCol(default=None) messageLatencyAverage = BigIntCol(default=None) @@ -1021,12 +1021,12 @@ qmfUpdateTime = TimestampCol(default=None) exchange = ForeignKey('Exchange', cascade='null', default=None) classInfos = dict() # brokerId => classInfo - producerCount = IntCol(default=None) - producerCountLow = IntCol(default=None) - producerCountHigh = IntCol(default=None) - bindingCount = IntCol(default=None) - bindingCountLow = IntCol(default=None) - bindingCountHigh = IntCol(default=None) + producerCount = BigIntCol(default=None) + producerCountLow = BigIntCol(default=None) + producerCountHigh = BigIntCol(default=None) + bindingCount = BigIntCol(default=None) + bindingCountLow = BigIntCol(default=None) + bindingCountHigh = BigIntCol(default=None) msgReceives = BigIntCol(default=None) msgDrops = BigIntCol(default=None) msgRoutes = BigIntCol(default=None) @@ -1292,11 +1292,11 @@ qmfUpdateTime = TimestampCol(default=None) session = ForeignKey('Session', cascade='null', default=None) classInfos = dict() # brokerId => classInfo - framesOutstanding = IntCol(default=None) + framesOutstanding = BigIntCol(default=None) TxnStarts = BigIntCol(default=None) TxnCommits = BigIntCol(default=None) TxnRejects = BigIntCol(default=None) - TxnCount = IntCol(default=None) + TxnCount = BigIntCol(default=None) Modified: mgmt/trunk/mint/python/mint/schemaparser.py =================================================================== --- mgmt/trunk/mint/python/mint/schemaparser.py 2008-12-18 15:03:14 UTC (rev 3022) +++ mgmt/trunk/mint/python/mint/schemaparser.py 2008-12-18 15:58:17 UTC (rev 3023) @@ -26,7 +26,7 @@ self.dataTypesMap["uint8"] = self.dataTypesMap["hilo8"] = self.dataTypesMap["count8"] = self.dataTypesMap["mma8"] = "SmallIntCol" self.dataTypesMap["hilo16"] = self.dataTypesMap["count16"] = self.dataTypesMap["mma16"] = "SmallIntCol" self.dataTypesMap["uint16"] = "IntCol" - self.dataTypesMap["hilo32"] = self.dataTypesMap["count32"] = self.dataTypesMap["mma32"] = self.dataTypesMap["atomic32"] = "IntCol" + self.dataTypesMap["hilo32"] = self.dataTypesMap["count32"] = self.dataTypesMap["mma32"] = "BigIntCol" self.dataTypesMap["uint32"] = "BigIntCol" self.dataTypesMap["uint64"] = self.dataTypesMap["hilo64"] = self.dataTypesMap["count64"] = self.dataTypesMap["mma64"] = self.dataTypesMap["mmaTime"] = "BigIntCol" self.dataTypesMap["float"] = self.dataTypesMap["double"] = "FloatCol" Modified: mgmt/trunk/mint/sql/schema.sql =================================================================== --- mgmt/trunk/mint/sql/schema.sql 2008-12-18 15:03:14 UTC (rev 3022) +++ mgmt/trunk/mint/sql/schema.sql 2008-12-18 15:58:17 UTC (rev 3023) @@ -326,12 +326,12 @@ id SERIAL PRIMARY KEY, qmf_update_time TIMESTAMP, exchange_id INT, - producer_count INT, - producer_count_low INT, - producer_count_high INT, - binding_count INT, - binding_count_low INT, - binding_count_high INT, + producer_count BIGINT, + producer_count_low BIGINT, + producer_count_high BIGINT, + binding_count BIGINT, + binding_count_low BIGINT, + binding_count_high BIGINT, msg_receives BIGINT, msg_drops BIGINT, msg_routes BIGINT, @@ -421,34 +421,34 @@ id SERIAL PRIMARY KEY, qmf_update_time TIMESTAMP, journal_id INT, - record_depth INT, - record_depth_low INT, - record_depth_high INT, + record_depth BIGINT, + record_depth_low BIGINT, + record_depth_high BIGINT, enqueues BIGINT, dequeues BIGINT, txn_enqueues BIGINT, txn_dequeues BIGINT, txn_commits BIGINT, txn_aborts BIGINT, - outstanding_ai_os INT, - outstanding_ai_os_low INT, - outstanding_ai_os_high INT, - free_file_count INT, - free_file_count_low INT, - free_file_count_high INT, - available_file_count INT, - available_file_count_low INT, - available_file_count_high INT, + outstanding_ai_os BIGINT, + outstanding_ai_os_low BIGINT, + outstanding_ai_os_high BIGINT, + free_file_count BIGINT, + free_file_count_low BIGINT, + free_file_count_high BIGINT, + available_file_count BIGINT, + available_file_count_low BIGINT, + available_file_count_high BIGINT, write_wait_failures BIGINT, write_busy_failures BIGINT, read_record_count BIGINT, read_busy_failures BIGINT, - write_page_cache_depth INT, - write_page_cache_depth_low INT, - write_page_cache_depth_high INT, - read_page_cache_depth INT, - read_page_cache_depth_low INT, - read_page_cache_depth_high INT + write_page_cache_depth BIGINT, + write_page_cache_depth_low BIGINT, + write_page_cache_depth_high BIGINT, + read_page_cache_depth BIGINT, + read_page_cache_depth_low BIGINT, + read_page_cache_depth_high BIGINT ); CREATE TABLE link ( @@ -591,23 +591,23 @@ msg_txn_dequeues BIGINT, msg_persist_enqueues BIGINT, msg_persist_dequeues BIGINT, - msg_depth INT, - byte_depth INT, + msg_depth BIGINT, + byte_depth BIGINT, byte_total_enqueues BIGINT, byte_total_dequeues BIGINT, byte_txn_enqueues BIGINT, byte_txn_dequeues BIGINT, byte_persist_enqueues BIGINT, byte_persist_dequeues BIGINT, - consumer_count INT, - consumer_count_low INT, - consumer_count_high INT, - binding_count INT, - binding_count_low INT, - binding_count_high INT, - unacked_messages INT, - unacked_messages_low INT, - unacked_messages_high INT, + consumer_count BIGINT, + consumer_count_low BIGINT, + consumer_count_high BIGINT, + binding_count BIGINT, + binding_count_low BIGINT, + binding_count_high BIGINT, + unacked_messages BIGINT, + unacked_messages_low BIGINT, + unacked_messages_high BIGINT, message_latency_min BIGINT, message_latency_max BIGINT, message_latency_average BIGINT, @@ -686,11 +686,11 @@ id SERIAL PRIMARY KEY, qmf_update_time TIMESTAMP, session_id INT, - frames_outstanding INT, + frames_outstanding BIGINT, txn_starts BIGINT, txn_commits BIGINT, txn_rejects BIGINT, - txn_count INT + txn_count BIGINT ); CREATE TABLE slot ( @@ -837,15 +837,15 @@ id SERIAL PRIMARY KEY, qmf_update_time TIMESTAMP, store_id INT, - tpl_transaction_depth INT, - tpl_transaction_depth_low INT, - tpl_transaction_depth_high INT, + tpl_transaction_depth BIGINT, + tpl_transaction_depth_low BIGINT, + tpl_transaction_depth_high BIGINT, tpl_txn_prepares BIGINT, tpl_txn_commits BIGINT, tpl_txn_aborts BIGINT, - tpl_outstanding_ai_os INT, - tpl_outstanding_ai_os_low INT, - tpl_outstanding_ai_os_high INT + tpl_outstanding_ai_os BIGINT, + tpl_outstanding_ai_os_low BIGINT, + tpl_outstanding_ai_os_high BIGINT ); CREATE TABLE submitter (