etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 11344: Added constarints on usage helper tables. Added corresponding alter queries in upgrade script 

status 11344: resolved fixed
Reviewed-by: Nitin
This commit is contained in:
kishan 2011-09-16 18:20:07 +05:30
parent 554978de37
commit d9a501deac
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
setup/db/create-schema-premium.sql
View File

@ -64,7 +64,8 @@ CREATE TABLE `cloud_usage`.`usage_vm_instance` (
`template_id` bigint unsigned NOT NULL,
`hypervisor_type` varchar(255),
`start_date` DATETIME NOT NULL,
`end_date` DATETIME NULL
`end_date` DATETIME NULL,
UNIQUE KEY (`vm_instance_id`, `usage_type`, `start_date`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `cloud_usage`.`usage_vm_instance` ADD INDEX `i_usage_vm_instance__account_id`(`account_id`);
@ -95,7 +96,8 @@ CREATE TABLE `cloud_usage`.`usage_ip_address` (
`public_ip_address` varchar(15) NOT NULL,
`is_source_nat` smallint(1) NOT NULL,
`assigned` DATETIME NOT NULL,
`released` DATETIME NULL
`released` DATETIME NULL,
UNIQUE KEY (`id`, `assigned`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `cloud_usage`.`usage_ip_address` ADD INDEX `i_usage_ip_address__account_id`(`account_id`);
@ -159,7 +161,8 @@ CREATE TABLE `cloud_usage`.`usage_volume` (
`template_id` bigint unsigned,
`size` bigint unsigned,
`created` DATETIME NOT NULL,
`deleted` DATETIME NULL
`deleted` DATETIME NULL,
UNIQUE KEY (`id`, `created`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `cloud_usage`.`usage_volume` ADD INDEX `i_usage_volume__account_id`(`account_id`);
@ -175,7 +178,8 @@ CREATE TABLE `cloud_usage`.`usage_storage` (
`source_id` bigint unsigned,
`size` bigint unsigned NOT NULL,
`created` DATETIME NOT NULL,
`deleted` DATETIME NULL
`deleted` DATETIME NULL,
UNIQUE KEY (`id`, `storage_type`, `zone_id`, `created`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `cloud_usage`.`usage_storage` ADD INDEX `i_usage_storage__account_id`(`account_id`);
@ -199,7 +203,8 @@ CREATE TABLE `cloud_usage`.`usage_load_balancer_policy` (
`account_id` bigint unsigned NOT NULL,
`domain_id` bigint unsigned NOT NULL,
`created` DATETIME NOT NULL,
`deleted` DATETIME NULL
`deleted` DATETIME NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `cloud_usage`.`usage_load_balancer_policy` ADD INDEX `i_usage_load_balancer_policy__account_id`(`account_id`);
@ -230,7 +235,8 @@ CREATE TABLE `cloud_usage`.`usage_port_forwarding` (
`account_id` bigint unsigned NOT NULL,
`domain_id` bigint unsigned NOT NULL,
`created` DATETIME NOT NULL,
`deleted` DATETIME NULL
`deleted` DATETIME NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `cloud_usage`.`usage_port_forwarding` ADD INDEX `i_usage_port_forwarding__account_id`(`account_id`);
@ -245,7 +251,8 @@ CREATE TABLE `cloud_usage`.`usage_network_offering` (
`network_offering_id` bigint unsigned NOT NULL,
`is_default` smallint(1) NOT NULL,
`created` DATETIME NOT NULL,
`deleted` DATETIME NULL
`deleted` DATETIME NULL,
UNIQUE KEY (`network_offering_id`, `vm_instance_id`, `created`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
ALTER TABLE `cloud_usage`.`usage_network_offering` ADD INDEX `i_usage_network_offering__account_id`(`account_id`);

8
setup/db/db/schema-2211to2212-premium.sql
View File

@ -38,3 +38,11 @@ ALTER TABLE `cloud_usage`.`usage_port_forwarding` ADD INDEX `i_usage_port_forwar
ALTER TABLE `cloud_usage`.`usage_network_offering` ADD INDEX `i_usage_network_offering__account_id`(`account_id`);
ALTER TABLE `cloud_usage`.`usage_network_offering` ADD INDEX `i_usage_network_offering__created`(`created`);
ALTER TABLE `cloud_usage`.`usage_network_offering` ADD INDEX `i_usage_network_offering__deleted`(`deleted`);
ALTER IGNORE TABLE `cloud_usage`.`usage_vm_instance` ADD UNIQUE (`vm_instance_id`, `usage_type`, `start_date`);
ALTER IGNORE TABLE `cloud_usage`.`usage_ip_address` ADD UNIQUE (`id`, `assigned`);
ALTER IGNORE TABLE `cloud_usage`.`usage_volume` ADD UNIQUE (`id`, `created`);
ALTER IGNORE TABLE `cloud_usage`.`usage_storage` ADD UNIQUE (`id`, `storage_type`, `zone_id`, `created`);
ALTER TABLE `cloud_usage`.`usage_load_balancer_policy` ADD PRIMARY KEY (`id`);
ALTER TABLE `cloud_usage`.`usage_port_forwarding` ADD PRIMARY KEY (`id`);
ALTER IGNORE TABLE `cloud_usage`.`usage_network_offering` ADD UNIQUE (`network_offering_id`, `vm_instance_id`, `created`);