From 3c9d12edb4862e2a44d73098b75e2747016e3dd3 Mon Sep 17 00:00:00 2001
From: mvelosob <miguel.veloso.barros@cern.ch>
Date: Wed, 20 Apr 2022 11:35:13 +0200
Subject: [PATCH] drop ACTIVITY_WEIGHTS table (#1151)
---
ReleaseNotes.md | 1 +
catalogue/10.0/oracle_catalogue_schema.sql | 12 -------
catalogue/10.0/postgres_catalogue_schema.sql | 12 -------
catalogue/10.0/sqlite_catalogue_schema.sql | 12 -------
catalogue/AllCatalogueSchema.hpp | 36 -------------------
catalogue/common_catalogue_schema.sql | 12 -------
.../migrations/liquibase/oracle/4.6to10.0.sql | 18 +++++++++-
7 files changed, 18 insertions(+), 85 deletions(-)
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 113903d9c0..e54751a852 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 7b9e33d250..554c9b2aec 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 8e4e853710..be0ecc0479 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 315b482d74..cb623261be 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 087a02c78d..cf46e2e016 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 09aa3972ad..708f0ca0d0 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 3227a2e3d3..632355a923 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;
--
GitLab