From e953ee704592dab1124a0403cd56f126c0e6a2bc Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Fri, 22 Jul 2011 14:47:10 -0700 Subject: [PATCH] Added a bunch of indexes for different removed fields --- setup/db/create-index-fk.sql | 5 ----- setup/db/create-schema.sql | 40 ++++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/setup/db/create-index-fk.sql b/setup/db/create-index-fk.sql index be791588b56..e52499db7bf 100755 --- a/setup/db/create-index-fk.sql +++ b/setup/db/create-index-fk.sql @@ -8,7 +8,6 @@ ALTER TABLE `cloud`.`storage_pool_details` ADD CONSTRAINT `fk_storage_pool_detai ALTER TABLE `cloud`.`storage_pool_details` ADD INDEX `i_storage_pool_details__name__value`(`name`(128), `value`(128)); ALTER TABLE `cloud`.`user` ADD INDEX `i_user__secret_key_removed`(`secret_key`, `removed`); -ALTER TABLE `cloud`.`user` ADD INDEX `i_user__removed`(`removed`); ALTER TABLE `cloud`.`user` ADD UNIQUE `i_user__api_key`(`api_key`); ALTER TABLE `cloud`.`user` ADD CONSTRAINT `fk_user__account_id` FOREIGN KEY `fk_user__account_id` (`account_id`) REFERENCES `account` (`id`) ON DELETE CASCADE; ALTER TABLE `cloud`.`user` ADD INDEX `i_user__account_id`(`account_id`); @@ -17,7 +16,6 @@ ALTER TABLE `cloud`.`account` ADD CONSTRAINT `fk_account__domain_id` FOREIGN KEY ALTER TABLE `cloud`.`account` ADD INDEX `i_account__domain_id`(`domain_id`); ALTER TABLE `cloud`.`account` ADD INDEX `i_account__cleanup_needed`(`cleanup_needed`); -ALTER TABLE `cloud`.`account` ADD INDEX `i_account__removed`(`removed`); ALTER TABLE `cloud`.`account` ADD INDEX `i_account__account_name__domain_id__removed`(`account_name`, `domain_id`, `removed`); ALTER TABLE `cloud`.`resource_limit` ADD CONSTRAINT `fk_resource_limit__domain_id` FOREIGN KEY `fk_resource_limit__domain_id` (`domain_id`) REFERENCES `domain` (`id`) ON DELETE CASCADE; @@ -31,7 +29,6 @@ ALTER TABLE `cloud`.`event` ADD INDEX `i_event__account_id` (`account_id`); ALTER TABLE `cloud`.`event` ADD INDEX `i_event__level_id`(`level`); ALTER TABLE `cloud`.`event` ADD INDEX `i_event__type_id`(`type`); -ALTER TABLE `cloud`.`vm_template` ADD INDEX `i_vm_template__removed`(`removed`); ALTER TABLE `cloud`.`vm_template` ADD INDEX `i_vm_template__public`(`public`); @@ -47,7 +44,6 @@ ALTER TABLE `cloud`.`user_statistics` ADD INDEX `i_user_statistics__account_id_d ALTER TABLE `cloud`.`snapshots` ADD CONSTRAINT `fk_snapshots__account_id` FOREIGN KEY `fk_snapshots__account_id` (`account_id`) REFERENCES `account` (`id`); ALTER TABLE `cloud`.`snapshots` ADD INDEX `i_snapshots__account_id`(`account_id`); ALTER TABLE `cloud`.`snapshots` ADD INDEX `i_snapshots__volume_id`(`volume_id`); -ALTER TABLE `cloud`.`snapshots` ADD INDEX `i_snapshots__removed`(`removed`); ALTER TABLE `cloud`.`snapshots` ADD INDEX `i_snapshots__name`(`name`); ALTER TABLE `cloud`.`snapshots` ADD INDEX `i_snapshots__snapshot_type`(`snapshot_type`); ALTER TABLE `cloud`.`snapshots` ADD INDEX `i_snapshots__prev_snap_id`(`prev_snap_id`); @@ -71,7 +67,6 @@ ALTER TABLE `cloud`.`async_job` ADD INDEX `i_async__job_cmd`(`job_cmd`); ALTER TABLE `cloud`.`async_job` ADD INDEX `i_async__created`(`created`); ALTER TABLE `cloud`.`async_job` ADD INDEX `i_async__last_updated`(`last_updated`); ALTER TABLE `cloud`.`async_job` ADD INDEX `i_async__last_poll`(`last_polled`); -ALTER TABLE `cloud`.`async_job` ADD INDEX `i_async__removed`(`removed`); ALTER TABLE `cloud`.`sync_queue` ADD UNIQUE `i_sync_queue__objtype__objid`(`sync_objtype`, `sync_objid`); ALTER TABLE `cloud`.`sync_queue` ADD INDEX `i_sync_queue__created`(`created`); diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index 622c123a1d3..4c0b27b19f1 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -285,7 +285,8 @@ CREATE TABLE `cloud`.`cluster` ( CONSTRAINT `fk_cluster__data_center_id` FOREIGN KEY (`data_center_id`) REFERENCES `cloud`.`data_center`(`id`) ON DELETE CASCADE, CONSTRAINT `fk_cluster__pod_id` FOREIGN KEY (`pod_id`) REFERENCES `cloud`.`host_pod_ref`(`id`), UNIQUE `i_cluster__pod_id__name`(`pod_id`, `name`), - INDEX `i_cluster__allocation_state`(`allocation_state`) + INDEX `i_cluster__allocation_state`(`allocation_state`), + INDEX `i_cluster__removed`(`removed`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`cluster_details` ( @@ -498,7 +499,8 @@ CREATE TABLE `cloud`.`data_center` ( CONSTRAINT `fk_data_center__domain_id` FOREIGN KEY (`domain_id`) REFERENCES `domain`(`id`), INDEX `i_data_center__domain_id`(`domain_id`), INDEX `i_data_center__allocation_state`(`allocation_state`), - INDEX `i_data_center__zone_token`(`zone_token`) + INDEX `i_data_center__zone_token`(`zone_token`), + INDEX `i_data_center__removed`(`removed`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`op_dc_ip_address_alloc` ( @@ -546,7 +548,9 @@ CREATE TABLE `cloud`.`host_pod_ref` ( PRIMARY KEY (`id`), UNIQUE KEY (`name`, `data_center_id`), INDEX `i_host_pod_ref__data_center_id`(`data_center_id`), - INDEX `i_host_pod_ref__allocation_state`(`allocation_state`) + INDEX `i_host_pod_ref__allocation_state`(`allocation_state`), + INDEX `i_host_pod_ref__removed`(`removed`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`op_dc_vnet_alloc` ( @@ -704,7 +708,8 @@ CREATE TABLE `cloud`.`mshost` ( `last_update` DATETIME NULL COMMENT 'Last record update time', `removed` datetime COMMENT 'date removed if not null', `alert_count` integer NOT NULL DEFAULT 0, - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + INDEX `i_mshost__removed`(`removed`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`host_tags` ( @@ -731,7 +736,8 @@ CREATE TABLE `cloud`.`user` ( `timezone` varchar(30) default NULL, `registration_token` varchar(255) default NULL, `is_registered` tinyint NOT NULL DEFAULT 0 COMMENT '1: yes, 0: no', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + INDEX `i_user__removed`(`removed`) ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`event` ( @@ -816,7 +822,8 @@ CREATE TABLE `cloud`.`vm_template` ( `extractable` int(1) unsigned NOT NULL default 1 COMMENT 'Is this template extractable', `hypervisor_type` varchar(32) COMMENT 'hypervisor that the template belongs to', `source_template_id` bigint unsigned COMMENT 'Id of the original template, if this template is created from snapshot', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + INDEX `i_vm_template__removed`(`removed`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`vm_instance` ( @@ -952,7 +959,8 @@ CREATE TABLE `cloud`.`template_zone_ref` ( CONSTRAINT `fk_template_zone_ref__zone_id` FOREIGN KEY `fk_template_zone_ref__zone_id` (`zone_id`) REFERENCES `data_center` (`id`) ON DELETE CASCADE, INDEX `i_template_zone_ref__zone_id`(`zone_id`), CONSTRAINT `fk_template_zone_ref__template_id` FOREIGN KEY `fk_template_zone_ref__template_id` (`template_id`) REFERENCES `vm_template` (`id`) ON DELETE CASCADE, - INDEX `i_template_zone_ref__template_id`(`template_id`) + INDEX `i_template_zone_ref__template_id`(`template_id`), + INDEX `i_template_zone_ref__removed`(`removed`) ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`console_proxy` ( @@ -993,7 +1001,8 @@ CREATE TABLE `cloud`.`domain` ( `state` char(32) NOT NULL default 'Active' COMMENT 'state of the domain', PRIMARY KEY (`id`), UNIQUE (parent, name, removed), - INDEX `i_domain__path`(`path`) + INDEX `i_domain__path`(`path`), + INDEX `i_domain__removed`(`removed`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`account` ( @@ -1004,7 +1013,8 @@ CREATE TABLE `cloud`.`account` ( `state` varchar(10) NOT NULL default 'enabled', `removed` datetime COMMENT 'date removed', `cleanup_needed` tinyint(1) NOT NULL default '0', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + INDEX i_account__removed(`removed`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`resource_limit` ( @@ -1078,7 +1088,8 @@ CREATE TABLE `cloud`.`async_job` ( `last_updated` datetime COMMENT 'date created', `last_polled` datetime COMMENT 'date polled', `removed` datetime COMMENT 'date removed', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + INDEX `i_async_job__removed`(`removed`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`sync_queue` ( @@ -1130,7 +1141,8 @@ CREATE TABLE `cloud`.`disk_offering` ( `customized` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '0 implies not customized by default', `removed` datetime COMMENT 'date removed', `created` datetime COMMENT 'date the disk offering was created', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + INDEX `i_disk_offering__removed`(`removed`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`service_offering` ( @@ -1206,7 +1218,8 @@ CREATE TABLE `cloud`.`storage_pool` ( `removed` datetime COMMENT 'date removed if not null', `update_time` DATETIME, `status` varchar(32), - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + INDEX `i_storage_pool__removed`(`removed`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`storage_pool_details` ( @@ -1362,7 +1375,8 @@ CREATE TABLE `cloud`.`instance_group` ( `name` varchar(255) NOT NULL, `removed` datetime COMMENT 'date the group was removed', `created` datetime COMMENT 'date the group was created', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + INDEX `i_instance_group__removed`(`removed`) ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`instance_group_vm_map` (