Author: hashutosh Date: Mon Mar 17 23:34:02 2014 New Revision: 1578661 URL: http://svn.apache.org/r1578661 Log: HIVE-6666 : Metastore init scripts should always populate the version information at the end (Prasad Mujumdar via Ashutosh Chauhan)
Modified: hive/trunk/metastore/scripts/upgrade/derby/hive-schema-0.13.0.derby.sql hive/trunk/metastore/scripts/upgrade/derby/hive-schema-0.14.0.derby.sql hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-0.13.0.mysql.sql hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-0.14.0.mysql.sql hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-0.14.0.oracle.sql hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-0.13.0.postgres.sql hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-0.14.0.postgres.sql Modified: hive/trunk/metastore/scripts/upgrade/derby/hive-schema-0.13.0.derby.sql URL: http://svn.apache.org/viewvc/hive/trunk/metastore/scripts/upgrade/derby/hive-schema-0.13.0.derby.sql?rev=1578661&r1=1578660&r2=1578661&view=diff ============================================================================== --- hive/trunk/metastore/scripts/upgrade/derby/hive-schema-0.13.0.derby.sql (original) +++ hive/trunk/metastore/scripts/upgrade/derby/hive-schema-0.13.0.derby.sql Mon Mar 17 23:34:02 2014 @@ -314,8 +314,6 @@ ALTER TABLE "APP"."IDXS" ADD CONSTRAINT ALTER TABLE "APP"."SDS" ADD CONSTRAINT "SQL110318025505550" CHECK (IS_COMPRESSED IN ('Y','N')); -INSERT INTO "APP"."VERSION" (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '0.13.0', 'Hive release version 0.13.0'); - -- ----------------------------------------------------------------------------------------------------------------------------------------------- -- Transaction and Lock Tables -- These are not part of package jdo, so if you are going to regenerate this file you need to manually add the following section back to the file. @@ -390,4 +388,8 @@ CREATE TABLE NEXT_COMPACTION_QUEUE_ID ( INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1); +-- ----------------------------------------------------------------- +-- Record schema version. Should be the last step in the init script +-- ----------------------------------------------------------------- +INSERT INTO "APP"."VERSION" (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '0.13.0', 'Hive release version 0.13.0'); Modified: hive/trunk/metastore/scripts/upgrade/derby/hive-schema-0.14.0.derby.sql URL: http://svn.apache.org/viewvc/hive/trunk/metastore/scripts/upgrade/derby/hive-schema-0.14.0.derby.sql?rev=1578661&r1=1578660&r2=1578661&view=diff ============================================================================== --- hive/trunk/metastore/scripts/upgrade/derby/hive-schema-0.14.0.derby.sql (original) +++ hive/trunk/metastore/scripts/upgrade/derby/hive-schema-0.14.0.derby.sql Mon Mar 17 23:34:02 2014 @@ -314,9 +314,13 @@ ALTER TABLE "APP"."IDXS" ADD CONSTRAINT ALTER TABLE "APP"."SDS" ADD CONSTRAINT "SQL110318025505550" CHECK (IS_COMPRESSED IN ('Y','N')); -INSERT INTO "APP"."VERSION" (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '0.14.0', 'Hive release version 0.14.0'); - -- ---------------------------- -- Transaction and Lock Tables -- ---------------------------- 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, '0.14.0', 'Hive release version 0.14.0'); + Modified: hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-0.13.0.mysql.sql URL: http://svn.apache.org/viewvc/hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-0.13.0.mysql.sql?rev=1578661&r1=1578660&r2=1578661&view=diff ============================================================================== --- hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-0.13.0.mysql.sql (original) +++ hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-0.13.0.mysql.sql Mon Mar 17 23:34:02 2014 @@ -794,8 +794,6 @@ CREATE TABLE IF NOT EXISTS `FUNC_RU` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '0.13.0', 'Hive release version 0.13.0'); - -- ----------------------------------------------------------------------------------------------------------------------------------------------- -- Transaction and Lock Tables -- These are not part of package jdo, so if you are going to regenerate this file you need to manually add the following section back to the file. @@ -872,6 +870,11 @@ CREATE TABLE NEXT_COMPACTION_QUEUE_ID ( INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1); +-- ----------------------------------------------------------------- +-- Record schema version. Should be the last step in the init script +-- ----------------------------------------------------------------- +INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '0.13.0', 'Hive release version 0.13.0'); + /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; Modified: hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-0.14.0.mysql.sql URL: http://svn.apache.org/viewvc/hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-0.14.0.mysql.sql?rev=1578661&r1=1578660&r2=1578661&view=diff ============================================================================== --- hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-0.14.0.mysql.sql (original) +++ hive/trunk/metastore/scripts/upgrade/mysql/hive-schema-0.14.0.mysql.sql Mon Mar 17 23:34:02 2014 @@ -794,13 +794,16 @@ CREATE TABLE IF NOT EXISTS `FUNC_RU` ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '0.14.0', 'Hive release version 0.14.0'); - -- ---------------------------- -- Transaction and Lock Tables -- ---------------------------- 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, '0.14.0', 'Hive release version 0.14.0'); + /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; Modified: hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql URL: http://svn.apache.org/viewvc/hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql?rev=1578661&r1=1578660&r2=1578661&view=diff ============================================================================== --- hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql (original) +++ hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql Mon Mar 17 23:34:02 2014 @@ -754,8 +754,6 @@ ALTER TABLE FUNC_RU ADD CONSTRAINT FUNC_ CREATE INDEX FUNC_RU_N49 ON FUNC_RU (FUNC_ID); -INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '0.13.0', 'Hive release version 0.13.0'); - -- ----------------------------------------------------------------------------------------------------------------------------------------------- -- Transaction and Lock Tables -- These are not part of package jdo, so if you are going to regenerate this file you need to manually add the following section back to the file. @@ -830,3 +828,8 @@ CREATE TABLE NEXT_COMPACTION_QUEUE_ID ( INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1); +-- ----------------------------------------------------------------- +-- Record schema version. Should be the last step in the init script +-- ----------------------------------------------------------------- +INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '0.13.0', 'Hive release version 0.13.0'); + Modified: hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-0.14.0.oracle.sql URL: http://svn.apache.org/viewvc/hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-0.14.0.oracle.sql?rev=1578661&r1=1578660&r2=1578661&view=diff ============================================================================== --- hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-0.14.0.oracle.sql (original) +++ hive/trunk/metastore/scripts/upgrade/oracle/hive-schema-0.14.0.oracle.sql Mon Mar 17 23:34:02 2014 @@ -753,10 +753,12 @@ ALTER TABLE FUNC_RU ADD CONSTRAINT FUNC_ CREATE INDEX FUNC_RU_N49 ON FUNC_RU (FUNC_ID); - -INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '0.14.0', 'Hive release version 0.14.0'); - ------------------------------ -- Transaction and lock tables ------------------------------ @hive-txn-schema-0.13.0.oracle.sql; + +-- ----------------------------------------------------------------- +-- Record schema version. Should be the last step in the init script +-- ----------------------------------------------------------------- +INSERT INTO VERSION (VER_ID, SCHEMA_VERSION, VERSION_COMMENT) VALUES (1, '0.14.0', 'Hive release version 0.14.0'); Modified: hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-0.13.0.postgres.sql URL: http://svn.apache.org/viewvc/hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-0.13.0.postgres.sql?rev=1578661&r1=1578660&r2=1578661&view=diff ============================================================================== --- hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-0.13.0.postgres.sql (original) +++ hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-0.13.0.postgres.sql Mon Mar 17 23:34:02 2014 @@ -1453,7 +1453,6 @@ REVOKE ALL ON SCHEMA public FROM PUBLIC; GRANT ALL ON SCHEMA public TO PUBLIC; -INSERT INTO "VERSION" ("VER_ID", "SCHEMA_VERSION", "VERSION_COMMENT") VALUES (1, '0.13.0', 'Hive release version 0.13.0'); -- -- PostgreSQL database dump complete -- @@ -1532,4 +1531,8 @@ CREATE TABLE NEXT_COMPACTION_QUEUE_ID ( INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1); +-- ----------------------------------------------------------------- +-- Record schema version. Should be the last step in the init script +-- ----------------------------------------------------------------- +INSERT INTO "VERSION" ("VER_ID", "SCHEMA_VERSION", "VERSION_COMMENT") VALUES (1, '0.13.0', 'Hive release version 0.13.0'); Modified: hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-0.14.0.postgres.sql URL: http://svn.apache.org/viewvc/hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-0.14.0.postgres.sql?rev=1578661&r1=1578660&r2=1578661&view=diff ============================================================================== --- hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-0.14.0.postgres.sql (original) +++ hive/trunk/metastore/scripts/upgrade/postgres/hive-schema-0.14.0.postgres.sql Mon Mar 17 23:34:02 2014 @@ -1452,8 +1452,6 @@ ALTER TABLE ONLY "FUNC_RU" REVOKE ALL ON SCHEMA public FROM PUBLIC; GRANT ALL ON SCHEMA public TO PUBLIC; - -INSERT INTO "VERSION" ("VER_ID", "SCHEMA_VERSION", "VERSION_COMMENT") VALUES (1, '0.14.0', 'Hive release version 0.14.0'); -- -- PostgreSQL database dump complete -- @@ -1462,3 +1460,8 @@ INSERT INTO "VERSION" ("VER_ID", "SCHEMA -- Transaction and lock tables ------------------------------ \i hive-txn-schema-0.13.0.postgres.sql; + +-- ----------------------------------------------------------------- +-- Record schema version. Should be the last step in the init script +-- ----------------------------------------------------------------- +INSERT INTO "VERSION" ("VER_ID", "SCHEMA_VERSION", "VERSION_COMMENT") VALUES (1, '0.14.0', 'Hive release version 0.14.0');