diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 113903d9c016284fbfe40c5dfde5bbb17af046cd..e54751a8523a881635d6ed8ef335fb952cd4e502 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -28,6 +28,7 @@ Please consult the [database upgrade documentation](https://eoscta.docs.cern.ch/ - cta/CTA#1172 - Add disabled reason column to logical library table - cta/CTA#1177 - Fix CTA catalogue schema verify index checker for PostgreSQL - cta/CTA#1147 - Add foreign key constraint between the disk instance name of a vo and the disk instance table +- cta/CTA#1151 - Drop ACTIVITY_WEIGHTS and TAPE_DRIVE tables ### Continuous Integration diff --git a/catalogue/10.0/oracle_catalogue_schema.sql b/catalogue/10.0/oracle_catalogue_schema.sql index 7b9e33d2506370dfd61a9f692d78ac4417ea1bf8..554c9b2aec38e2554fbb1553ed1bdbaad58a199e 100644 --- a/catalogue/10.0/oracle_catalogue_schema.sql +++ b/catalogue/10.0/oracle_catalogue_schema.sql @@ -411,18 +411,6 @@ CREATE TABLE TAPE_FILE( ); CREATE INDEX TAPE_FILE_VID_IDX ON TAPE_FILE(VID); CREATE INDEX TAPE_FILE_ARCHIVE_FILE_ID_IDX ON TAPE_FILE(ARCHIVE_FILE_ID); -CREATE TABLE ACTIVITIES_WEIGHTS ( - DISK_INSTANCE_NAME VARCHAR2(100), - ACTIVITY VARCHAR2(100), - WEIGHT VARCHAR2(100), - USER_COMMENT VARCHAR2(1000) CONSTRAINT ACTIV_WEIGHTS_UC_NN NOT NULL, - CREATION_LOG_USER_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_CLUN_NN NOT NULL, - CREATION_LOG_HOST_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_CLHN_NN NOT NULL, - CREATION_LOG_TIME NUMERIC(20, 0) CONSTRAINT ACTIV_WEIGHTS_CLT_NN NOT NULL, - LAST_UPDATE_USER_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_LUUN_NN NOT NULL, - LAST_UPDATE_HOST_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_LUHN_NN NOT NULL, - LAST_UPDATE_TIME NUMERIC(20, 0) CONSTRAINT ACTIV_WEIGHTS_LUT_NN NOT NULL -); CREATE TABLE FILE_RECYCLE_LOG( FILE_RECYCLE_LOG_ID NUMERIC(20, 0) CONSTRAINT FILE_RECYCLE_LOG_ID_NN NOT NULL, VID VARCHAR2(100) CONSTRAINT FILE_RECYCLE_LOG_VID_NN NOT NULL, diff --git a/catalogue/10.0/postgres_catalogue_schema.sql b/catalogue/10.0/postgres_catalogue_schema.sql index 8e4e8537100993a582cb13de35158fcf111ed880..be0ecc047933bcc57d26b13a734e520e95ff111b 100644 --- a/catalogue/10.0/postgres_catalogue_schema.sql +++ b/catalogue/10.0/postgres_catalogue_schema.sql @@ -393,18 +393,6 @@ CREATE TABLE TAPE_FILE( ); CREATE INDEX TAPE_FILE_VID_IDX ON TAPE_FILE(VID); CREATE INDEX TAPE_FILE_ARCHIVE_FILE_ID_IDX ON TAPE_FILE(ARCHIVE_FILE_ID); -CREATE TABLE ACTIVITIES_WEIGHTS ( - DISK_INSTANCE_NAME VARCHAR(100), - ACTIVITY VARCHAR(100), - WEIGHT VARCHAR(100), - USER_COMMENT VARCHAR(1000) CONSTRAINT ACTIV_WEIGHTS_UC_NN NOT NULL, - CREATION_LOG_USER_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_CLUN_NN NOT NULL, - CREATION_LOG_HOST_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_CLHN_NN NOT NULL, - CREATION_LOG_TIME NUMERIC(20, 0) CONSTRAINT ACTIV_WEIGHTS_CLT_NN NOT NULL, - LAST_UPDATE_USER_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_LUUN_NN NOT NULL, - LAST_UPDATE_HOST_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_LUHN_NN NOT NULL, - LAST_UPDATE_TIME NUMERIC(20, 0) CONSTRAINT ACTIV_WEIGHTS_LUT_NN NOT NULL -); CREATE TABLE FILE_RECYCLE_LOG( FILE_RECYCLE_LOG_ID NUMERIC(20, 0) CONSTRAINT FILE_RECYCLE_LOG_ID_NN NOT NULL, VID VARCHAR(100) CONSTRAINT FILE_RECYCLE_LOG_VID_NN NOT NULL, diff --git a/catalogue/10.0/sqlite_catalogue_schema.sql b/catalogue/10.0/sqlite_catalogue_schema.sql index 315b482d7420570e0e49c8affdf07d16bda43dd0..cb623261be104dc713c2a2a518bef5ad91b65fcb 100644 --- a/catalogue/10.0/sqlite_catalogue_schema.sql +++ b/catalogue/10.0/sqlite_catalogue_schema.sql @@ -365,18 +365,6 @@ CREATE TABLE TAPE_FILE( ); CREATE INDEX TAPE_FILE_VID_IDX ON TAPE_FILE(VID); CREATE INDEX TAPE_FILE_ARCHIVE_FILE_ID_IDX ON TAPE_FILE(ARCHIVE_FILE_ID); -CREATE TABLE ACTIVITIES_WEIGHTS ( - DISK_INSTANCE_NAME VARCHAR(100), - ACTIVITY VARCHAR(100), - WEIGHT VARCHAR(100), - USER_COMMENT VARCHAR(1000) CONSTRAINT ACTIV_WEIGHTS_UC_NN NOT NULL, - CREATION_LOG_USER_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_CLUN_NN NOT NULL, - CREATION_LOG_HOST_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_CLHN_NN NOT NULL, - CREATION_LOG_TIME INTEGER CONSTRAINT ACTIV_WEIGHTS_CLT_NN NOT NULL, - LAST_UPDATE_USER_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_LUUN_NN NOT NULL, - LAST_UPDATE_HOST_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_LUHN_NN NOT NULL, - LAST_UPDATE_TIME INTEGER CONSTRAINT ACTIV_WEIGHTS_LUT_NN NOT NULL -); CREATE TABLE FILE_RECYCLE_LOG( FILE_RECYCLE_LOG_ID INTEGER CONSTRAINT FILE_RECYCLE_LOG_ID_NN NOT NULL, VID VARCHAR(100) CONSTRAINT FILE_RECYCLE_LOG_VID_NN NOT NULL, diff --git a/catalogue/AllCatalogueSchema.hpp b/catalogue/AllCatalogueSchema.hpp index 087a02c78dbca3027b124cfd37426fdcbd899f07..cf46e2e01648c21a6cda9ad791b5ab0c95cdcdf7 100644 --- a/catalogue/AllCatalogueSchema.hpp +++ b/catalogue/AllCatalogueSchema.hpp @@ -1345,18 +1345,6 @@ namespace catalogue{ ");" "CREATE INDEX TAPE_FILE_VID_IDX ON TAPE_FILE(VID);" "CREATE INDEX TAPE_FILE_ARCHIVE_FILE_ID_IDX ON TAPE_FILE(ARCHIVE_FILE_ID);" - "CREATE TABLE ACTIVITIES_WEIGHTS (" - " DISK_INSTANCE_NAME VARCHAR2(100)," - " ACTIVITY VARCHAR2(100)," - " WEIGHT VARCHAR2(100)," - " USER_COMMENT VARCHAR2(1000) CONSTRAINT ACTIV_WEIGHTS_UC_NN NOT NULL," - " CREATION_LOG_USER_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_CLUN_NN NOT NULL," - " CREATION_LOG_HOST_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_CLHN_NN NOT NULL," - " CREATION_LOG_TIME NUMERIC(20, 0) CONSTRAINT ACTIV_WEIGHTS_CLT_NN NOT NULL," - " LAST_UPDATE_USER_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_LUUN_NN NOT NULL," - " LAST_UPDATE_HOST_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_LUHN_NN NOT NULL," - " LAST_UPDATE_TIME NUMERIC(20, 0) CONSTRAINT ACTIV_WEIGHTS_LUT_NN NOT NULL" - ");" "CREATE TABLE FILE_RECYCLE_LOG(" " FILE_RECYCLE_LOG_ID NUMERIC(20, 0) CONSTRAINT FILE_RECYCLE_LOG_ID_NN NOT NULL," " VID VARCHAR2(100) CONSTRAINT FILE_RECYCLE_LOG_VID_NN NOT NULL," @@ -1834,18 +1822,6 @@ namespace catalogue{ ");" "CREATE INDEX TAPE_FILE_VID_IDX ON TAPE_FILE(VID);" "CREATE INDEX TAPE_FILE_ARCHIVE_FILE_ID_IDX ON TAPE_FILE(ARCHIVE_FILE_ID);" - "CREATE TABLE ACTIVITIES_WEIGHTS (" - " DISK_INSTANCE_NAME VARCHAR(100)," - " ACTIVITY VARCHAR(100)," - " WEIGHT VARCHAR(100)," - " USER_COMMENT VARCHAR(1000) CONSTRAINT ACTIV_WEIGHTS_UC_NN NOT NULL," - " CREATION_LOG_USER_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_CLUN_NN NOT NULL," - " CREATION_LOG_HOST_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_CLHN_NN NOT NULL," - " CREATION_LOG_TIME INTEGER CONSTRAINT ACTIV_WEIGHTS_CLT_NN NOT NULL," - " LAST_UPDATE_USER_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_LUUN_NN NOT NULL," - " LAST_UPDATE_HOST_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_LUHN_NN NOT NULL," - " LAST_UPDATE_TIME INTEGER CONSTRAINT ACTIV_WEIGHTS_LUT_NN NOT NULL" - ");" "CREATE TABLE FILE_RECYCLE_LOG(" " FILE_RECYCLE_LOG_ID INTEGER CONSTRAINT FILE_RECYCLE_LOG_ID_NN NOT NULL," " VID VARCHAR(100) CONSTRAINT FILE_RECYCLE_LOG_VID_NN NOT NULL," @@ -2348,18 +2324,6 @@ namespace catalogue{ ");" "CREATE INDEX TAPE_FILE_VID_IDX ON TAPE_FILE(VID);" "CREATE INDEX TAPE_FILE_ARCHIVE_FILE_ID_IDX ON TAPE_FILE(ARCHIVE_FILE_ID);" - "CREATE TABLE ACTIVITIES_WEIGHTS (" - " DISK_INSTANCE_NAME VARCHAR(100)," - " ACTIVITY VARCHAR(100)," - " WEIGHT VARCHAR(100)," - " USER_COMMENT VARCHAR(1000) CONSTRAINT ACTIV_WEIGHTS_UC_NN NOT NULL," - " CREATION_LOG_USER_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_CLUN_NN NOT NULL," - " CREATION_LOG_HOST_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_CLHN_NN NOT NULL," - " CREATION_LOG_TIME NUMERIC(20, 0) CONSTRAINT ACTIV_WEIGHTS_CLT_NN NOT NULL," - " LAST_UPDATE_USER_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_LUUN_NN NOT NULL," - " LAST_UPDATE_HOST_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_LUHN_NN NOT NULL," - " LAST_UPDATE_TIME NUMERIC(20, 0) CONSTRAINT ACTIV_WEIGHTS_LUT_NN NOT NULL" - ");" "CREATE TABLE FILE_RECYCLE_LOG(" " FILE_RECYCLE_LOG_ID NUMERIC(20, 0) CONSTRAINT FILE_RECYCLE_LOG_ID_NN NOT NULL," " VID VARCHAR(100) CONSTRAINT FILE_RECYCLE_LOG_VID_NN NOT NULL," diff --git a/catalogue/common_catalogue_schema.sql b/catalogue/common_catalogue_schema.sql index 09aa3972ad4e00501687ea1e13e6fd646223b431..708f0ca0d05e2436f3f4b3784e0191bab76ff56f 100644 --- a/catalogue/common_catalogue_schema.sql +++ b/catalogue/common_catalogue_schema.sql @@ -344,18 +344,6 @@ CREATE TABLE TAPE_FILE( ); CREATE INDEX TAPE_FILE_VID_IDX ON TAPE_FILE(VID); CREATE INDEX TAPE_FILE_ARCHIVE_FILE_ID_IDX ON TAPE_FILE(ARCHIVE_FILE_ID); -CREATE TABLE ACTIVITIES_WEIGHTS ( - DISK_INSTANCE_NAME VARCHAR(100), - ACTIVITY VARCHAR(100), - WEIGHT VARCHAR(100), - USER_COMMENT VARCHAR(1000) CONSTRAINT ACTIV_WEIGHTS_UC_NN NOT NULL, - CREATION_LOG_USER_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_CLUN_NN NOT NULL, - CREATION_LOG_HOST_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_CLHN_NN NOT NULL, - CREATION_LOG_TIME UINT64TYPE CONSTRAINT ACTIV_WEIGHTS_CLT_NN NOT NULL, - LAST_UPDATE_USER_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_LUUN_NN NOT NULL, - LAST_UPDATE_HOST_NAME VARCHAR(100) CONSTRAINT ACTIV_WEIGHTS_LUHN_NN NOT NULL, - LAST_UPDATE_TIME UINT64TYPE CONSTRAINT ACTIV_WEIGHTS_LUT_NN NOT NULL -); CREATE TABLE FILE_RECYCLE_LOG( FILE_RECYCLE_LOG_ID UINT64TYPE CONSTRAINT FILE_RECYCLE_LOG_ID_NN NOT NULL, VID VARCHAR(100) CONSTRAINT FILE_RECYCLE_LOG_VID_NN NOT NULL, diff --git a/catalogue/migrations/liquibase/oracle/4.6to10.0.sql b/catalogue/migrations/liquibase/oracle/4.6to10.0.sql index 3227a2e3d3344eb2581160bccc6ebb06a96efe4a..632355a923b1a3801d9cc5ae98df98f3ba2b72b0 100644 --- a/catalogue/migrations/liquibase/oracle/4.6to10.0.sql +++ b/catalogue/migrations/liquibase/oracle/4.6to10.0.sql @@ -196,10 +196,26 @@ CREATE INDEX REQ_GRP_MNT_RULE_DIN_IDX ON REQUESTER_GROUP_MOUNT_RULE(DISK_INSTANC ALTER TABLE ARCHIVE_FILE ADD CONSTRAINT ARCHIVE_FILE_DIN_FK FOREIGN KEY(DISK_INSTANCE_NAME) REFERENCES DISK_INSTANCE(DISK_INSTANCE_NAME); --rollback ALTER TABLE ARCHIVE_FILE DROP CONSTRAINT ARCHIVE_FILE_DIN_FK; - --changeset mvelosob:12 failOnError:true dbms:oracle --preconditions onFail:HALT onError:HALT --precondition-sql-check expectedResult:"4.6" SELECT CONCAT(CONCAT(CAST(SCHEMA_VERSION_MAJOR as VARCHAR(10)),'.'), CAST(SCHEMA_VERSION_MINOR AS VARCHAR(10))) AS CATALOGUE_VERSION FROM CTA_CATALOGUE; +DROP TABLE ACTIVITY_WEIGHTS; +--rollback CREATE TABLE ACTIVITIES_WEIGHTS ( +--rollback DISK_INSTANCE_NAME VARCHAR2(100), +--rollback ACTIVITY VARCHAR2(100), +--rollback WEIGHT VARCHAR2(100), +--rollback USER_COMMENT VARCHAR2(1000) CONSTRAINT ACTIV_WEIGHTS_UC_NN NOT NULL, +--rollback CREATION_LOG_USER_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_CLUN_NN NOT NULL, +--rollback CREATION_LOG_HOST_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_CLHN_NN NOT NULL, +--rollback CREATION_LOG_TIME NUMERIC(20, 0) CONSTRAINT ACTIV_WEIGHTS_CLT_NN NOT NULL, +--rollback LAST_UPDATE_USER_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_LUUN_NN NOT NULL, +--rollback LAST_UPDATE_HOST_NAME VARCHAR2(100) CONSTRAINT ACTIV_WEIGHTS_LUHN_NN NOT NULL, +--rollback LAST_UPDATE_TIME NUMERIC(20, 0) CONSTRAINT ACTIV_WEIGHTS_LUT_NN NOT NULL +--rollback ); + +--changeset mvelosob:13 failOnError:true dbms:oracle +--preconditions onFail:HALT onError:HALT +--precondition-sql-check expectedResult:"4.6" SELECT CONCAT(CONCAT(CAST(SCHEMA_VERSION_MAJOR as VARCHAR(10)),'.'), CAST(SCHEMA_VERSION_MINOR AS VARCHAR(10))) AS CATALOGUE_VERSION FROM CTA_CATALOGUE; UPDATE CTA_CATALOGUE SET STATUS='PRODUCTION'; UPDATE CTA_CATALOGUE SET SCHEMA_VERSION_MAJOR=10; UPDATE CTA_CATALOGUE SET SCHEMA_VERSION_MINOR=0;