diff --git metastore/scripts/upgrade/mysql/046-HIVE-17566.mysql.sql metastore/scripts/upgrade/mysql/046-HIVE-17566.mysql.sql index 34fcfe68fb..02288cbe42 100644 --- metastore/scripts/upgrade/mysql/046-HIVE-17566.mysql.sql +++ metastore/scripts/upgrade/mysql/046-HIVE-17566.mysql.sql @@ -5,7 +5,7 @@ CREATE TABLE IF NOT EXISTS WM_RESOURCEPLAN ( `STATUS` varchar(20) NOT NULL, `DEFAULT_POOL_ID` bigint(20), PRIMARY KEY (`RP_ID`), - KEY `UNIQUE_WM_RESOURCEPLAN` (`NAME`) + UNIQUE KEY `UNIQUE_WM_RESOURCEPLAN` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; CREATE TABLE IF NOT EXISTS WM_POOL @@ -17,7 +17,7 @@ CREATE TABLE IF NOT EXISTS WM_POOL `QUERY_PARALLELISM` int(11), `SCHEDULING_POLICY` varchar(767), PRIMARY KEY (`POOL_ID`), - KEY `UNIQUE_WM_POOL` (`RP_ID`, `PATH`), + UNIQUE KEY `UNIQUE_WM_POOL` (`RP_ID`, `PATH`), CONSTRAINT `WM_POOL_FK1` FOREIGN KEY (`RP_ID`) REFERENCES `WM_RESOURCEPLAN` (`RP_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; @@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS WM_TRIGGER `TRIGGER_EXPRESSION` varchar(1024), `ACTION_EXPRESSION` varchar(1024), PRIMARY KEY (`TRIGGER_ID`), - KEY `UNIQUE_WM_TRIGGER` (`RP_ID`, `NAME`), + UNIQUE KEY `UNIQUE_WM_TRIGGER` (`RP_ID`, `NAME`), CONSTRAINT `WM_TRIGGER_FK1` FOREIGN KEY (`RP_ID`) REFERENCES `WM_RESOURCEPLAN` (`RP_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; @@ -53,7 +53,7 @@ CREATE TABLE IF NOT EXISTS WM_MAPPING `POOL_ID` bigint(20), `ORDERING` int, PRIMARY KEY (`MAPPING_ID`), - KEY `UNIQUE_WM_MAPPING` (`RP_ID`, `ENTITY_TYPE`, `ENTITY_NAME`), + UNIQUE KEY `UNIQUE_WM_MAPPING` (`RP_ID`, `ENTITY_TYPE`, `ENTITY_NAME`), CONSTRAINT `WM_MAPPING_FK1` FOREIGN KEY (`RP_ID`) REFERENCES `WM_RESOURCEPLAN` (`RP_ID`), CONSTRAINT `WM_MAPPING_FK2` FOREIGN KEY (`POOL_ID`) REFERENCES `WM_POOL` (`POOL_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; diff --git metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql index ec95c1734a..915af8bf4b 100644 --- metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql +++ metastore/scripts/upgrade/mysql/hive-schema-3.0.0.mysql.sql @@ -856,7 +856,7 @@ CREATE TABLE IF NOT EXISTS WM_RESOURCEPLAN ( `STATUS` varchar(20) NOT NULL, `DEFAULT_POOL_ID` bigint(20), PRIMARY KEY (`RP_ID`), - KEY `UNIQUE_WM_RESOURCEPLAN` (`NAME`) + UNIQUE KEY `UNIQUE_WM_RESOURCEPLAN` (`NAME`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; CREATE TABLE IF NOT EXISTS WM_POOL @@ -868,7 +868,7 @@ CREATE TABLE IF NOT EXISTS WM_POOL `QUERY_PARALLELISM` int(11), `SCHEDULING_POLICY` varchar(767), PRIMARY KEY (`POOL_ID`), - KEY `UNIQUE_WM_POOL` (`RP_ID`, `PATH`), + UNIQUE KEY `UNIQUE_WM_POOL` (`RP_ID`, `PATH`), CONSTRAINT `WM_POOL_FK1` FOREIGN KEY (`RP_ID`) REFERENCES `WM_RESOURCEPLAN` (`RP_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; @@ -882,7 +882,7 @@ CREATE TABLE IF NOT EXISTS WM_TRIGGER `TRIGGER_EXPRESSION` varchar(1024), `ACTION_EXPRESSION` varchar(1024), PRIMARY KEY (`TRIGGER_ID`), - KEY `UNIQUE_WM_TRIGGER` (`RP_ID`, `NAME`), + UNIQUE KEY `UNIQUE_WM_TRIGGER` (`RP_ID`, `NAME`), CONSTRAINT `WM_TRIGGER_FK1` FOREIGN KEY (`RP_ID`) REFERENCES `WM_RESOURCEPLAN` (`RP_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; @@ -904,7 +904,7 @@ CREATE TABLE IF NOT EXISTS WM_MAPPING `POOL_ID` bigint(20), `ORDERING` int, PRIMARY KEY (`MAPPING_ID`), - KEY `UNIQUE_WM_MAPPING` (`RP_ID`, `ENTITY_TYPE`, `ENTITY_NAME`), + UNIQUE KEY `UNIQUE_WM_MAPPING` (`RP_ID`, `ENTITY_TYPE`, `ENTITY_NAME`), CONSTRAINT `WM_MAPPING_FK1` FOREIGN KEY (`RP_ID`) REFERENCES `WM_RESOURCEPLAN` (`RP_ID`), CONSTRAINT `WM_MAPPING_FK2` FOREIGN KEY (`POOL_ID`) REFERENCES `WM_POOL` (`POOL_ID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1;