[rhmessaging-commits] rhmessaging commits: r1574 - in mgmt: cumin and 6 other directories.

Author: justi9 Date: 2008-01-18 14:56:08 -0500 (Fri, 18 Jan 2008) New Revision: 1574 Added: mgmt/Makefile mgmt/cumin/bin/cumin-database-init mgmt/cumin/etc/ mgmt/cumin/etc/cumin.conf mgmt/mint/sql/ mgmt/mint/sql/indexes.sql mgmt/mint/sql/schema.sql Removed: mgmt/mint/bin/mint-database-init mgmt/mint/python/mint/indexes.sql mgmt/mint/python/mint/schema.sql Modified: mgmt/cumin/bin/cumin mgmt/mint/Makefile Log: Reorganizes files for packaging. Adds a top-level makefile with a "dist" target for producing the files to be packaged. Moves the mint sql files out of the python dir and into a new sql dir. Changes mint-database-init to cumin-database-init, since it needs to reflect the user visible name. Added: mgmt/Makefile =================================================================== --- mgmt/Makefile (rev 0) +++ mgmt/Makefile 2008-01-18 19:56:08 UTC (rev 1574) @@ -0,0 +1,20 @@ +.PHONY: dist clean + +dist: clean + mkdir -p dist/lib/python/mint + mkdir -p dist/lib/python/wooly + mkdir -p dist/lib/python/cumin + mkdir -p dist/bin + mkdir -p dist/resources + mkdir -p dist/etc + mkdir -p dist/sql + cp -a mint/python/mint/* dist/lib/python/mint + cp -a mint/sql/* dist/sql + cp -a cumin/python/wooly/* dist/lib/python/wooly + cp -a cumin/python/cumin/* dist/lib/python/cumin + cp -a cumin/bin/* dist/bin + cp -a cumin/resources/* dist/resources + cp -a cumin/etc/* dist/etc + +clean: + rm -rf dist Modified: mgmt/cumin/bin/cumin =================================================================== --- mgmt/cumin/bin/cumin 2008-01-18 15:52:23 UTC (rev 1573) +++ mgmt/cumin/bin/cumin 2008-01-18 19:56:08 UTC (rev 1574) @@ -17,7 +17,7 @@ args = dict() conf = SafeConfigParser() - conf.read(os.path.expanduser("/etc/cumin.conf")) + conf.read(os.path.expanduser("~/.cumin.conf")) if (conf.has_section("main")): for key, value in conf.items("main"): Copied: mgmt/cumin/bin/cumin-database-init (from rev 1568, mgmt/mint/bin/mint-database-init) =================================================================== --- mgmt/cumin/bin/cumin-database-init (rev 0) +++ mgmt/cumin/bin/cumin-database-init 2008-01-18 19:56:08 UTC (rev 1574) @@ -0,0 +1,16 @@ +#!/bin/bash -v + +# This script assumes that postgresql is configured and running + +if [ "$#" -lt 3 ]; then + echo "Usage: mint-database-init USER-NAME DATABASE-NAME SCHEMA-FILE" + exit 2 +fi + +user="$1" +db="$2" +schema="$3" + +su postgres -c "createuser --superuser ${user}" +su postgres -c "createdb --owner=${user} ${db}" +su "$user" -c "psql -d ${db} -f ${schema}" Added: mgmt/cumin/etc/cumin.conf =================================================================== --- mgmt/cumin/etc/cumin.conf (rev 0) +++ mgmt/cumin/etc/cumin.conf 2008-01-18 19:56:08 UTC (rev 1574) @@ -0,0 +1,2 @@ +[main] +data: postgresql://cumin@localhost/cumin Modified: mgmt/mint/Makefile =================================================================== --- mgmt/mint/Makefile 2008-01-18 15:52:23 UTC (rev 1573) +++ mgmt/mint/Makefile 2008-01-18 19:56:08 UTC (rev 1574) @@ -15,6 +15,6 @@ schema-python: python python/mint/schemaparser.py ${MINT_SCHEMA_XML} python/mint/schema.py ${dsn} -schema-sql: python/mint/schema.py - sqlobject-admin sql -m mint -m mint.schema -c ${dsn} | sed -e '1,2d' > python/mint/schema.sql - cat python/mint/indexes.sql >> python/mint/schema.sql +schema-sql: + sqlobject-admin sql -m mint -m mint.schema -c ${dsn} | sed -e '1,2d' > sql/schema.sql + cat sql/indexes.sql >> sql/schema.sql Deleted: mgmt/mint/bin/mint-database-init =================================================================== --- mgmt/mint/bin/mint-database-init 2008-01-18 15:52:23 UTC (rev 1573) +++ mgmt/mint/bin/mint-database-init 2008-01-18 19:56:08 UTC (rev 1574) @@ -1,16 +0,0 @@ -#!/bin/bash -v - -# This script assumes that postgresql is configured and running - -if [ "$#" -lt 3 ]; then - echo "Usage: mint-database-init USER-NAME DATABASE-NAME SCHEMA-FILE" - exit 2 -fi - -user="$1" -db="$2" -schema="$3" - -su postgres -c "createuser --superuser ${user}" -su postgres -c "createdb --owner=${user} ${db}" -su "$user" -c "psql -d ${db} -f ${schema}" Deleted: mgmt/mint/python/mint/indexes.sql =================================================================== --- mgmt/mint/python/mint/indexes.sql 2008-01-18 15:52:23 UTC (rev 1573) +++ mgmt/mint/python/mint/indexes.sql 2008-01-18 19:56:08 UTC (rev 1574) @@ -1,7 +0,0 @@ -create index queue_vhost_id_idx on queue (vhost_id); -create index exchange_vhost_id_idx on exchange (vhost_id); -create index client_vhost_id_idx on client (vhost_id); - -create index queue_stats_queue_id_idx on queue_stats (queue_id); -create index exchange_stats_exchange_id_idx on exchange_stats (exchange_id); -create index client_stats_client_id_idx on client_stats (client_id); Deleted: mgmt/mint/python/mint/schema.sql =================================================================== --- mgmt/mint/python/mint/schema.sql 2008-01-18 15:52:23 UTC (rev 1573) +++ mgmt/mint/python/mint/schema.sql 2008-01-18 19:56:08 UTC (rev 1574) @@ -1,467 +0,0 @@ -CREATE TABLE broker_cluster ( - id SERIAL PRIMARY KEY, - name VARCHAR(1000) -); - -CREATE TABLE broker_group ( - id SERIAL PRIMARY KEY, - name VARCHAR(1000) -); - -CREATE TABLE broker_group_mapping ( - id SERIAL PRIMARY KEY, - broker_registration_id INT NOT NULL, - broker_group_id INT NOT NULL -); -CREATE UNIQUE INDEX broker_group_mapping_unique ON broker_group_mapping (broker_registration_id, broker_group_id); - -CREATE TABLE broker_profile ( - id SERIAL PRIMARY KEY, - name VARCHAR(1000) -); - -CREATE TABLE broker_registration ( - id SERIAL PRIMARY KEY, - name VARCHAR(1000), - host VARCHAR(1000), - port SMALLINT, - broker_id INT, - cluster_id INT, - profile_id INT -); - -CREATE TABLE config_property ( - id SERIAL PRIMARY KEY, - name VARCHAR(1000), - value VARCHAR(1000), - type VARCHAR(1) -); - -CREATE TABLE binding ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - creation_time TIMESTAMP, - deletion_time TIMESTAMP, - managed_broker VARCHAR(1000), - stats_curr_id INT, - stats_prev_id INT, - exchange_id INT, - queue_id INT, - binding_key VARCHAR(1000) -); - -CREATE TABLE binding_stats ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - binding_id INT, - msg_matched BIGINT -); - -CREATE TABLE broker ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - creation_time TIMESTAMP, - deletion_time TIMESTAMP, - managed_broker VARCHAR(1000), - stats_curr_id INT, - stats_prev_id INT, - system_id INT, - port SMALLINT, - worker_threads SMALLINT, - max_conns SMALLINT, - conn_backlog SMALLINT, - staging_threshold INT, - store_lib VARCHAR(1000), - async_store BOOL, - mgmt_pub_interval SMALLINT, - initial_disk_page_size INT, - initial_pages_per_queue INT, - cluster_name VARCHAR(1000), - version VARCHAR(1000), - registration_id INT -); - -CREATE TABLE broker_stats ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - broker_id INT -); - -CREATE TABLE client ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - creation_time TIMESTAMP, - deletion_time TIMESTAMP, - managed_broker VARCHAR(1000), - stats_curr_id INT, - stats_prev_id INT, - vhost_id INT, - address VARCHAR(1000) -); - -CREATE TABLE client_stats ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - client_id INT, - closing BOOL, - auth_identity VARCHAR(1000), - frames_from_client BIGINT, - frames_to_client BIGINT, - bytes_from_client BIGINT, - bytes_to_client BIGINT -); - -CREATE TABLE consumer ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - creation_time TIMESTAMP, - deletion_time TIMESTAMP, - managed_broker VARCHAR(1000), - stats_curr_id INT, - stats_prev_id INT, - destination_id INT, - queue_id INT -); - -CREATE TABLE consumer_stats ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - consumer_id INT, - msgs_consumed BIGINT, - bytes_consumed BIGINT, - unacked_messages INT, - unacked_messages_low INT, - unacked_messages_high INT -); - -CREATE TABLE destination ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - creation_time TIMESTAMP, - deletion_time TIMESTAMP, - managed_broker VARCHAR(1000), - stats_curr_id INT, - stats_prev_id INT, - session_id INT, - name VARCHAR(1000) -); - -CREATE TABLE destination_stats ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - destination_id INT, - flow_mode SMALLINT, - max_msg_credits INT, - max_byte_credits INT, - msg_credits INT, - byte_credits INT -); - -CREATE TABLE exchange ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - creation_time TIMESTAMP, - deletion_time TIMESTAMP, - managed_broker VARCHAR(1000), - stats_curr_id INT, - stats_prev_id INT, - vhost_id INT, - name VARCHAR(1000), - type VARCHAR(1000) -); - -CREATE TABLE exchange_stats ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - exchange_id INT, - producers INT, - producers_low INT, - producers_high INT, - bindings INT, - bindings_low INT, - bindings_high INT, - msg_receives BIGINT, - msg_drops BIGINT, - msg_routes BIGINT, - byte_receives BIGINT, - byte_drops BIGINT, - byte_routes BIGINT -); - -CREATE TABLE producer ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - creation_time TIMESTAMP, - deletion_time TIMESTAMP, - managed_broker VARCHAR(1000), - stats_curr_id INT, - stats_prev_id INT, - destination_id INT, - exchange_id INT -); - -CREATE TABLE producer_stats ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - producer_id INT, - msgs_produced BIGINT, - bytes_produced BIGINT -); - -CREATE TABLE queue ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - creation_time TIMESTAMP, - deletion_time TIMESTAMP, - managed_broker VARCHAR(1000), - stats_curr_id INT, - stats_prev_id INT, - vhost_id INT, - name VARCHAR(1000), - durable BOOL, - auto_delete BOOL, - exclusive BOOL -); - -CREATE TABLE queue_stats ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - queue_id INT, - msg_total_enqueues BIGINT, - msg_total_dequeues BIGINT, - msg_txn_enqueues BIGINT, - msg_txn_dequeues BIGINT, - msg_persist_enqueues BIGINT, - msg_persist_dequeues BIGINT, - msg_depth INT, - msg_depth_low INT, - msg_depth_high INT, - byte_total_enqueues BIGINT, - byte_total_dequeues BIGINT, - byte_txn_enqueues BIGINT, - byte_txn_dequeues BIGINT, - byte_persist_enqueues BIGINT, - byte_persist_dequeues BIGINT, - byte_depth INT, - byte_depth_low INT, - byte_depth_high INT, - enqueue_txn_starts BIGINT, - enqueue_txn_commits BIGINT, - enqueue_txn_rejects BIGINT, - enqueue_txn_count INT, - enqueue_txn_count_low INT, - enqueue_txn_count_high INT, - dequeue_txn_starts BIGINT, - dequeue_txn_commits BIGINT, - dequeue_txn_rejects BIGINT, - dequeue_txn_count INT, - dequeue_txn_count_low INT, - dequeue_txn_count_high INT, - consumers INT, - consumers_low INT, - consumers_high INT, - bindings INT, - bindings_low INT, - bindings_high INT, - unacked_messages INT, - unacked_messages_low INT, - unacked_messages_high INT, - message_latency_min BIGINT, - message_latency_max BIGINT, - message_latency_avg BIGINT -); - -CREATE TABLE session ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - creation_time TIMESTAMP, - deletion_time TIMESTAMP, - managed_broker VARCHAR(1000), - stats_curr_id INT, - stats_prev_id INT, - vhost_id INT, - name VARCHAR(1000), - channel_id SMALLINT, - client_id INT, - detached_lifespan INT -); - -CREATE TABLE session_stats ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - session_id INT, - attached BOOL, - expire_time BIGINT, - frames_outstanding INT -); - -CREATE TABLE system ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - creation_time TIMESTAMP, - deletion_time TIMESTAMP, - managed_broker VARCHAR(1000), - stats_curr_id INT, - stats_prev_id INT, - sys_id VARCHAR(1000) -); - -CREATE TABLE system_stats ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - system_id INT -); - -CREATE TABLE vhost ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - creation_time TIMESTAMP, - deletion_time TIMESTAMP, - managed_broker VARCHAR(1000), - stats_curr_id INT, - stats_prev_id INT, - broker_id INT, - name VARCHAR(1000) -); - -CREATE TABLE vhost_stats ( - id SERIAL PRIMARY KEY, - id_original BIGINT, - rec_time TIMESTAMP, - vhost_id INT -); - -ALTER TABLE broker_group_mapping ADD CONSTRAINT broker_registration_id_exists FOREIGN KEY (broker_registration_id) REFERENCES broker_registration (id) ON DELETE CASCADE; - -ALTER TABLE broker_group_mapping ADD CONSTRAINT broker_group_id_exists FOREIGN KEY (broker_group_id) REFERENCES broker_group (id) ON DELETE CASCADE; - -ALTER TABLE broker_registration ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id) REFERENCES broker (id) ON DELETE SET NULL; - -ALTER TABLE broker_registration ADD CONSTRAINT cluster_id_exists FOREIGN KEY (cluster_id) REFERENCES broker_cluster (id) ON DELETE SET NULL; - -ALTER TABLE broker_registration ADD CONSTRAINT profile_id_exists FOREIGN KEY (profile_id) REFERENCES broker_profile (id) ON DELETE SET NULL; - -ALTER TABLE binding ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES binding_stats (id) ON DELETE SET NULL; - -ALTER TABLE binding ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES binding_stats (id) ON DELETE SET NULL; - -ALTER TABLE binding ADD CONSTRAINT exchange_id_exists FOREIGN KEY (exchange_id) REFERENCES exchange (id) ON DELETE SET NULL; - -ALTER TABLE binding ADD CONSTRAINT queue_id_exists FOREIGN KEY (queue_id) REFERENCES queue (id) ON DELETE SET NULL; - -ALTER TABLE binding_stats ADD CONSTRAINT binding_id_exists FOREIGN KEY (binding_id) REFERENCES binding (id) ON DELETE SET NULL; - -ALTER TABLE broker ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES broker_stats (id) ON DELETE SET NULL; - -ALTER TABLE broker ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES broker_stats (id) ON DELETE SET NULL; - -ALTER TABLE broker ADD CONSTRAINT system_id_exists FOREIGN KEY (system_id) REFERENCES system (id) ON DELETE SET NULL; - -ALTER TABLE broker ADD CONSTRAINT registration_id_exists FOREIGN KEY (registration_id) REFERENCES broker_registration (id) ON DELETE SET NULL; - -ALTER TABLE broker_stats ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id) REFERENCES broker (id) ON DELETE SET NULL; - -ALTER TABLE client ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES client_stats (id) ON DELETE SET NULL; - -ALTER TABLE client ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES client_stats (id) ON DELETE SET NULL; - -ALTER TABLE client ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; - -ALTER TABLE client_stats ADD CONSTRAINT client_id_exists FOREIGN KEY (client_id) REFERENCES client (id) ON DELETE SET NULL; - -ALTER TABLE consumer ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES consumer_stats (id) ON DELETE SET NULL; - -ALTER TABLE consumer ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES consumer_stats (id) ON DELETE SET NULL; - -ALTER TABLE consumer ADD CONSTRAINT destination_id_exists FOREIGN KEY (destination_id) REFERENCES destination (id) ON DELETE SET NULL; - -ALTER TABLE consumer ADD CONSTRAINT queue_id_exists FOREIGN KEY (queue_id) REFERENCES queue (id) ON DELETE SET NULL; - -ALTER TABLE consumer_stats ADD CONSTRAINT consumer_id_exists FOREIGN KEY (consumer_id) REFERENCES consumer (id) ON DELETE SET NULL; - -ALTER TABLE destination ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES destination_stats (id) ON DELETE SET NULL; - -ALTER TABLE destination ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES destination_stats (id) ON DELETE SET NULL; - -ALTER TABLE destination ADD CONSTRAINT session_id_exists FOREIGN KEY (session_id) REFERENCES session (id) ON DELETE SET NULL; - -ALTER TABLE destination_stats ADD CONSTRAINT destination_id_exists FOREIGN KEY (destination_id) REFERENCES destination (id) ON DELETE SET NULL; - -ALTER TABLE exchange ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES exchange_stats (id) ON DELETE SET NULL; - -ALTER TABLE exchange ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES exchange_stats (id) ON DELETE SET NULL; - -ALTER TABLE exchange ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; - -ALTER TABLE exchange_stats ADD CONSTRAINT exchange_id_exists FOREIGN KEY (exchange_id) REFERENCES exchange (id) ON DELETE SET NULL; - -ALTER TABLE producer ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES producer_stats (id) ON DELETE SET NULL; - -ALTER TABLE producer ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES producer_stats (id) ON DELETE SET NULL; - -ALTER TABLE producer ADD CONSTRAINT destination_id_exists FOREIGN KEY (destination_id) REFERENCES destination (id) ON DELETE SET NULL; - -ALTER TABLE producer ADD CONSTRAINT exchange_id_exists FOREIGN KEY (exchange_id) REFERENCES exchange (id) ON DELETE SET NULL; - -ALTER TABLE producer_stats ADD CONSTRAINT producer_id_exists FOREIGN KEY (producer_id) REFERENCES producer (id) ON DELETE SET NULL; - -ALTER TABLE queue ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES queue_stats (id) ON DELETE SET NULL; - -ALTER TABLE queue ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES queue_stats (id) ON DELETE SET NULL; - -ALTER TABLE queue ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; - -ALTER TABLE queue_stats ADD CONSTRAINT queue_id_exists FOREIGN KEY (queue_id) REFERENCES queue (id) ON DELETE SET NULL; - -ALTER TABLE session ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES session_stats (id) ON DELETE SET NULL; - -ALTER TABLE session ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES session_stats (id) ON DELETE SET NULL; - -ALTER TABLE session ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; - -ALTER TABLE session ADD CONSTRAINT client_id_exists FOREIGN KEY (client_id) REFERENCES client (id) ON DELETE SET NULL; - -ALTER TABLE session_stats ADD CONSTRAINT session_id_exists FOREIGN KEY (session_id) REFERENCES session (id) ON DELETE SET NULL; - -ALTER TABLE system ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES system_stats (id) ON DELETE SET NULL; - -ALTER TABLE system ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES system_stats (id) ON DELETE SET NULL; - -ALTER TABLE system_stats ADD CONSTRAINT system_id_exists FOREIGN KEY (system_id) REFERENCES system (id) ON DELETE SET NULL; - -ALTER TABLE vhost ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES vhost_stats (id) ON DELETE SET NULL; - -ALTER TABLE vhost ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES vhost_stats (id) ON DELETE SET NULL; - -ALTER TABLE vhost ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id) REFERENCES broker (id) ON DELETE SET NULL; - -ALTER TABLE vhost_stats ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; - -create index queue_vhost_id_idx on queue (vhost_id); -create index exchange_vhost_id_idx on exchange (vhost_id); -create index client_vhost_id_idx on client (vhost_id); - -create index queue_stats_queue_id_idx on queue_stats (queue_id); -create index exchange_stats_exchange_id_idx on exchange_stats (exchange_id); -create index client_stats_client_id_idx on client_stats (client_id); Copied: mgmt/mint/sql/indexes.sql (from rev 1565, mgmt/mint/python/mint/indexes.sql) =================================================================== --- mgmt/mint/sql/indexes.sql (rev 0) +++ mgmt/mint/sql/indexes.sql 2008-01-18 19:56:08 UTC (rev 1574) @@ -0,0 +1,7 @@ +create index queue_vhost_id_idx on queue (vhost_id); +create index exchange_vhost_id_idx on exchange (vhost_id); +create index client_vhost_id_idx on client (vhost_id); + +create index queue_stats_queue_id_idx on queue_stats (queue_id); +create index exchange_stats_exchange_id_idx on exchange_stats (exchange_id); +create index client_stats_client_id_idx on client_stats (client_id); Added: mgmt/mint/sql/schema.sql =================================================================== --- mgmt/mint/sql/schema.sql (rev 0) +++ mgmt/mint/sql/schema.sql 2008-01-18 19:56:08 UTC (rev 1574) @@ -0,0 +1,467 @@ +CREATE TABLE broker_cluster ( + id SERIAL PRIMARY KEY, + name VARCHAR(1000) +); + +CREATE TABLE broker_group ( + id SERIAL PRIMARY KEY, + name VARCHAR(1000) +); + +CREATE TABLE broker_group_mapping ( + id SERIAL PRIMARY KEY, + broker_registration_id INT NOT NULL, + broker_group_id INT NOT NULL +); +CREATE UNIQUE INDEX broker_group_mapping_unique ON broker_group_mapping (broker_registration_id, broker_group_id); + +CREATE TABLE broker_profile ( + id SERIAL PRIMARY KEY, + name VARCHAR(1000) +); + +CREATE TABLE broker_registration ( + id SERIAL PRIMARY KEY, + name VARCHAR(1000), + host VARCHAR(1000), + port SMALLINT, + broker_id INT, + cluster_id INT, + profile_id INT +); + +CREATE TABLE config_property ( + id SERIAL PRIMARY KEY, + name VARCHAR(1000), + value VARCHAR(1000), + type VARCHAR(1) +); + +CREATE TABLE binding ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT, + exchange_id INT, + queue_id INT, + binding_key VARCHAR(1000) +); + +CREATE TABLE binding_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + binding_id INT, + msg_matched BIGINT +); + +CREATE TABLE broker ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT, + system_id INT, + port SMALLINT, + worker_threads SMALLINT, + max_conns SMALLINT, + conn_backlog SMALLINT, + staging_threshold INT, + store_lib VARCHAR(1000), + async_store BOOL, + mgmt_pub_interval SMALLINT, + initial_disk_page_size INT, + initial_pages_per_queue INT, + cluster_name VARCHAR(1000), + version VARCHAR(1000), + registration_id INT +); + +CREATE TABLE broker_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + broker_id INT +); + +CREATE TABLE client ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT, + vhost_id INT, + address VARCHAR(1000) +); + +CREATE TABLE client_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + client_id INT, + closing BOOL, + auth_identity VARCHAR(1000), + frames_from_client BIGINT, + frames_to_client BIGINT, + bytes_from_client BIGINT, + bytes_to_client BIGINT +); + +CREATE TABLE consumer ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT, + destination_id INT, + queue_id INT +); + +CREATE TABLE consumer_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + consumer_id INT, + msgs_consumed BIGINT, + bytes_consumed BIGINT, + unacked_messages INT, + unacked_messages_low INT, + unacked_messages_high INT +); + +CREATE TABLE destination ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT, + session_id INT, + name VARCHAR(1000) +); + +CREATE TABLE destination_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + destination_id INT, + flow_mode SMALLINT, + max_msg_credits INT, + max_byte_credits INT, + msg_credits INT, + byte_credits INT +); + +CREATE TABLE exchange ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT, + vhost_id INT, + name VARCHAR(1000), + type VARCHAR(1000) +); + +CREATE TABLE exchange_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + exchange_id INT, + producers INT, + producers_low INT, + producers_high INT, + bindings INT, + bindings_low INT, + bindings_high INT, + msg_receives BIGINT, + msg_drops BIGINT, + msg_routes BIGINT, + byte_receives BIGINT, + byte_drops BIGINT, + byte_routes BIGINT +); + +CREATE TABLE producer ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT, + destination_id INT, + exchange_id INT +); + +CREATE TABLE producer_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + producer_id INT, + msgs_produced BIGINT, + bytes_produced BIGINT +); + +CREATE TABLE queue ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT, + vhost_id INT, + name VARCHAR(1000), + durable BOOL, + auto_delete BOOL, + exclusive BOOL +); + +CREATE TABLE queue_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + queue_id INT, + msg_total_enqueues BIGINT, + msg_total_dequeues BIGINT, + msg_txn_enqueues BIGINT, + msg_txn_dequeues BIGINT, + msg_persist_enqueues BIGINT, + msg_persist_dequeues BIGINT, + msg_depth INT, + msg_depth_low INT, + msg_depth_high INT, + byte_total_enqueues BIGINT, + byte_total_dequeues BIGINT, + byte_txn_enqueues BIGINT, + byte_txn_dequeues BIGINT, + byte_persist_enqueues BIGINT, + byte_persist_dequeues BIGINT, + byte_depth INT, + byte_depth_low INT, + byte_depth_high INT, + enqueue_txn_starts BIGINT, + enqueue_txn_commits BIGINT, + enqueue_txn_rejects BIGINT, + enqueue_txn_count INT, + enqueue_txn_count_low INT, + enqueue_txn_count_high INT, + dequeue_txn_starts BIGINT, + dequeue_txn_commits BIGINT, + dequeue_txn_rejects BIGINT, + dequeue_txn_count INT, + dequeue_txn_count_low INT, + dequeue_txn_count_high INT, + consumers INT, + consumers_low INT, + consumers_high INT, + bindings INT, + bindings_low INT, + bindings_high INT, + unacked_messages INT, + unacked_messages_low INT, + unacked_messages_high INT, + message_latency_min BIGINT, + message_latency_max BIGINT, + message_latency_avg BIGINT +); + +CREATE TABLE session ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT, + vhost_id INT, + name VARCHAR(1000), + channel_id SMALLINT, + client_id INT, + detached_lifespan INT +); + +CREATE TABLE session_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + session_id INT, + attached BOOL, + expire_time BIGINT, + frames_outstanding INT +); + +CREATE TABLE system ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT, + sys_id VARCHAR(1000) +); + +CREATE TABLE system_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + system_id INT +); + +CREATE TABLE vhost ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + creation_time TIMESTAMP, + deletion_time TIMESTAMP, + managed_broker VARCHAR(1000), + stats_curr_id INT, + stats_prev_id INT, + broker_id INT, + name VARCHAR(1000) +); + +CREATE TABLE vhost_stats ( + id SERIAL PRIMARY KEY, + id_original BIGINT, + rec_time TIMESTAMP, + vhost_id INT +); + +ALTER TABLE broker_group_mapping ADD CONSTRAINT broker_registration_id_exists FOREIGN KEY (broker_registration_id) REFERENCES broker_registration (id) ON DELETE CASCADE; + +ALTER TABLE broker_group_mapping ADD CONSTRAINT broker_group_id_exists FOREIGN KEY (broker_group_id) REFERENCES broker_group (id) ON DELETE CASCADE; + +ALTER TABLE broker_registration ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id) REFERENCES broker (id) ON DELETE SET NULL; + +ALTER TABLE broker_registration ADD CONSTRAINT cluster_id_exists FOREIGN KEY (cluster_id) REFERENCES broker_cluster (id) ON DELETE SET NULL; + +ALTER TABLE broker_registration ADD CONSTRAINT profile_id_exists FOREIGN KEY (profile_id) REFERENCES broker_profile (id) ON DELETE SET NULL; + +ALTER TABLE binding ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES binding_stats (id) ON DELETE SET NULL; + +ALTER TABLE binding ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES binding_stats (id) ON DELETE SET NULL; + +ALTER TABLE binding ADD CONSTRAINT exchange_id_exists FOREIGN KEY (exchange_id) REFERENCES exchange (id) ON DELETE SET NULL; + +ALTER TABLE binding ADD CONSTRAINT queue_id_exists FOREIGN KEY (queue_id) REFERENCES queue (id) ON DELETE SET NULL; + +ALTER TABLE binding_stats ADD CONSTRAINT binding_id_exists FOREIGN KEY (binding_id) REFERENCES binding (id) ON DELETE SET NULL; + +ALTER TABLE broker ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES broker_stats (id) ON DELETE SET NULL; + +ALTER TABLE broker ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES broker_stats (id) ON DELETE SET NULL; + +ALTER TABLE broker ADD CONSTRAINT system_id_exists FOREIGN KEY (system_id) REFERENCES system (id) ON DELETE SET NULL; + +ALTER TABLE broker ADD CONSTRAINT registration_id_exists FOREIGN KEY (registration_id) REFERENCES broker_registration (id) ON DELETE SET NULL; + +ALTER TABLE broker_stats ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id) REFERENCES broker (id) ON DELETE SET NULL; + +ALTER TABLE client ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES client_stats (id) ON DELETE SET NULL; + +ALTER TABLE client ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES client_stats (id) ON DELETE SET NULL; + +ALTER TABLE client ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; + +ALTER TABLE client_stats ADD CONSTRAINT client_id_exists FOREIGN KEY (client_id) REFERENCES client (id) ON DELETE SET NULL; + +ALTER TABLE consumer ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES consumer_stats (id) ON DELETE SET NULL; + +ALTER TABLE consumer ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES consumer_stats (id) ON DELETE SET NULL; + +ALTER TABLE consumer ADD CONSTRAINT destination_id_exists FOREIGN KEY (destination_id) REFERENCES destination (id) ON DELETE SET NULL; + +ALTER TABLE consumer ADD CONSTRAINT queue_id_exists FOREIGN KEY (queue_id) REFERENCES queue (id) ON DELETE SET NULL; + +ALTER TABLE consumer_stats ADD CONSTRAINT consumer_id_exists FOREIGN KEY (consumer_id) REFERENCES consumer (id) ON DELETE SET NULL; + +ALTER TABLE destination ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES destination_stats (id) ON DELETE SET NULL; + +ALTER TABLE destination ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES destination_stats (id) ON DELETE SET NULL; + +ALTER TABLE destination ADD CONSTRAINT session_id_exists FOREIGN KEY (session_id) REFERENCES session (id) ON DELETE SET NULL; + +ALTER TABLE destination_stats ADD CONSTRAINT destination_id_exists FOREIGN KEY (destination_id) REFERENCES destination (id) ON DELETE SET NULL; + +ALTER TABLE exchange ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES exchange_stats (id) ON DELETE SET NULL; + +ALTER TABLE exchange ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES exchange_stats (id) ON DELETE SET NULL; + +ALTER TABLE exchange ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; + +ALTER TABLE exchange_stats ADD CONSTRAINT exchange_id_exists FOREIGN KEY (exchange_id) REFERENCES exchange (id) ON DELETE SET NULL; + +ALTER TABLE producer ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES producer_stats (id) ON DELETE SET NULL; + +ALTER TABLE producer ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES producer_stats (id) ON DELETE SET NULL; + +ALTER TABLE producer ADD CONSTRAINT destination_id_exists FOREIGN KEY (destination_id) REFERENCES destination (id) ON DELETE SET NULL; + +ALTER TABLE producer ADD CONSTRAINT exchange_id_exists FOREIGN KEY (exchange_id) REFERENCES exchange (id) ON DELETE SET NULL; + +ALTER TABLE producer_stats ADD CONSTRAINT producer_id_exists FOREIGN KEY (producer_id) REFERENCES producer (id) ON DELETE SET NULL; + +ALTER TABLE queue ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES queue_stats (id) ON DELETE SET NULL; + +ALTER TABLE queue ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES queue_stats (id) ON DELETE SET NULL; + +ALTER TABLE queue ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; + +ALTER TABLE queue_stats ADD CONSTRAINT queue_id_exists FOREIGN KEY (queue_id) REFERENCES queue (id) ON DELETE SET NULL; + +ALTER TABLE session ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES session_stats (id) ON DELETE SET NULL; + +ALTER TABLE session ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES session_stats (id) ON DELETE SET NULL; + +ALTER TABLE session ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; + +ALTER TABLE session ADD CONSTRAINT client_id_exists FOREIGN KEY (client_id) REFERENCES client (id) ON DELETE SET NULL; + +ALTER TABLE session_stats ADD CONSTRAINT session_id_exists FOREIGN KEY (session_id) REFERENCES session (id) ON DELETE SET NULL; + +ALTER TABLE system ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES system_stats (id) ON DELETE SET NULL; + +ALTER TABLE system ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES system_stats (id) ON DELETE SET NULL; + +ALTER TABLE system_stats ADD CONSTRAINT system_id_exists FOREIGN KEY (system_id) REFERENCES system (id) ON DELETE SET NULL; + +ALTER TABLE vhost ADD CONSTRAINT stats_curr_id_exists FOREIGN KEY (stats_curr_id) REFERENCES vhost_stats (id) ON DELETE SET NULL; + +ALTER TABLE vhost ADD CONSTRAINT stats_prev_id_exists FOREIGN KEY (stats_prev_id) REFERENCES vhost_stats (id) ON DELETE SET NULL; + +ALTER TABLE vhost ADD CONSTRAINT broker_id_exists FOREIGN KEY (broker_id) REFERENCES broker (id) ON DELETE SET NULL; + +ALTER TABLE vhost_stats ADD CONSTRAINT vhost_id_exists FOREIGN KEY (vhost_id) REFERENCES vhost (id) ON DELETE SET NULL; + +create index queue_vhost_id_idx on queue (vhost_id); +create index exchange_vhost_id_idx on exchange (vhost_id); +create index client_vhost_id_idx on client (vhost_id); + +create index queue_stats_queue_id_idx on queue_stats (queue_id); +create index exchange_stats_exchange_id_idx on exchange_stats (exchange_id); +create index client_stats_client_id_idx on client_stats (client_id);