Repository: hive Updated Branches: refs/heads/branch-3 0b1affb8c -> 75141b69d
HIVE-19120 catalog not properly set for some tables in SQL upgrade scripts (Alan Gates, reviewed by Thejas Nair) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/75141b69 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/75141b69 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/75141b69 Branch: refs/heads/branch-3 Commit: 75141b69d10018609f3cc0a8cf484d59035caaaf Parents: 0b1affb Author: Alan Gates <ga...@hortonworks.com> Authored: Tue May 1 13:52:39 2018 -0700 Committer: Alan Gates <ga...@hortonworks.com> Committed: Tue May 1 13:52:39 2018 -0700 ---------------------------------------------------------------------- .../src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql | 4 ++++ .../src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql | 4 ++++ .../src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql | 4 ++++ .../src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql | 4 ++++ .../src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql | 4 ++++ 5 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/75141b69/standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql b/standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql index ed6c4cd..b4c46cd 100644 --- a/standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql +++ b/standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql @@ -216,9 +216,13 @@ CREATE INDEX "APP"."PCS_STATS_IDX" ON "APP"."PART_COL_STATS" ("CAT_NAME", "DB_NA -- Add column to partition events ALTER TABLE "APP"."PARTITION_EVENTS" ADD COLUMN "CAT_NAME" VARCHAR(256); +UPDATE "APP"."PARTITION_EVENTS" + SET "CAT_NAME" = 'hive' WHERE "DB_NAME" IS NOT NULL; -- Add column to notification log ALTER TABLE "APP"."NOTIFICATION_LOG" ADD COLUMN "CAT_NAME" VARCHAR(256); +UPDATE "APP"."NOTIFICATION_LOG" + SET "CAT_NAME" = 'hive' WHERE "DB_NAME" IS NOT NULL; CREATE TABLE REPL_TXN_MAP ( RTM_REPL_POLICY varchar(256) NOT NULL, http://git-wip-us.apache.org/repos/asf/hive/blob/75141b69/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql b/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql index c2504d3..b338f0d 100644 --- a/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql +++ b/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql @@ -290,9 +290,13 @@ CREATE INDEX PCS_STATS_IDX ON PART_COL_STATS (CAT_NAME, DB_NAME, TABLE_NAME, COL -- Add columns to partition events ALTER TABLE PARTITION_EVENTS ADD CAT_NAME nvarchar(256); +UPDATE PARTITION_EVENTS + SET CAT_NAME = 'hive' WHERE DB_NAME IS NOT NULL; -- Add columns to notification log ALTER TABLE NOTIFICATION_LOG ADD CAT_NAME nvarchar(256); +UPDATE NOTIFICATION_LOG + SET CAT_NAME = 'hive' WHERE DB_NAME IS NOT NULL; -- HIVE-18747 CREATE TABLE MIN_HISTORY_LEVEL ( http://git-wip-us.apache.org/repos/asf/hive/blob/75141b69/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql b/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql index e01b4da..b0d1927 100644 --- a/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql +++ b/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql @@ -264,9 +264,13 @@ CREATE INDEX `PCS_STATS_IDX` ON `PART_COL_STATS` (`CAT_NAME`, `DB_NAME`, `TABLE_ -- Add column to partition events ALTER TABLE `PARTITION_EVENTS` ADD COLUMN `CAT_NAME` varchar(256); +UPDATE `PARTITION_EVENTS` + SET `CAT_NAME` = 'hive' WHERE `DB_NAME` IS NOT NULL; -- Add column to notification log ALTER TABLE `NOTIFICATION_LOG` ADD COLUMN `CAT_NAME` varchar(256); +UPDATE `NOTIFICATION_LOG` + SET `CAT_NAME` = 'hive' WHERE `DB_NAME` IS NOT NULL; INSERT INTO `SEQUENCE_TABLE` (`SEQUENCE_NAME`, `NEXT_VAL`) SELECT * from (select 'org.apache.hadoop.hive.metastore.model.MNotificationLog' as `SEQUENCE_NAME`, 1 as `NEXT_VAL`) a WHERE (SELECT COUNT(*) FROM `SEQUENCE_TABLE` where SEQUENCE_NAME = 'org.apache.hadoop.hive.metastore.model.MNotificationLog') = 0; http://git-wip-us.apache.org/repos/asf/hive/blob/75141b69/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql b/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql index 327800b..0b7c793 100644 --- a/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql +++ b/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql @@ -275,9 +275,13 @@ CREATE INDEX PCS_STATS_IDX ON PART_COL_STATS (CAT_NAME, DB_NAME,TABLE_NAME,COLUM -- Add column to partition events ALTER TABLE PARTITION_EVENTS ADD CAT_NAME VARCHAR2(256); +UPDATE PARTITION_EVENTS + SET CAT_NAME = 'hive' WHERE DB_NAME IS NOT NULL; -- Add column to notification log ALTER TABLE NOTIFICATION_LOG ADD CAT_NAME VARCHAR2(256); +UPDATE NOTIFICATION_LOG + SET CAT_NAME = 'hive' WHERE DB_NAME IS NOT NULL; CREATE TABLE REPL_TXN_MAP ( RTM_REPL_POLICY varchar(256) NOT NULL, http://git-wip-us.apache.org/repos/asf/hive/blob/75141b69/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql b/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql index 63932a9..f06f0dd 100644 --- a/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql +++ b/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql @@ -292,9 +292,13 @@ CREATE INDEX "PCS_STATS_IDX" ON "PART_COL_STATS" ("CAT_NAME", "DB_NAME", "TABLE_ -- Add column to partition event ALTER TABLE "PARTITION_EVENTS" ADD "CAT_NAME" varchar(256); +UPDATE "PARTITION_EVENTS" + SET "CAT_NAME" = 'hive' WHERE "DB_NAME" IS NOT NULL; -- Add column to notification log ALTER TABLE "NOTIFICATION_LOG" ADD "CAT_NAME" varchar(256); +UPDATE "NOTIFICATION_LOG" + SET "CAT_NAME" = 'hive' WHERE "DB_NAME" IS NOT NULL; CREATE TABLE REPL_TXN_MAP ( RTM_REPL_POLICY varchar(256) NOT NULL,
