commit 0f461606f5567f9c12caf9bcbcba15b9d64242c7 Author: Sahil Takiar Date: Fri Jan 19 16:37:50 2018 -0800 HIVE-18489: Automatically migration s3n URIs to s3a URIs diff --git a/metastore/scripts/upgrade/derby/049-HIVE-18489.derby.sql b/metastore/scripts/upgrade/derby/049-HIVE-18489.derby.sql new file mode 100644 index 0000000000..cb6cec35cf --- /dev/null +++ b/metastore/scripts/upgrade/derby/049-HIVE-18489.derby.sql @@ -0,0 +1,29 @@ +CREATE FUNCTION REPLACE +(SOURCESTRING VARCHAR(8000), SEARCHSTRING VARCHAR(8000), REPLACESTRING VARCHAR(8000)) +RETURNS VARCHAR(8000) +PARAMETER STYLE JAVA NO SQL +LANGUAGE JAVA EXTERNAL NAME 'org.apache.commons.lang3.StringUtils.replace'; + +UPDATE FUNC_RU + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE SKEWED_COL_VALUE_LOC_MAP + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE SDS + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE DBS + SET DB_LOCATION_URI = REPLACE(DB_LOCATION_URI, 's3n', 's3a') +WHERE + DB_LOCATION_URI LIKE 's3n%' +; diff --git a/metastore/scripts/upgrade/derby/upgrade-2.3.0-to-3.0.0.derby.sql b/metastore/scripts/upgrade/derby/upgrade-2.3.0-to-3.0.0.derby.sql index 574ad28714..4372498aed 100644 --- a/metastore/scripts/upgrade/derby/upgrade-2.3.0-to-3.0.0.derby.sql +++ b/metastore/scripts/upgrade/derby/upgrade-2.3.0-to-3.0.0.derby.sql @@ -7,5 +7,6 @@ RUN '045-HIVE-16886.derby.sql'; RUN '046-HIVE-17566.derby.sql'; RUN '047-HIVE-18202.derby.sql'; RUN '048-HIVE-14498.derby.sql'; +RUN '049-HIVE-18489.derby.sql'; UPDATE "APP".VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1; diff --git a/metastore/scripts/upgrade/mssql/034-HIVE-18489.mssql.sql b/metastore/scripts/upgrade/mssql/034-HIVE-18489.mssql.sql new file mode 100644 index 0000000000..7072bee248 --- /dev/null +++ b/metastore/scripts/upgrade/mssql/034-HIVE-18489.mssql.sql @@ -0,0 +1,23 @@ +UPDATE FUNC_RU + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE SKEWED_COL_VALUE_LOC_MAP + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE SDS + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE DBS + SET DB_LOCATION_URI = REPLACE(DB_LOCATION_URI, 's3n', 's3a') +WHERE + DB_LOCATION_URI LIKE 's3n%' +; diff --git a/metastore/scripts/upgrade/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql b/metastore/scripts/upgrade/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql index ebe10ff322..52727f3d67 100644 --- a/metastore/scripts/upgrade/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql +++ b/metastore/scripts/upgrade/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql @@ -8,6 +8,7 @@ SELECT 'Upgrading MetaStore schema from 2.3.0 to 3.0.0' AS MESSAGE; :r 031-HIVE-17566.mssql.sql :r 032-HIVE-18202.mssql.sql :r 033-HIVE-14498.mssql.sql +:r 034-HIVE-18489.mssql.sql UPDATE VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0' AS MESSAGE; diff --git a/metastore/scripts/upgrade/mysql/049-HIVE-18489.mysql.sql b/metastore/scripts/upgrade/mysql/049-HIVE-18489.mysql.sql new file mode 100644 index 0000000000..7072bee248 --- /dev/null +++ b/metastore/scripts/upgrade/mysql/049-HIVE-18489.mysql.sql @@ -0,0 +1,23 @@ +UPDATE FUNC_RU + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE SKEWED_COL_VALUE_LOC_MAP + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE SDS + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE DBS + SET DB_LOCATION_URI = REPLACE(DB_LOCATION_URI, 's3n', 's3a') +WHERE + DB_LOCATION_URI LIKE 's3n%' +; diff --git a/metastore/scripts/upgrade/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql b/metastore/scripts/upgrade/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql index c6177726e3..fb50db3d31 100644 --- a/metastore/scripts/upgrade/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql +++ b/metastore/scripts/upgrade/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql @@ -8,6 +8,7 @@ SOURCE 045-HIVE-16886.mysql.sql; SOURCE 046-HIVE-17566.mysql.sql; SOURCE 047-HIVE-18202.mysql.sql; SOURCE 048-HIVE-14498.mysql.sql; +SOURCE 049-HIVE-18489.mysql.sql; UPDATE VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0' AS ' '; diff --git a/metastore/scripts/upgrade/oracle/049-HIVE-18489.oracle.sql b/metastore/scripts/upgrade/oracle/049-HIVE-18489.oracle.sql new file mode 100644 index 0000000000..7072bee248 --- /dev/null +++ b/metastore/scripts/upgrade/oracle/049-HIVE-18489.oracle.sql @@ -0,0 +1,23 @@ +UPDATE FUNC_RU + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE SKEWED_COL_VALUE_LOC_MAP + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE SDS + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE DBS + SET DB_LOCATION_URI = REPLACE(DB_LOCATION_URI, 's3n', 's3a') +WHERE + DB_LOCATION_URI LIKE 's3n%' +; diff --git a/metastore/scripts/upgrade/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql b/metastore/scripts/upgrade/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql index 90e02f79f8..0eab90c268 100644 --- a/metastore/scripts/upgrade/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql +++ b/metastore/scripts/upgrade/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql @@ -8,6 +8,7 @@ SELECT 'Upgrading MetaStore schema from 2.3.0 to 3.0.0' AS Status from dual; @046-HIVE-17566.oracle.sql; @047-HIVE-18202-oracle.sql; @048-HIVE-14498.oracle.sql; +@049-HIVE-18489.oracle.sql; UPDATE VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0' AS Status from dual; diff --git a/metastore/scripts/upgrade/postgres/048-HIVE-18489.postgres.sql b/metastore/scripts/upgrade/postgres/048-HIVE-18489.postgres.sql new file mode 100644 index 0000000000..7072bee248 --- /dev/null +++ b/metastore/scripts/upgrade/postgres/048-HIVE-18489.postgres.sql @@ -0,0 +1,23 @@ +UPDATE FUNC_RU + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE SKEWED_COL_VALUE_LOC_MAP + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE SDS + SET LOCATION = REPLACE(LOCATION, 's3n', 's3a') +WHERE + LOCATION LIKE 's3n%' +; + +UPDATE DBS + SET DB_LOCATION_URI = REPLACE(DB_LOCATION_URI, 's3n', 's3a') +WHERE + DB_LOCATION_URI LIKE 's3n%' +; diff --git a/metastore/scripts/upgrade/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql b/metastore/scripts/upgrade/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql index 4737208935..674f5a0989 100644 --- a/metastore/scripts/upgrade/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql +++ b/metastore/scripts/upgrade/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql @@ -8,6 +8,7 @@ SELECT 'Upgrading MetaStore schema from 2.3.0 to 3.0.0'; \i 045-HIVE-17566.postgres.sql; \i 046-HIVE-18202.postgres.sql; \i 047-HIVE-14498.postgres.sql; +\i 048-HIVE-18489.postgres.sql; UPDATE "VERSION" SET "SCHEMA_VERSION"='3.0.0', "VERSION_COMMENT"='Hive release version 3.0.0' where "VER_ID"=1; SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0';