commit 923d75e63199abd8ca4b233b10fa1945391deeed Author: Daniel Dai Date: Fri Jun 22 15:32:46 2018 -0700 HIVE-19938: Upgrade scripts for information schema diff --git a/metastore/scripts/upgrade/hive/hive-schema-3.0.0.hive.sql b/metastore/scripts/upgrade/hive/hive-schema-3.0.0.hive.sql index a3ecded..ac517a0 100644 --- a/metastore/scripts/upgrade/hive/hive-schema-3.0.0.hive.sql +++ b/metastore/scripts/upgrade/hive/hive-schema-3.0.0.hive.sql @@ -1,7 +1,6 @@ -- HIVE system db -DROP DATABASE IF EXISTS SYS CASCADE; -CREATE DATABASE SYS; +CREATE DATABASE IF NOT EXISTS SYS; USE SYS; @@ -821,15 +820,6 @@ CREATE TABLE IF NOT EXISTS `VERSION` ( `VER_ID` BIGINT, `SCHEMA_VERSION` string, `VERSION_COMMENT` string, - CONSTRAINT `SYS_PK_VERSION` PRIMARY KEY (`VER_ID`) DISABLE -); - -INSERT INTO `VERSION` VALUES (1, '3.0.0', 'Hive release version 3.0.0'); - -CREATE TABLE IF NOT EXISTS `DB_VERSION` ( - `VER_ID` BIGINT, - `SCHEMA_VERSION` string, - `VERSION_COMMENT` string, CONSTRAINT `SYS_PK_DB_VERSION` PRIMARY KEY (`VER_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -924,6 +914,8 @@ FROM \"KEY_CONSTRAINTS\"" ); +DROP VIEW IF EXISTS `TABLE_STATS_VIEW`; + CREATE VIEW `TABLE_STATS_VIEW` AS SELECT `TBL_ID`, @@ -935,6 +927,8 @@ SELECT max(CASE `PARAM_KEY` WHEN 'transient_lastDdlTime' THEN `PARAM_VALUE` END) AS TRANSIENT_LAST_DDL_TIME FROM `TABLE_PARAMS` GROUP BY `TBL_ID`; +DROP VIEW IF EXISTS `PARTITION_STATS_VIEW`; + CREATE VIEW `PARTITION_STATS_VIEW` AS SELECT `PART_ID`, @@ -1064,12 +1058,13 @@ LEFT OUTER JOIN \"WM_POOL\" ON \"WM_POOL\".\"POOL_ID\" = \"WM_MAPPING\".\"POOL_I " ); -DROP DATABASE IF EXISTS INFORMATION_SCHEMA CASCADE; -CREATE DATABASE INFORMATION_SCHEMA; +CREATE DATABASE IF NOT EXISTS INFORMATION_SCHEMA; USE INFORMATION_SCHEMA; -CREATE VIEW IF NOT EXISTS `SCHEMATA` +DROP VIEW IF EXISTS `SCHEMATA`; + +CREATE VIEW `SCHEMATA` ( `CATALOG_NAME`, `SCHEMA_NAME`, @@ -1097,7 +1092,9 @@ WHERE OR ((array_contains(current_groups(), P.`PRINCIPAL_NAME`) OR P.`PRINCIPAL_NAME` = 'public') AND P.`PRINCIPAL_TYPE`='GROUP')) AND current_authorizer() = P.`AUTHORIZER`; -CREATE VIEW IF NOT EXISTS `TABLES` +DROP VIEW IF EXISTS `TABLES`; + +CREATE VIEW `TABLES` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, @@ -1134,7 +1131,9 @@ WHERE OR ((array_contains(current_groups(), P.`PRINCIPAL_NAME`) OR P.`PRINCIPAL_NAME` = 'public') AND P.`PRINCIPAL_TYPE`='GROUP'))) AND P.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer(); -CREATE VIEW IF NOT EXISTS `TABLE_PRIVILEGES` +DROP VIEW IF EXISTS `TABLE_PRIVILEGES`; + +CREATE VIEW `TABLE_PRIVILEGES` ( `GRANTOR`, `GRANTEE`, @@ -1168,7 +1167,9 @@ WHERE OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP'))) AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer(); -CREATE VIEW IF NOT EXISTS `COLUMNS` +DROP VIEW IF EXISTS `COLUMNS`; + +CREATE VIEW `COLUMNS` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, @@ -1323,7 +1324,9 @@ WHERE OR ((array_contains(current_groups(), P.`PRINCIPAL_NAME`) OR P.`PRINCIPAL_NAME` = 'public') AND P.`PRINCIPAL_TYPE`='GROUP')) AND P.`TBL_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer()); -CREATE VIEW IF NOT EXISTS `COLUMN_PRIVILEGES` +DROP VIEW IF EXISTS `COLUMN_PRIVILEGES`; + +CREATE VIEW `COLUMN_PRIVILEGES` ( `GRANTOR`, `GRANTEE`, @@ -1359,7 +1362,9 @@ WHERE OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer()); -CREATE VIEW IF NOT EXISTS `VIEWS` +DROP VIEW IF EXISTS `VIEWS`; + +CREATE VIEW `VIEWS` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, diff --git a/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql b/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql index 8453ee3..ac517a0 100644 --- a/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql +++ b/metastore/scripts/upgrade/hive/hive-schema-3.1.0.hive.sql @@ -1,7 +1,6 @@ -- HIVE system db -DROP DATABASE IF EXISTS SYS CASCADE; -CREATE DATABASE SYS; +CREATE DATABASE IF NOT EXISTS SYS; USE SYS; @@ -821,15 +820,6 @@ CREATE TABLE IF NOT EXISTS `VERSION` ( `VER_ID` BIGINT, `SCHEMA_VERSION` string, `VERSION_COMMENT` string, - CONSTRAINT `SYS_PK_VERSION` PRIMARY KEY (`VER_ID`) DISABLE -); - -INSERT INTO `VERSION` VALUES (1, '3.1.0', 'Hive release version 3.1.0'); - -CREATE TABLE IF NOT EXISTS `DB_VERSION` ( - `VER_ID` BIGINT, - `SCHEMA_VERSION` string, - `VERSION_COMMENT` string, CONSTRAINT `SYS_PK_DB_VERSION` PRIMARY KEY (`VER_ID`) DISABLE ) STORED BY 'org.apache.hive.storage.jdbc.JdbcStorageHandler' @@ -924,6 +914,8 @@ FROM \"KEY_CONSTRAINTS\"" ); +DROP VIEW IF EXISTS `TABLE_STATS_VIEW`; + CREATE VIEW `TABLE_STATS_VIEW` AS SELECT `TBL_ID`, @@ -935,6 +927,8 @@ SELECT max(CASE `PARAM_KEY` WHEN 'transient_lastDdlTime' THEN `PARAM_VALUE` END) AS TRANSIENT_LAST_DDL_TIME FROM `TABLE_PARAMS` GROUP BY `TBL_ID`; +DROP VIEW IF EXISTS `PARTITION_STATS_VIEW`; + CREATE VIEW `PARTITION_STATS_VIEW` AS SELECT `PART_ID`, @@ -1064,12 +1058,13 @@ LEFT OUTER JOIN \"WM_POOL\" ON \"WM_POOL\".\"POOL_ID\" = \"WM_MAPPING\".\"POOL_I " ); -DROP DATABASE IF EXISTS INFORMATION_SCHEMA CASCADE; -CREATE DATABASE INFORMATION_SCHEMA; +CREATE DATABASE IF NOT EXISTS INFORMATION_SCHEMA; USE INFORMATION_SCHEMA; -CREATE VIEW IF NOT EXISTS `SCHEMATA` +DROP VIEW IF EXISTS `SCHEMATA`; + +CREATE VIEW `SCHEMATA` ( `CATALOG_NAME`, `SCHEMA_NAME`, @@ -1097,7 +1092,9 @@ WHERE OR ((array_contains(current_groups(), P.`PRINCIPAL_NAME`) OR P.`PRINCIPAL_NAME` = 'public') AND P.`PRINCIPAL_TYPE`='GROUP')) AND current_authorizer() = P.`AUTHORIZER`; -CREATE VIEW IF NOT EXISTS `TABLES` +DROP VIEW IF EXISTS `TABLES`; + +CREATE VIEW `TABLES` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, @@ -1134,7 +1131,9 @@ WHERE OR ((array_contains(current_groups(), P.`PRINCIPAL_NAME`) OR P.`PRINCIPAL_NAME` = 'public') AND P.`PRINCIPAL_TYPE`='GROUP'))) AND P.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer(); -CREATE VIEW IF NOT EXISTS `TABLE_PRIVILEGES` +DROP VIEW IF EXISTS `TABLE_PRIVILEGES`; + +CREATE VIEW `TABLE_PRIVILEGES` ( `GRANTOR`, `GRANTEE`, @@ -1168,7 +1167,9 @@ WHERE OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP'))) AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER` = current_authorizer() AND P2.`AUTHORIZER` = current_authorizer(); -CREATE VIEW IF NOT EXISTS `COLUMNS` +DROP VIEW IF EXISTS `COLUMNS`; + +CREATE VIEW `COLUMNS` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, @@ -1323,7 +1324,9 @@ WHERE OR ((array_contains(current_groups(), P.`PRINCIPAL_NAME`) OR P.`PRINCIPAL_NAME` = 'public') AND P.`PRINCIPAL_TYPE`='GROUP')) AND P.`TBL_COL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer()); -CREATE VIEW IF NOT EXISTS `COLUMN_PRIVILEGES` +DROP VIEW IF EXISTS `COLUMN_PRIVILEGES`; + +CREATE VIEW `COLUMN_PRIVILEGES` ( `GRANTOR`, `GRANTEE`, @@ -1359,7 +1362,9 @@ WHERE OR ((array_contains(current_groups(), P2.`PRINCIPAL_NAME`) OR P2.`PRINCIPAL_NAME` = 'public') AND P2.`PRINCIPAL_TYPE`='GROUP')) AND P2.`TBL_PRIV`='SELECT' AND P.`AUTHORIZER`=current_authorizer() AND P2.`AUTHORIZER`=current_authorizer()); -CREATE VIEW IF NOT EXISTS `VIEWS` +DROP VIEW IF EXISTS `VIEWS`; + +CREATE VIEW `VIEWS` ( `TABLE_CATALOG`, `TABLE_SCHEMA`, diff --git a/metastore/scripts/upgrade/hive/upgrade-3.0.0-to-3.1.0.hive.sql b/metastore/scripts/upgrade/hive/upgrade-3.0.0-to-3.1.0.hive.sql new file mode 100644 index 0000000..24c50df --- /dev/null +++ b/metastore/scripts/upgrade/hive/upgrade-3.0.0-to-3.1.0.hive.sql @@ -0,0 +1,5 @@ +SELECT 'Upgrading MetaStore schema from 3.0.0 to 3.1.0'; + +-- NOTHING TO DO + +SELECT 'Finished upgrading MetaStore schema from 3.0.0 to 3.1.0'; diff --git a/metastore/scripts/upgrade/hive/upgrade.order.hive b/metastore/scripts/upgrade/hive/upgrade.order.hive index e69de29..dd040af 100644 --- a/metastore/scripts/upgrade/hive/upgrade.order.hive +++ b/metastore/scripts/upgrade/hive/upgrade.order.hive @@ -0,0 +1 @@ +3.0.0-to-3.1.0