diff --git a/metastore/scripts/upgrade/mysql/046-HIVE-17566.mysql.sql b/metastore/scripts/upgrade/mysql/046-HIVE-17566.mysql.sql index 25dfbe9..0790e4d 100644 --- a/metastore/scripts/upgrade/mysql/046-HIVE-17566.mysql.sql +++ b/metastore/scripts/upgrade/mysql/046-HIVE-17566.mysql.sql @@ -1,13 +1,13 @@ -CREATE TABLE WM_RESOURCEPLAN ( +CREATE TABLE IF NOT EXISTS WM_RESOURCEPLAN ( `RP_ID` bigint(20) NOT NULL, `NAME` varchar(128) NOT NULL, `QUERY_PARALLELISM` int(11), `STATUS` varchar(20) NOT NULL, PRIMARY KEY (`RP_ID`), - KEY `UNIQUE_WM_RESOURCEPLAN` (`NAME`), + KEY `UNIQUE_WM_RESOURCEPLAN` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -CREATE TABLE WM_POOL +CREATE TABLE IF NOT EXISTS WM_POOL ( `POOL_ID` bigint(20) NOT NULL, `RP_ID` bigint(20) NOT NULL, @@ -21,7 +21,7 @@ CREATE TABLE WM_POOL CONSTRAINT `WM_POOL_FK2` FOREIGN KEY (`PARENT_POOL_ID`) REFERENCES `WM_POOL` (`POOL_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -CREATE TABLE WM_TRIGGER +CREATE TABLE IF NOT EXISTS WM_TRIGGER ( `TRIGGER_ID` bigint(20) NOT NULL, `RP_ID` bigint(20) NOT NULL, @@ -33,7 +33,7 @@ CREATE TABLE WM_TRIGGER CONSTRAINT `WM_TRIGGER_FK1` FOREIGN KEY (`RP_ID`) REFERENCES `WM_RESOURCEPLAN` (`RP_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -CREATE TABLE WM_POOL_TO_TRIGGER +CREATE TABLE IF NOT EXISTS WM_POOL_TO_TRIGGER ( `POOL_ID` bigint(20) NOT NULL, `TRIGGER_ID` bigint(20) NOT NULL, @@ -42,14 +42,14 @@ CREATE TABLE WM_POOL_TO_TRIGGER CONSTRAINT `WM_POOL_TO_TRIGGER_FK2` FOREIGN KEY (`TRIGGER_ID`) REFERENCES `WM_TRIGGER` (`TRIGGER_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -CREATE TABLE WM_MAPPING +CREATE TABLE IF NOT EXISTS WM_MAPPING ( `MAPPING_ID` bigint(20) NOT NULL, `RP_ID` bigint(20) NOT NULL, `ENTITY_TYPE` varchar(10) NOT NULL, `ENTITY_NAME` varchar(128) NOT NULL, `POOL_ID` bigint(20) NOT NULL, - `ORDERING int, + `ORDERING` int, PRIMARY KEY (`MAPPING_ID`), KEY `UNIQUE_WM_MAPPING` (`RP_ID`, `ENTITY_TYPE`, `ENTITY_NAME`), CONSTRAINT `WM_MAPPING_FK1` FOREIGN KEY (`RP_ID`) REFERENCES `WM_RESOURCEPLAN` (`RP_ID`), diff --git a/metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql b/metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql index 0a02630..abb1b7b 100644 --- a/metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql +++ b/metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql @@ -849,16 +849,16 @@ CREATE TABLE IF NOT EXISTS `METASTORE_DB_PROPERTIES` ( -- --------------------- -- Resource plan tables. -- --------------------- -CREATE TABLE WM_RESOURCEPLAN ( +CREATE TABLE IF NOT EXISTS WM_RESOURCEPLAN ( `RP_ID` bigint(20) NOT NULL, `NAME` varchar(128) NOT NULL, `QUERY_PARALLELISM` int(11), `STATUS` varchar(20) NOT NULL, PRIMARY KEY (`RP_ID`), - KEY `UNIQUE_WM_RESOURCEPLAN` (`NAME`), + KEY `UNIQUE_WM_RESOURCEPLAN` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -CREATE TABLE WM_POOL +CREATE TABLE IF NOT EXISTS WM_POOL ( `POOL_ID` bigint(20) NOT NULL, `RP_ID` bigint(20) NOT NULL, @@ -872,7 +872,7 @@ CREATE TABLE WM_POOL CONSTRAINT `WM_POOL_FK2` FOREIGN KEY (`PARENT_POOL_ID`) REFERENCES `WM_POOL` (`POOL_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -CREATE TABLE WM_TRIGGER +CREATE TABLE IF NOT EXISTS WM_TRIGGER ( `TRIGGER_ID` bigint(20) NOT NULL, `RP_ID` bigint(20) NOT NULL, @@ -884,7 +884,7 @@ CREATE TABLE WM_TRIGGER CONSTRAINT `WM_TRIGGER_FK1` FOREIGN KEY (`RP_ID`) REFERENCES `WM_RESOURCEPLAN` (`RP_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -CREATE TABLE WM_POOL_TO_TRIGGER +CREATE TABLE IF NOT EXISTS WM_POOL_TO_TRIGGER ( `POOL_ID` bigint(20) NOT NULL, `TRIGGER_ID` bigint(20) NOT NULL, @@ -893,14 +893,14 @@ CREATE TABLE WM_POOL_TO_TRIGGER CONSTRAINT `WM_POOL_TO_TRIGGER_FK2` FOREIGN KEY (`TRIGGER_ID`) REFERENCES `WM_TRIGGER` (`TRIGGER_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -CREATE TABLE WM_MAPPING +CREATE TABLE IF NOT EXISTS WM_MAPPING ( `MAPPING_ID` bigint(20) NOT NULL, `RP_ID` bigint(20) NOT NULL, `ENTITY_TYPE` varchar(10) NOT NULL, `ENTITY_NAME` varchar(128) NOT NULL, `POOL_ID` bigint(20) NOT NULL, - `ORDERING int, + `ORDERING` int, PRIMARY KEY (`MAPPING_ID`), KEY `UNIQUE_WM_MAPPING` (`RP_ID`, `ENTITY_TYPE`, `ENTITY_NAME`), CONSTRAINT `WM_MAPPING_FK1` FOREIGN KEY (`RP_ID`) REFERENCES `WM_RESOURCEPLAN` (`RP_ID`),