commit e868e4cc2398157d590eaa870fb029f69bac5abe Author: Alan Gates Date: Mon Apr 30 16:04:45 2018 -0700 HIVE-19120 catalog not properly set for some tables in SQL upgrade scripts diff --git standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql index ed6c4cd3d7..b4c46cd237 100644 --- standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql +++ 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, diff --git standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql index c2504d33c6..b338f0d061 100644 --- standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql +++ 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 ( diff --git standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql index e01b4da7fd..b0d19271e9 100644 --- standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql +++ 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; diff --git standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql index 327800bb0d..0b7c793f16 100644 --- standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql +++ 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, diff --git standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql index 63932a9cf3..f06f0dd34e 100644 --- standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql +++ 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,