Skip to content

Commit 1f01d92

Browse files
author
Alena Prokharchyk
committed
Merge branch 'master' into vpc
2 parents 634cd78 + c410941 commit 1f01d92

1,367 files changed

Lines changed: 153014 additions & 130649 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎awsapi-setup/db/mysql/cloudbridge_bucketpolicy.sql‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
119
USE cloudbridge;
220

321
-- This file (and cloudbridge_policy_alter.sql) can be applied to an existing cloudbridge

‎awsapi-setup/db/mysql/cloudbridge_db.sql‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
119
SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='ANSI';
220

321
DROP DATABASE IF EXISTS cloudbridge;

‎awsapi-setup/db/mysql/cloudbridge_index.sql‎

Lines changed: 64 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,64 @@
1-
USE cloudbridge;
2-
3-
ALTER TABLE shost ADD UNIQUE shost_uq_host(Host, HostType, ExportRoot);
4-
ALTER TABLE shost ADD CONSTRAINT FOREIGN KEY shost_fk_mhost_id(MHostID) REFERENCES mhost(ID);
5-
ALTER TABLE shost ADD INDEX shost_idx_mhost_id(MHostID);
6-
7-
ALTER TABLE sbucket ADD UNIQUE sbucket_uq_name(Name);
8-
ALTER TABLE sbucket ADD CONSTRAINT FOREIGN KEY sbucket_fk_shost_id(SHostID) REFERENCES shost(ID);
9-
ALTER TABLE sbucket ADD INDEX sbucket_idx_shost_id(SHostID);
10-
ALTER TABLE sbucket ADD INDEX sbucket_idx_owner_cid(OwnerCanonicalID);
11-
ALTER TABLE sbucket ADD INDEX sbucket_idx_create_time(CreateTime);
12-
13-
ALTER TABLE sobject ADD CONSTRAINT FOREIGN KEY sobject_fk_sbuckt_id(SBucketID) REFERENCES sbucket(ID) ON DELETE CASCADE;
14-
ALTER TABLE sobject ADD INDEX sobject_idx_bucket_id(SBucketID);
15-
ALTER TABLE sobject ADD INDEX sobject_idx_owner_cid(OwnerCanonicalID);
16-
ALTER TABLE sobject ADD UNIQUE sobject_uq_sbucket_id_name_key(SBucketID, NameKey);
17-
ALTER TABLE sobject ADD INDEX sobject_idx_create_time(CreateTime);
18-
19-
ALTER TABLE sobject_item ADD CONSTRAINT FOREIGN KEY sobject_item_fk_object_id(SObjectID) REFERENCES sobject(ID) ON DELETE CASCADE;
20-
ALTER TABLE sobject_item ADD INDEX sobject_item_idx_object_id(SObjectID);
21-
ALTER TABLE sobject_item ADD UNIQUE sobject_item_uq_sobject_id_version(SObjectID, Version);
22-
ALTER TABLE sobject_item ADD INDEX sobject_item_idx_create_time(CreateTime);
23-
ALTER TABLE sobject_item ADD INDEX sobject_item_idx_modify_time(LastModifiedTime);
24-
ALTER TABLE sobject_item ADD INDEX sobject_item_idx_access_time(LastAccessTime);
25-
ALTER TABLE sobject_item ADD INDEX sobject_item_idx_stored_size(StoredSize);
26-
27-
ALTER TABLE meta ADD UNIQUE meta_uq_target_name(Target, TargetID, Name);
28-
ALTER TABLE meta ADD INDEX meta_idx_target(Target, TargetID);
29-
30-
ALTER TABLE usercredentials ADD UNIQUE usercredentials_mappings1(AccessKey);
31-
ALTER TABLE usercredentials ADD UNIQUE usercredentials_mappings2(CertUniqueId);
32-
ALTER TABLE usercredentials ADD INDEX usercredentials_idx_access(AccessKey);
33-
ALTER TABLE usercredentials ADD INDEX usercredentials_idx_cert(CertUniqueId);
34-
35-
ALTER TABLE acl ADD INDEX acl_idx_target(Target, TargetID);
36-
ALTER TABLE acl ADD INDEX acl_idx_modify_time(LastModifiedTime);
37-
38-
ALTER TABLE mhost ADD UNIQUE mhost_uq_host(Host);
39-
ALTER TABLE mhost ADD INDEX mhost_idx_mhost_key(MHostKey);
40-
ALTER TABLE mhost ADD INDEX mhost_idx_heartbeat_time(LastHeartbeatTime);
41-
42-
ALTER TABLE mhost_mount ADD UNIQUE mhost_mnt_uq_mhost_shost(MHostID, SHostID);
43-
ALTER TABLE mhost_mount ADD CONSTRAINT FOREIGN KEY mhost_mnt_fk_mhost_id(MHostID) REFERENCES mhost(ID) ON DELETE CASCADE;
44-
ALTER TABLE mhost_mount ADD CONSTRAINT FOREIGN KEY mhost_mnt_fk_shost_id(SHostID) REFERENCES shost(ID) ON DELETE CASCADE;
45-
ALTER TABLE mhost_mount ADD INDEX mhost_mnt_idx_mhost_id(MHostID);
46-
ALTER TABLE mhost_mount ADD INDEX mhost_mnt_idx_shost_id(SHostID);
47-
ALTER TABLE mhost_mount ADD INDEX mhost_mnt_idx_mount_time(LastMountTime);
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
USE cloudbridge;
19+
20+
ALTER TABLE shost ADD UNIQUE shost_uq_host(Host, HostType, ExportRoot);
21+
ALTER TABLE shost ADD CONSTRAINT FOREIGN KEY shost_fk_mhost_id(MHostID) REFERENCES mhost(ID);
22+
ALTER TABLE shost ADD INDEX shost_idx_mhost_id(MHostID);
23+
24+
ALTER TABLE sbucket ADD UNIQUE sbucket_uq_name(Name);
25+
ALTER TABLE sbucket ADD CONSTRAINT FOREIGN KEY sbucket_fk_shost_id(SHostID) REFERENCES shost(ID);
26+
ALTER TABLE sbucket ADD INDEX sbucket_idx_shost_id(SHostID);
27+
ALTER TABLE sbucket ADD INDEX sbucket_idx_owner_cid(OwnerCanonicalID);
28+
ALTER TABLE sbucket ADD INDEX sbucket_idx_create_time(CreateTime);
29+
30+
ALTER TABLE sobject ADD CONSTRAINT FOREIGN KEY sobject_fk_sbuckt_id(SBucketID) REFERENCES sbucket(ID) ON DELETE CASCADE;
31+
ALTER TABLE sobject ADD INDEX sobject_idx_bucket_id(SBucketID);
32+
ALTER TABLE sobject ADD INDEX sobject_idx_owner_cid(OwnerCanonicalID);
33+
ALTER TABLE sobject ADD UNIQUE sobject_uq_sbucket_id_name_key(SBucketID, NameKey);
34+
ALTER TABLE sobject ADD INDEX sobject_idx_create_time(CreateTime);
35+
36+
ALTER TABLE sobject_item ADD CONSTRAINT FOREIGN KEY sobject_item_fk_object_id(SObjectID) REFERENCES sobject(ID) ON DELETE CASCADE;
37+
ALTER TABLE sobject_item ADD INDEX sobject_item_idx_object_id(SObjectID);
38+
ALTER TABLE sobject_item ADD UNIQUE sobject_item_uq_sobject_id_version(SObjectID, Version);
39+
ALTER TABLE sobject_item ADD INDEX sobject_item_idx_create_time(CreateTime);
40+
ALTER TABLE sobject_item ADD INDEX sobject_item_idx_modify_time(LastModifiedTime);
41+
ALTER TABLE sobject_item ADD INDEX sobject_item_idx_access_time(LastAccessTime);
42+
ALTER TABLE sobject_item ADD INDEX sobject_item_idx_stored_size(StoredSize);
43+
44+
ALTER TABLE meta ADD UNIQUE meta_uq_target_name(Target, TargetID, Name);
45+
ALTER TABLE meta ADD INDEX meta_idx_target(Target, TargetID);
46+
47+
ALTER TABLE usercredentials ADD UNIQUE usercredentials_mappings1(AccessKey);
48+
ALTER TABLE usercredentials ADD UNIQUE usercredentials_mappings2(CertUniqueId);
49+
ALTER TABLE usercredentials ADD INDEX usercredentials_idx_access(AccessKey);
50+
ALTER TABLE usercredentials ADD INDEX usercredentials_idx_cert(CertUniqueId);
51+
52+
ALTER TABLE acl ADD INDEX acl_idx_target(Target, TargetID);
53+
ALTER TABLE acl ADD INDEX acl_idx_modify_time(LastModifiedTime);
54+
55+
ALTER TABLE mhost ADD UNIQUE mhost_uq_host(Host);
56+
ALTER TABLE mhost ADD INDEX mhost_idx_mhost_key(MHostKey);
57+
ALTER TABLE mhost ADD INDEX mhost_idx_heartbeat_time(LastHeartbeatTime);
58+
59+
ALTER TABLE mhost_mount ADD UNIQUE mhost_mnt_uq_mhost_shost(MHostID, SHostID);
60+
ALTER TABLE mhost_mount ADD CONSTRAINT FOREIGN KEY mhost_mnt_fk_mhost_id(MHostID) REFERENCES mhost(ID) ON DELETE CASCADE;
61+
ALTER TABLE mhost_mount ADD CONSTRAINT FOREIGN KEY mhost_mnt_fk_shost_id(SHostID) REFERENCES shost(ID) ON DELETE CASCADE;
62+
ALTER TABLE mhost_mount ADD INDEX mhost_mnt_idx_mhost_id(MHostID);
63+
ALTER TABLE mhost_mount ADD INDEX mhost_mnt_idx_shost_id(SHostID);
64+
ALTER TABLE mhost_mount ADD INDEX mhost_mnt_idx_mount_time(LastMountTime);

‎awsapi-setup/db/mysql/cloudbridge_multipart.sql‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
118
USE cloudbridge;
219

320
-- This file can be applied to an existing cloudbridge database. It is used

‎awsapi-setup/db/mysql/cloudbridge_multipart_alter.sql‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
119
USE cloudbridge;
220

321
ALTER TABLE multipart_meta ADD CONSTRAINT FOREIGN KEY meta_uploads_id(UploadID) REFERENCES multipart_uploads(ID) ON DELETE CASCADE;

‎awsapi-setup/db/mysql/cloudbridge_offering.sql‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
119
USE cloudbridge;
220

321
-- This file (and cloudbridge_offering_alter.sql) can be applied to an existing cloudbridge

‎awsapi-setup/db/mysql/cloudbridge_offering_alter.sql‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
119
USE cloudbridge;
220

321
ALTER TABLE offering_bundle ADD UNIQUE one_offering (AmazonEC2Offering);

‎awsapi-setup/db/mysql/cloudbridge_policy_alter.sql‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
-- Licensed to the Apache Software Foundation (ASF) under one
2+
-- or more contributor license agreements. See the NOTICE file
3+
-- distributed with this work for additional information
4+
-- regarding copyright ownership. The ASF licenses this file
5+
-- to you under the Apache License, Version 2.0 (the
6+
-- "License"); you may not use this file except in compliance
7+
-- with the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing,
12+
-- software distributed under the License is distributed on an
13+
-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
-- KIND, either express or implied. See the License for the
15+
-- specific language governing permissions and limitations
16+
-- under the License.
17+
18+
119
USE cloudbridge;
220

321
ALTER TABLE bucket_policies ADD UNIQUE one_policy_per_bucket(BucketName);

0 commit comments

Comments
 (0)