Repository: hive Updated Branches: refs/heads/master 77978f301 -> 670f57c18
HIVE-10979: Fix failed tests in TestSchemaTool after the version number change in HIVE-10921(Ferdinand Xu, reviewed by Sergey Shelukhin) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/670f57c1 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/670f57c1 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/670f57c1 Branch: refs/heads/master Commit: 670f57c188b6f02f2c7f55b758ff403501058285 Parents: 77978f3 Author: Ferdinand Xu <[email protected]> Authored: Sun Jun 14 13:44:40 2015 -0400 Committer: Ferdinand Xu <[email protected]> Committed: Sun Jun 14 13:44:40 2015 -0400 ---------------------------------------------------------------------- metastore/scripts/upgrade/derby/hive-schema-2.0.0.derby.sql | 2 +- .../scripts/upgrade/derby/upgrade-1.2.0-to-2.0.0.derby.sql | 4 ++-- metastore/scripts/upgrade/mssql/hive-schema-2.0.0.mssql.sql | 2 +- metastore/scripts/upgrade/mysql/hive-schema-2.0.0.mysql.sql | 2 +- .../scripts/upgrade/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql | 6 +++--- metastore/scripts/upgrade/oracle/hive-schema-2.0.0.oracle.sql | 2 +- .../scripts/upgrade/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql | 6 +++--- .../scripts/upgrade/postgres/hive-schema-2.0.0.postgres.sql | 2 +- .../upgrade/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql | 6 +++--- 9 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/670f57c1/metastore/scripts/upgrade/derby/hive-schema-2.0.0.derby.sql ---------------------------------------------------------------------- diff --git a/metastore/scripts/upgrade/derby/hive-schema-2.0.0.derby.sql b/metastore/scripts/upgrade/derby/hive-schema-2.0.0.derby.sql index c50375f..1cc0a24 100644 --- a/metastore/scripts/upgrade/derby/hive-schema-2.0.0.derby.sql +++ b/metastore/scripts/upgrade/derby/hive-schema-2.0.0.derby.sql @@ -332,5 +332,5 @@ RUN 'hive-txn-schema-0.13.0.derby.sql'; -- ----------------------------------------------------------------- -- Record schema version. Should be the last step in the init script -- ----------------------------------------------------------------- -INSERT INTO "APP"."VERSION" (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '1.3.0', 'Hive release version 1.3.0'); +INSERT INTO "APP"."VERSION" (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '2.0.0', 'Hive release version 2.0.0'); http://git-wip-us.apache.org/repos/asf/hive/blob/670f57c1/metastore/scripts/upgrade/derby/upgrade-1.2.0-to-2.0.0.derby.sql ---------------------------------------------------------------------- diff --git a/metastore/scripts/upgrade/derby/upgrade-1.2.0-to-2.0.0.derby.sql b/metastore/scripts/upgrade/derby/upgrade-1.2.0-to-2.0.0.derby.sql index dee744b..976ebd1 100644 --- a/metastore/scripts/upgrade/derby/upgrade-1.2.0-to-2.0.0.derby.sql +++ b/metastore/scripts/upgrade/derby/upgrade-1.2.0-to-2.0.0.derby.sql @@ -1,3 +1,3 @@ --- Upgrade MetaStore schema from 1.2.0 to 1.3.0 +-- Upgrade MetaStore schema from 1.3.0 to 2.0.0 -UPDATE "APP".VERSION SET SCHEMA_VERSION='1.3.0', VERSION_COMMENT='Hive release version 1.3.0' where VER_ID=1; +UPDATE "APP".VERSION SET SCHEMA_VERSION='2.0.0', VERSION_COMMENT='Hive release version 2.0.0' where VER_ID=1; http://git-wip-us.apache.org/repos/asf/hive/blob/670f57c1/metastore/scripts/upgrade/mssql/hive-schema-2.0.0.mssql.sql ---------------------------------------------------------------------- diff --git a/metastore/scripts/upgrade/mssql/hive-schema-2.0.0.mssql.sql b/metastore/scripts/upgrade/mssql/hive-schema-2.0.0.mssql.sql index 7165edd..36e7c1f 100644 --- a/metastore/scripts/upgrade/mssql/hive-schema-2.0.0.mssql.sql +++ b/metastore/scripts/upgrade/mssql/hive-schema-2.0.0.mssql.sql @@ -944,4 +944,4 @@ ALTER TABLE TXN_COMPONENTS WITH CHECK ADD FOREIGN KEY(TC_TXNID) REFERENCES TXNS -- ----------------------------------------------------------------- -- Record schema version. Should be the last step in the init script -- ----------------------------------------------------------------- -INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '1.3.0', 'Hive release version 1.3.0'); +INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '2.0.0', 'Hive release version 2.0.0'); http://git-wip-us.apache.org/repos/asf/hive/blob/670f57c1/metastore/scripts/upgrade/mysql/hive-schema-2.0.0.mysql.sql ---------------------------------------------------------------------- diff --git a/metastore/scripts/upgrade/mysql/hive-schema-2.0.0.mysql.sql b/metastore/scripts/upgrade/mysql/hive-schema-2.0.0.mysql.sql index bc63f0d..3a595dd 100644 --- a/metastore/scripts/upgrade/mysql/hive-schema-2.0.0.mysql.sql +++ b/metastore/scripts/upgrade/mysql/hive-schema-2.0.0.mysql.sql @@ -824,7 +824,7 @@ SOURCE hive-txn-schema-0.13.0.mysql.sql; -- ----------------------------------------------------------------- -- Record schema version. Should be the last step in the init script -- ----------------------------------------------------------------- -INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '1.3.0', 'Hive release version 1.3.0'); +INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '2.0.0', 'Hive release version 2.0.0'); /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; http://git-wip-us.apache.org/repos/asf/hive/blob/670f57c1/metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql ---------------------------------------------------------------------- diff --git a/metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql b/metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql index d5a31f7..22d5242 100644 --- a/metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql +++ b/metastore/scripts/upgrade/mysql/upgrade-1.2.0-to-2.0.0.mysql.sql @@ -1,4 +1,4 @@ -SELECT 'Upgrading MetaStore schema from 1.2.0 to 1.3.0' AS ' '; -UPDATE VERSION SET SCHEMA_VERSION='1.3.0', VERSION_COMMENT='Hive release version 1.3.0' where VER_ID=1; -SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 1.3.0' AS ' '; +SELECT 'Upgrading MetaStore schema from 1.2.0 to 2.0.0' AS ' '; +UPDATE VERSION SET SCHEMA_VERSION='2.0.0', VERSION_COMMENT='Hive release version 2.0.0' where VER_ID=1; +SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 2.0.0' AS ' '; http://git-wip-us.apache.org/repos/asf/hive/blob/670f57c1/metastore/scripts/upgrade/oracle/hive-schema-2.0.0.oracle.sql ---------------------------------------------------------------------- diff --git a/metastore/scripts/upgrade/oracle/hive-schema-2.0.0.oracle.sql b/metastore/scripts/upgrade/oracle/hive-schema-2.0.0.oracle.sql index 7605bc7..8d963ce 100644 --- a/metastore/scripts/upgrade/oracle/hive-schema-2.0.0.oracle.sql +++ b/metastore/scripts/upgrade/oracle/hive-schema-2.0.0.oracle.sql @@ -785,4 +785,4 @@ CREATE INDEX FUNC_RU_N49 ON FUNC_RU (FUNC_ID); -- ----------------------------------------------------------------- -- Record schema version. Should be the last step in the init script -- ----------------------------------------------------------------- -INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '1.3.0', 'Hive release version 1.3.0'); +INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '2.0.0', 'Hive release version 2.0.0'); http://git-wip-us.apache.org/repos/asf/hive/blob/670f57c1/metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql ---------------------------------------------------------------------- diff --git a/metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql b/metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql index f072a1c..efff2c9 100644 --- a/metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql +++ b/metastore/scripts/upgrade/oracle/upgrade-1.2.0-to-2.0.0.oracle.sql @@ -1,4 +1,4 @@ -SELECT 'Upgrading MetaStore schema from 1.2.0 to 1.3.0' AS Status from dual; +SELECT 'Upgrading MetaStore schema from 1.2.0 to 2.0.0' AS Status from dual; -UPDATE VERSION SET SCHEMA_VERSION='1.3.0', VERSION_COMMENT='Hive release version 1.3.0' where VER_ID=1; -SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 1.3.0' AS Status from dual; +UPDATE VERSION SET SCHEMA_VERSION='2.0.0', VERSION_COMMENT='Hive release version 2.0.0' where VER_ID=1; +SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 2.0.0' AS Status from dual; http://git-wip-us.apache.org/repos/asf/hive/blob/670f57c1/metastore/scripts/upgrade/postgres/hive-schema-2.0.0.postgres.sql ---------------------------------------------------------------------- diff --git a/metastore/scripts/upgrade/postgres/hive-schema-2.0.0.postgres.sql b/metastore/scripts/upgrade/postgres/hive-schema-2.0.0.postgres.sql index 3ab5b3e..6442eb1 100644 --- a/metastore/scripts/upgrade/postgres/hive-schema-2.0.0.postgres.sql +++ b/metastore/scripts/upgrade/postgres/hive-schema-2.0.0.postgres.sql @@ -1454,4 +1454,4 @@ GRANT ALL ON SCHEMA public TO PUBLIC; -- ----------------------------------------------------------------- -- Record schema version. Should be the last step in the init script -- ----------------------------------------------------------------- -INSERT INTO "VERSION" ("VER_ID", "SCHEMA_VERSION", "VERSION_COMMENT") VALUES (1, '1.3.0', 'Hive release version 1.3.0'); +INSERT INTO "VERSION" ("VER_ID", "SCHEMA_VERSION", "VERSION_COMMENT") VALUES (1, '2.0.0', 'Hive release version 2.0.0'); http://git-wip-us.apache.org/repos/asf/hive/blob/670f57c1/metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql ---------------------------------------------------------------------- diff --git a/metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql b/metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql index cdd3792..b6b0c35 100644 --- a/metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql +++ b/metastore/scripts/upgrade/postgres/upgrade-1.2.0-to-2.0.0.postgres.sql @@ -1,8 +1,8 @@ -SELECT 'Upgrading MetaStore schema from 1.2.0 to 1.3.0'; +SELECT 'Upgrading MetaStore schema from 1.2.0 to 2.0.0'; -UPDATE "VERSION" SET "SCHEMA_VERSION"='1.3.0', "VERSION_COMMENT"='Hive release version 1.3.0' where "VER_ID"=1; -SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 1.3.0'; +UPDATE "VERSION" SET "SCHEMA_VERSION"='2.0.0', "VERSION_COMMENT"='Hive release version 2.0.0' where "VER_ID"=1; +SELECT 'Finished upgrading MetaStore schema from 1.2.0 to 2.0.0'; --
