You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ng...@apache.org on 2019/03/07 16:27:21 UTC

[hive] branch master updated: HIVE-21337: HMS Metadata migration from Postgres/Derby to other DBs fail (Naveen Gangam, reviewed by Yongzhi Chen)

This is an automated email from the ASF dual-hosted git repository.

ngangam pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git


The following commit(s) were added to refs/heads/master by this push:
     new 8ab6ced  HIVE-21337: HMS Metadata migration from Postgres/Derby to other DBs fail (Naveen Gangam, reviewed by Yongzhi Chen)
8ab6ced is described below

commit 8ab6ced1129584644877e22354c7064957639d8d
Author: Naveen Gangam <ng...@apache.org>
AuthorDate: Thu Mar 7 11:27:05 2019 -0500

    HIVE-21337: HMS Metadata migration from Postgres/Derby to other DBs fail (Naveen Gangam, reviewed by Yongzhi Chen)
---
 .../metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql    | 2 +-
 .../src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql                | 3 +++
 .../metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql    | 2 +-
 .../src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql                | 3 +++
 .../metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql  | 2 +-
 .../src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql              | 3 +++
 6 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql
index 4f58343..cde23ed 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql
@@ -576,7 +576,7 @@ ALTER TABLE INDEX_PARAMS ADD CONSTRAINT INDEX_PARAMS_PK PRIMARY KEY (INDEX_ID,PA
 CREATE TABLE COLUMNS_V2
 (
     CD_ID bigint NOT NULL,
-    COMMENT nvarchar(256) NULL,
+    COMMENT nvarchar(4000) NULL,
     "COLUMN_NAME" nvarchar(767) NOT NULL,
     TYPE_NAME varchar(max) NOT NULL,
     INTEGER_IDX int NOT NULL
diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql
index e0d143a..fccd34a 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql
@@ -13,6 +13,9 @@ CREATE UNIQUE INDEX UNIQUE_WM_RESOURCEPLAN ON WM_RESOURCEPLAN ("NS", "NAME");
 -- HIVE-21063
 CREATE UNIQUE INDEX NOTIFICATION_LOG_EVENT_ID ON NOTIFICATION_LOG (EVENT_ID);
 
+-- HIVE-21337
+ALTER TABLE "COLUMNS_V2" ALTER COLUMN "COMMENT" nvarchar(4000);
+
 -- These lines need to be last.  Insert any changes above.
 UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1;
 SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0' AS MESSAGE;
diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql
index 8db11d3..cd03ba7 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql
@@ -51,7 +51,7 @@ CREATE TABLE IF NOT EXISTS `CDS` (
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE IF NOT EXISTS `COLUMNS_V2` (
   `CD_ID` bigint(20) NOT NULL,
-  `COMMENT` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+  `COMMENT` varchar(4000) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
   `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
   `TYPE_NAME` MEDIUMTEXT DEFAULT NULL,
   `INTEGER_IDX` int(11) NOT NULL,
diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql
index 47c3831..87e8aad 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql
@@ -14,6 +14,9 @@ ALTER TABLE `WM_RESOURCEPLAN` ADD UNIQUE KEY `UNIQUE_WM_RESOURCEPLAN` (`NAME`, `
 -- HIVE-21063
 CREATE UNIQUE INDEX `NOTIFICATION_LOG_EVENT_ID` ON NOTIFICATION_LOG (`EVENT_ID`) USING BTREE;
 
+-- HIVE-21337
+ALTER TABLE COLUMNS_V2 MODIFY COMMENT varchar(4000) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL;
+
 -- These lines need to be last.  Insert any changes above.
 UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1;
 SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0' AS ' ';
diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql
index 8af9a76..a861d3d 100644
--- a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql
@@ -57,7 +57,7 @@ ALTER TABLE CDS ADD CONSTRAINT CDS_PK PRIMARY KEY (CD_ID);
 CREATE TABLE COLUMNS_V2
 (
     CD_ID NUMBER NOT NULL,
-    "COMMENT" VARCHAR2(256) NULL,
+    "COMMENT" VARCHAR2(4000) NULL,
     "COLUMN_NAME" VARCHAR2(767) NOT NULL,
     TYPE_NAME CLOB NOT NULL,
     INTEGER_IDX NUMBER(10) NOT NULL
diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql
index 231376b..3dd266e 100644
--- a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql
@@ -12,6 +12,9 @@ CREATE UNIQUE INDEX UNIQUE_WM_RESOURCEPLAN ON WM_RESOURCEPLAN (NS, "NAME");
 -- HIVE-21063
 CREATE UNIQUE INDEX NOTIFICATION_LOG_EVENT_ID ON NOTIFICATION_LOG(EVENT_ID);
 
+-- HIVE-21337
+ALTER TABLE COLUMNS_V2 MODIFY ("COMMENT" VARCHAR2(4000));
+
 -- These lines need to be last.  Insert any changes above.
 UPDATE VERSION SET SCHEMA_VERSION='4.0.0', VERSION_COMMENT='Hive release version 4.0.0' where VER_ID=1;
 SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0' AS Status from dual;