diff --git metastore/scripts/upgrade/derby/022-HIVE-11107.derby.sql metastore/scripts/upgrade/derby/022-HIVE-11107.derby.sql
index ef08acb..4a13ea9 100644
--- metastore/scripts/upgrade/derby/022-HIVE-11107.derby.sql
+++ metastore/scripts/upgrade/derby/022-HIVE-11107.derby.sql
@@ -1,2 +1,2 @@
-CREATE TABLE "APP"."TAB_COL_STATS"("DB_NAME" VARCHAR(128) NOT NULL,"TABLE_NAME" VARCHAR(128) NOT NULL, "COLUMN_NAME" VARCHAR(1000) NOT NULL, "COLUMN_TYPE" VARCHAR(128) NOT NULL, "LONG_LOW_VALUE" BIGINT, "LONG_HIGH_VALUE" BIGINT, "DOUBLE_LOW_VALUE" DOUBLE, "DOUBLE_HIGH_VALUE" DOUBLE, "BIG_DECIMAL_LOW_VALUE" VARCHAR(4000),"BIG_DECIMAL_HIGH_VALUE" VARCHAR(4000),"NUM_DISTINCTS" BIGINT, "NUM_NULLS" BIGINT NOT NULL, "AVG_COL_LEN" DOUBLE, "MAX_COL_LEN" BIGINT, "NUM_TRUES" BIGINT, "NUM_FALSES" BIGINT, "LAST_ANALYZED" BIGINT, "CS_ID" BIGINT NOT NULL, "TBL_ID" BIGINT NOT NULL);
-CREATE TABLE "APP"."TABLE_PARAMS" ("TBL_ID" BIGINT NOT NULL, "PARAM_KEY" VARCHAR(256) NOT NULL, "PARAM_VALUE" VARCHAR(4000));
+CREATE TABLE "APP"."TAB_COL_STATS"("DB_NAME" VARCHAR(128) NOT NULL,"TABLE_NAME" VARCHAR(256) NOT NULL, "COLUMN_NAME" VARCHAR(767) NOT NULL, "COLUMN_TYPE" VARCHAR(128) NOT NULL, "LONG_LOW_VALUE" BIGINT, "LONG_HIGH_VALUE" BIGINT, "DOUBLE_LOW_VALUE" DOUBLE, "DOUBLE_HIGH_VALUE" DOUBLE, "BIG_DECIMAL_LOW_VALUE" VARCHAR(4000),"BIG_DECIMAL_HIGH_VALUE" VARCHAR(4000),"NUM_DISTINCTS" BIGINT, "NUM_NULLS" BIGINT NOT NULL, "AVG_COL_LEN" DOUBLE, "MAX_COL_LEN" BIGINT, "NUM_TRUES" BIGINT, "NUM_FALSES" BIGINT, "LAST_ANALYZED" BIGINT, "CS_ID" BIGINT NOT NULL, "TBL_ID" BIGINT NOT NULL);
+CREATE TABLE "APP"."TABLE_PARAMS" ("TBL_ID" BIGINT NOT NULL, "PARAM_KEY" VARCHAR(256) NOT NULL, "PARAM_VALUE" CLOB);
diff --git metastore/scripts/upgrade/derby/039-HIVE-12274.derby.sql metastore/scripts/upgrade/derby/039-HIVE-12274.derby.sql
new file mode 100644
index 0000000..8775179
--- /dev/null
+++ metastore/scripts/upgrade/derby/039-HIVE-12274.derby.sql
@@ -0,0 +1,40 @@
+-- add a new temp column,type clob, drop the old column and rename temp to old col
+-- change COLUMNS_V2.TYPE_NAME to CLOB
+ALTER TABLE COLUMNS_V2 ADD COLUMN NEW_COLUMN CLOB;
+UPDATE COLUMNS_V2 SET NEW_COLUMN=TYPE_NAME;
+ALTER TABLE COLUMNS_V2 DROP COLUMN TYPE_NAME;
+RENAME COLUMN COLUMNS_V2.NEW_COLUMN TO TYPE_NAME;
+
+-- change TABLE_PARAMS.PARAM_VALUE to CLOB
+ALTER TABLE TABLE_PARAMS ADD COLUMN NEW_COLUMN CLOB;
+UPDATE TABLE_PARAMS SET NEW_COLUMN=PARAM_VALUE;
+ALTER TABLE TABLE_PARAMS DROP COLUMN PARAM_VALUE;
+RENAME COLUMN TABLE_PARAMS.NEW_COLUMN TO PARAM_VALUE;
+
+-- change SERDE_PARAMS.PARAM_VALUE to CLOB
+ALTER TABLE SERDE_PARAMS ADD COLUMN NEW_COLUMN CLOB;
+UPDATE SERDE_PARAMS SET NEW_COLUMN=PARAM_VALUE;
+ALTER TABLE SERDE_PARAMS DROP COLUMN PARAM_VALUE;
+RENAME COLUMN SERDE_PARAMS.NEW_COLUMN TO PARAM_VALUE;
+
+-- change SD_PARAMS.PARAM_VALUE to CLOB
+ALTER TABLE SD_PARAMS ADD COLUMN NEW_COLUMN CLOB;
+UPDATE SD_PARAMS SET NEW_COLUMN=PARAM_VALUE;
+ALTER TABLE SD_PARAMS DROP COLUMN PARAM_VALUE;
+RENAME COLUMN SD_PARAMS.NEW_COLUMN TO PARAM_VALUE;
+
+-- expand a hive table name length to 256 chars
+ALTER TABLE TBLS ALTER COLUMN TBL_NAME SET DATA TYPE VARCHAR(256);
+ALTER TABLE NOTIFICATION_LOG ALTER COLUMN TBL_NAME SET DATA TYPE VARCHAR(256);
+ALTER TABLE PARTITION_EVENTS ALTER COLUMN TBL_NAME SET DATA TYPE VARCHAR(256);
+ALTER TABLE TAB_COL_STATS ALTER COLUMN TABLE_NAME SET DATA TYPE VARCHAR(256);
+ALTER TABLE PART_COL_STATS ALTER COLUMN TABLE_NAME SET DATA TYPE VARCHAR(256);
+ALTER TABLE COMPLETED_TXN_COMPONENTS ALTER COLUMN CTC_TABLE SET DATA TYPE VARCHAR(256);
+
+-- expand a hive column name length to 256 chars
+ALTER TABLE COLUMNS_V2 ALTER COLUMN COLUMN_NAME SET DATA TYPE VARCHAR(767);
+ALTER TABLE PART_COL_PRIVS ALTER COLUMN COLUMN_NAME SET DATA TYPE VARCHAR(767);
+ALTER TABLE TBL_COL_PRIVS ALTER COLUMN COLUMN_NAME SET DATA TYPE VARCHAR(767);
+ALTER TABLE SORT_COLS ALTER COLUMN COLUMN_NAME SET DATA TYPE VARCHAR(767);
+ALTER TABLE TAB_COL_STATS ALTER COLUMN COLUMN_NAME SET DATA TYPE VARCHAR(767);
+ALTER TABLE PART_COL_STATS ALTER COLUMN COLUMN_NAME SET DATA TYPE VARCHAR(767);
diff --git metastore/scripts/upgrade/derby/hive-schema-2.2.0.derby.sql metastore/scripts/upgrade/derby/hive-schema-2.2.0.derby.sql
index 8a3ae78..16e611c 100644
--- metastore/scripts/upgrade/derby/hive-schema-2.2.0.derby.sql
+++ metastore/scripts/upgrade/derby/hive-schema-2.2.0.derby.sql
@@ -22,13 +22,13 @@ CREATE TABLE "APP"."TBL_PRIVS" ("TBL_GRANT_ID" BIGINT NOT NULL, "CREATE_TIME" IN
CREATE TABLE "APP"."DATABASE_PARAMS" ("DB_ID" BIGINT NOT NULL, "PARAM_KEY" VARCHAR(180) NOT NULL, "PARAM_VALUE" VARCHAR(4000));
-CREATE TABLE "APP"."TBL_COL_PRIVS" ("TBL_COLUMN_GRANT_ID" BIGINT NOT NULL, "COLUMN_NAME" VARCHAR(1000), "CREATE_TIME" INTEGER NOT NULL, "GRANT_OPTION" SMALLINT NOT NULL, "GRANTOR" VARCHAR(128), "GRANTOR_TYPE" VARCHAR(128), "PRINCIPAL_NAME" VARCHAR(128), "PRINCIPAL_TYPE" VARCHAR(128), "TBL_COL_PRIV" VARCHAR(128), "TBL_ID" BIGINT);
+CREATE TABLE "APP"."TBL_COL_PRIVS" ("TBL_COLUMN_GRANT_ID" BIGINT NOT NULL, "COLUMN_NAME" VARCHAR(767), "CREATE_TIME" INTEGER NOT NULL, "GRANT_OPTION" SMALLINT NOT NULL, "GRANTOR" VARCHAR(128), "GRANTOR_TYPE" VARCHAR(128), "PRINCIPAL_NAME" VARCHAR(128), "PRINCIPAL_TYPE" VARCHAR(128), "TBL_COL_PRIV" VARCHAR(128), "TBL_ID" BIGINT);
-CREATE TABLE "APP"."SERDE_PARAMS" ("SERDE_ID" BIGINT NOT NULL, "PARAM_KEY" VARCHAR(256) NOT NULL, "PARAM_VALUE" VARCHAR(4000));
+CREATE TABLE "APP"."SERDE_PARAMS" ("SERDE_ID" BIGINT NOT NULL, "PARAM_KEY" VARCHAR(256) NOT NULL, "PARAM_VALUE" CLOB);
-CREATE TABLE "APP"."COLUMNS_V2" ("CD_ID" BIGINT NOT NULL, "COMMENT" VARCHAR(4000), "COLUMN_NAME" VARCHAR(1000) NOT NULL, "TYPE_NAME" VARCHAR(4000), "INTEGER_IDX" INTEGER NOT NULL);
+CREATE TABLE "APP"."COLUMNS_V2" ("CD_ID" BIGINT NOT NULL, "COMMENT" VARCHAR(4000), "COLUMN_NAME" VARCHAR(767) NOT NULL, "TYPE_NAME" CLOB, "INTEGER_IDX" INTEGER NOT NULL);
-CREATE TABLE "APP"."SORT_COLS" ("SD_ID" BIGINT NOT NULL, "COLUMN_NAME" VARCHAR(1000), "ORDER" INTEGER NOT NULL, "INTEGER_IDX" INTEGER NOT NULL);
+CREATE TABLE "APP"."SORT_COLS" ("SD_ID" BIGINT NOT NULL, "COLUMN_NAME" VARCHAR(767), "ORDER" INTEGER NOT NULL, "INTEGER_IDX" INTEGER NOT NULL);
CREATE TABLE "APP"."CDS" ("CD_ID" BIGINT NOT NULL);
@@ -54,17 +54,17 @@ CREATE TABLE "APP"."GLOBAL_PRIVS" ("USER_GRANT_ID" BIGINT NOT NULL, "CREATE_TIME
CREATE TABLE "APP"."PARTITION_PARAMS" ("PART_ID" BIGINT NOT NULL, "PARAM_KEY" VARCHAR(256) NOT NULL, "PARAM_VALUE" VARCHAR(4000));
-CREATE TABLE "APP"."PARTITION_EVENTS" ("PART_NAME_ID" BIGINT NOT NULL, "DB_NAME" VARCHAR(128), "EVENT_TIME" BIGINT NOT NULL, "EVENT_TYPE" INTEGER NOT NULL, "PARTITION_NAME" VARCHAR(767), "TBL_NAME" VARCHAR(128));
+CREATE TABLE "APP"."PARTITION_EVENTS" ("PART_NAME_ID" BIGINT NOT NULL, "DB_NAME" VARCHAR(128), "EVENT_TIME" BIGINT NOT NULL, "EVENT_TYPE" INTEGER NOT NULL, "PARTITION_NAME" VARCHAR(767), "TBL_NAME" VARCHAR(256));
CREATE TABLE "APP"."COLUMNS" ("SD_ID" BIGINT NOT NULL, "COMMENT" VARCHAR(256), "COLUMN_NAME" VARCHAR(128) NOT NULL, "TYPE_NAME" VARCHAR(4000) NOT NULL, "INTEGER_IDX" INTEGER NOT NULL);
CREATE TABLE "APP"."ROLES" ("ROLE_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "OWNER_NAME" VARCHAR(128), "ROLE_NAME" VARCHAR(128));
-CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(128), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" LONG VARCHAR, "VIEW_ORIGINAL_TEXT" LONG VARCHAR, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL);
+CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(256), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" LONG VARCHAR, "VIEW_ORIGINAL_TEXT" LONG VARCHAR, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL);
CREATE TABLE "APP"."PARTITION_KEYS" ("TBL_ID" BIGINT NOT NULL, "PKEY_COMMENT" VARCHAR(4000), "PKEY_NAME" VARCHAR(128) NOT NULL, "PKEY_TYPE" VARCHAR(767) NOT NULL, "INTEGER_IDX" INTEGER NOT NULL);
-CREATE TABLE "APP"."PART_COL_PRIVS" ("PART_COLUMN_GRANT_ID" BIGINT NOT NULL, "COLUMN_NAME" VARCHAR(1000), "CREATE_TIME" INTEGER NOT NULL, "GRANT_OPTION" SMALLINT NOT NULL, "GRANTOR" VARCHAR(128), "GRANTOR_TYPE" VARCHAR(128), "PART_ID" BIGINT, "PRINCIPAL_NAME" VARCHAR(128), "PRINCIPAL_TYPE" VARCHAR(128), "PART_COL_PRIV" VARCHAR(128));
+CREATE TABLE "APP"."PART_COL_PRIVS" ("PART_COLUMN_GRANT_ID" BIGINT NOT NULL, "COLUMN_NAME" VARCHAR(767), "CREATE_TIME" INTEGER NOT NULL, "GRANT_OPTION" SMALLINT NOT NULL, "GRANTOR" VARCHAR(128), "GRANTOR_TYPE" VARCHAR(128), "PART_ID" BIGINT, "PRINCIPAL_NAME" VARCHAR(128), "PRINCIPAL_TYPE" VARCHAR(128), "PART_COL_PRIV" VARCHAR(128));
CREATE TABLE "APP"."SDS" ("SD_ID" BIGINT NOT NULL, "INPUT_FORMAT" VARCHAR(4000), "IS_COMPRESSED" CHAR(1) NOT NULL, "LOCATION" VARCHAR(4000), "NUM_BUCKETS" INTEGER NOT NULL, "OUTPUT_FORMAT" VARCHAR(4000), "SERDE_ID" BIGINT, "CD_ID" BIGINT, "IS_STOREDASSUBDIRECTORIES" CHAR(1) NOT NULL);
@@ -78,7 +78,7 @@ CREATE TABLE "APP"."TYPE_FIELDS" ("TYPE_NAME" BIGINT NOT NULL, "COMMENT" VARCHAR
CREATE TABLE "APP"."NUCLEUS_TABLES" ("CLASS_NAME" VARCHAR(128) NOT NULL, "TABLE_NAME" VARCHAR(128) NOT NULL, "TYPE" VARCHAR(4) NOT NULL, "OWNER" VARCHAR(2) NOT NULL, "VERSION" VARCHAR(20) NOT NULL, "INTERFACE_NAME" VARCHAR(256) DEFAULT NULL);
-CREATE TABLE "APP"."SD_PARAMS" ("SD_ID" BIGINT NOT NULL, "PARAM_KEY" VARCHAR(256) NOT NULL, "PARAM_VALUE" VARCHAR(4000));
+CREATE TABLE "APP"."SD_PARAMS" ("SD_ID" BIGINT NOT NULL, "PARAM_KEY" VARCHAR(256) NOT NULL, "PARAM_VALUE" CLOB);
CREATE TABLE "APP"."SKEWED_STRING_LIST" ("STRING_LIST_ID" BIGINT NOT NULL);
@@ -94,7 +94,7 @@ CREATE TABLE "APP"."MASTER_KEYS" ("KEY_ID" INTEGER NOT NULL generated always as
CREATE TABLE "APP"."DELEGATION_TOKENS" ( "TOKEN_IDENT" VARCHAR(767) NOT NULL, "TOKEN" VARCHAR(767));
-CREATE TABLE "APP"."PART_COL_STATS"("DB_NAME" VARCHAR(128) NOT NULL,"TABLE_NAME" VARCHAR(128) NOT NULL, "PARTITION_NAME" VARCHAR(767) NOT NULL, "COLUMN_NAME" VARCHAR(1000) NOT NULL, "COLUMN_TYPE" VARCHAR(128) NOT NULL, "LONG_LOW_VALUE" BIGINT, "LONG_HIGH_VALUE" BIGINT, "DOUBLE_LOW_VALUE" DOUBLE, "DOUBLE_HIGH_VALUE" DOUBLE, "BIG_DECIMAL_LOW_VALUE" VARCHAR(4000), "BIG_DECIMAL_HIGH_VALUE" VARCHAR(4000),"NUM_DISTINCTS" BIGINT, "NUM_NULLS" BIGINT NOT NULL, "AVG_COL_LEN" DOUBLE, "MAX_COL_LEN" BIGINT, "NUM_TRUES" BIGINT, "NUM_FALSES" BIGINT, "LAST_ANALYZED" BIGINT, "CS_ID" BIGINT NOT NULL, "PART_ID" BIGINT NOT NULL);
+CREATE TABLE "APP"."PART_COL_STATS"("DB_NAME" VARCHAR(128) NOT NULL,"TABLE_NAME" VARCHAR(256) NOT NULL, "PARTITION_NAME" VARCHAR(767) NOT NULL, "COLUMN_NAME" VARCHAR(767) NOT NULL, "COLUMN_TYPE" VARCHAR(128) NOT NULL, "LONG_LOW_VALUE" BIGINT, "LONG_HIGH_VALUE" BIGINT, "DOUBLE_LOW_VALUE" DOUBLE, "DOUBLE_HIGH_VALUE" DOUBLE, "BIG_DECIMAL_LOW_VALUE" VARCHAR(4000), "BIG_DECIMAL_HIGH_VALUE" VARCHAR(4000),"NUM_DISTINCTS" BIGINT, "NUM_NULLS" BIGINT NOT NULL, "AVG_COL_LEN" DOUBLE, "MAX_COL_LEN" BIGINT, "NUM_TRUES" BIGINT, "NUM_FALSES" BIGINT, "LAST_ANALYZED" BIGINT, "CS_ID" BIGINT NOT NULL, "PART_ID" BIGINT NOT NULL);
CREATE TABLE "APP"."VERSION" ("VER_ID" BIGINT NOT NULL, "SCHEMA_VERSION" VARCHAR(127) NOT NULL, "VERSION_COMMENT" VARCHAR(255));
@@ -102,7 +102,7 @@ CREATE TABLE "APP"."FUNCS" ("FUNC_ID" BIGINT NOT NULL, "CLASS_NAME" VARCHAR(4000
CREATE TABLE "APP"."FUNC_RU" ("FUNC_ID" BIGINT NOT NULL, "RESOURCE_TYPE" INTEGER NOT NULL, "RESOURCE_URI" VARCHAR(4000), "INTEGER_IDX" INTEGER NOT NULL);
-CREATE TABLE "APP"."NOTIFICATION_LOG" ("NL_ID" BIGINT NOT NULL, "DB_NAME" VARCHAR(128), "EVENT_ID" BIGINT NOT NULL, "EVENT_TIME" INTEGER NOT NULL, "EVENT_TYPE" VARCHAR(32) NOT NULL, "MESSAGE" CLOB, "TBL_NAME" VARCHAR(128), "MESSAGE_FORMAT" VARCHAR(16));
+CREATE TABLE "APP"."NOTIFICATION_LOG" ("NL_ID" BIGINT NOT NULL, "DB_NAME" VARCHAR(128), "EVENT_ID" BIGINT NOT NULL, "EVENT_TIME" INTEGER NOT NULL, "EVENT_TYPE" VARCHAR(32) NOT NULL, "MESSAGE" CLOB, "TBL_NAME" VARCHAR(256), "MESSAGE_FORMAT" VARCHAR(16));
CREATE TABLE "APP"."NOTIFICATION_SEQUENCE" ("NNI_ID" BIGINT NOT NULL, "NEXT_EVENT_ID" BIGINT NOT NULL);
diff --git metastore/scripts/upgrade/derby/hive-txn-schema-2.2.0.derby.sql metastore/scripts/upgrade/derby/hive-txn-schema-2.2.0.derby.sql
index b31ea6e..3a049aa 100644
--- metastore/scripts/upgrade/derby/hive-txn-schema-2.2.0.derby.sql
+++ metastore/scripts/upgrade/derby/hive-txn-schema-2.2.0.derby.sql
@@ -39,7 +39,7 @@ CREATE TABLE TXN_COMPONENTS (
CREATE TABLE COMPLETED_TXN_COMPONENTS (
CTC_TXNID bigint,
CTC_DATABASE varchar(128) NOT NULL,
- CTC_TABLE varchar(128),
+ CTC_TABLE varchar(256),
CTC_PARTITION varchar(767)
);
diff --git metastore/scripts/upgrade/derby/upgrade-2.1.0-to-2.2.0.derby.sql metastore/scripts/upgrade/derby/upgrade-2.1.0-to-2.2.0.derby.sql
index e5a144c..b05942f 100644
--- metastore/scripts/upgrade/derby/upgrade-2.1.0-to-2.2.0.derby.sql
+++ metastore/scripts/upgrade/derby/upgrade-2.1.0-to-2.2.0.derby.sql
@@ -1,5 +1,6 @@
-- Upgrade MetaStore schema from 2.1.0 to 2.2.0
RUN '037-HIVE-14496.derby.sql';
RUN '038-HIVE-10562.derby.sql';
+RUN '039-HIVE-12274.derby.sql';
UPDATE "APP".VERSION SET SCHEMA_VERSION='2.2.0', VERSION_COMMENT='Hive release version 2.2.0' where VER_ID=1;
diff --git metastore/scripts/upgrade/mssql/024-HIVE-12274.mssql.sql metastore/scripts/upgrade/mssql/024-HIVE-12274.mssql.sql
new file mode 100644
index 0000000..58da02c
--- /dev/null
+++ metastore/scripts/upgrade/mssql/024-HIVE-12274.mssql.sql
@@ -0,0 +1,18 @@
+ALTER TABLE "SERDE_PARAMS" ALTER COLUMN "PARAM_VALUE" VARCHAR(MAX);
+ALTER TABLE "TABLE_PARAMS" ALTER COLUMN "PARAM_VALUE" VARCHAR(MAX);
+ALTER TABLE "SD_PARAMS" ALTER COLUMN "PARAM_VALUE" VARCHAR(MAX);
+ALTER TABLE "COLUMNS_V2" ALTER COLUMN "TYPE_NAME" VARCHAR(MAX);
+
+ALTER TABLE "TBLS" ALTER COLUMN "TBL_NAME" nvarchar(256);
+ALTER TABLE "NOTIFICATION_LOG" ALTER COLUMN "TBL_NAME" nvarchar(256);
+ALTER TABLE "PARTITION_EVENTS" ALTER COLUMN "TBL_NAME" nvarchar(256);
+ALTER TABLE "TAB_COL_STATS" ALTER COLUMN "TABLE_NAME" nvarchar(256);
+ALTER TABLE "PART_COL_STATS" ALTER COLUMN "TABLE_NAME" nvarchar(256);
+ALTER TABLE "COMPLETED_TXN_COMPONENTS" ALTER COLUMN "CTC_TABLE" varchar(256);
+
+ALTER TABLE "COLUMNS_V2" ALTER COLUMN "COLUMN_NAME" nvarchar(767) NOT NULL;
+ALTER TABLE "PART_COL_PRIVS" ALTER COLUMN "COLUMN_NAME" nvarchar(767) DEFAULT NULL;
+ALTER TABLE "TBL_COL_PRIVS" ALTER COLUMN "COLUMN_NAME" nvarchar(767) DEFAULT NULL;
+ALTER TABLE "SORT_COLS" ALTER COLUMN "COLUMN_NAME" nvarchar(767) DEFAULT NULL;
+ALTER TABLE "TAB_COL_STATS" ALTER COLUMN "COLUMN_NAME" nvarchar(767) NOT NULL;
+ALTER TABLE "PART_COL_STATS" ALTER COLUMN "COLUMN_NAME" nvarchar(767) NOT NULL;
diff --git metastore/scripts/upgrade/mssql/hive-schema-2.2.0.mssql.sql metastore/scripts/upgrade/mssql/hive-schema-2.2.0.mssql.sql
index f83911a..57dd30f 100644
--- metastore/scripts/upgrade/mssql/hive-schema-2.2.0.mssql.sql
+++ metastore/scripts/upgrade/mssql/hive-schema-2.2.0.mssql.sql
@@ -75,7 +75,7 @@ CREATE TABLE PART_COL_STATS
(
CS_ID bigint NOT NULL,
AVG_COL_LEN float NULL,
- "COLUMN_NAME" nvarchar(1000) NOT NULL,
+ "COLUMN_NAME" nvarchar(767) NOT NULL,
COLUMN_TYPE nvarchar(128) NOT NULL,
DB_NAME nvarchar(128) NOT NULL,
BIG_DECIMAL_HIGH_VALUE nvarchar(255) NULL,
@@ -92,7 +92,7 @@ CREATE TABLE PART_COL_STATS
NUM_TRUES bigint NULL,
PART_ID bigint NULL,
PARTITION_NAME nvarchar(767) NOT NULL,
- "TABLE_NAME" nvarchar(128) NOT NULL
+ "TABLE_NAME" nvarchar(256) NOT NULL
);
ALTER TABLE PART_COL_STATS ADD CONSTRAINT PART_COL_STATS_PK PRIMARY KEY (CS_ID);
@@ -184,7 +184,7 @@ ALTER TABLE GLOBAL_PRIVS ADD CONSTRAINT GLOBAL_PRIVS_PK PRIMARY KEY (USER_GRANT_
CREATE TABLE PART_COL_PRIVS
(
PART_COLUMN_GRANT_ID bigint NOT NULL,
- "COLUMN_NAME" nvarchar(1000) NULL,
+ "COLUMN_NAME" nvarchar(767) NULL,
CREATE_TIME int NOT NULL,
GRANT_OPTION smallint NOT NULL CHECK (GRANT_OPTION IN (0,1)),
GRANTOR nvarchar(128) NULL,
@@ -218,7 +218,7 @@ CREATE TABLE TAB_COL_STATS
(
CS_ID bigint NOT NULL,
AVG_COL_LEN float NULL,
- "COLUMN_NAME" nvarchar(1000) NOT NULL,
+ "COLUMN_NAME" nvarchar(767) NOT NULL,
COLUMN_TYPE nvarchar(128) NOT NULL,
DB_NAME nvarchar(128) NOT NULL,
BIG_DECIMAL_HIGH_VALUE nvarchar(255) NULL,
@@ -234,7 +234,7 @@ CREATE TABLE TAB_COL_STATS
NUM_NULLS bigint NOT NULL,
NUM_TRUES bigint NULL,
TBL_ID bigint NULL,
- "TABLE_NAME" nvarchar(128) NOT NULL
+ "TABLE_NAME" nvarchar(256) NOT NULL
);
ALTER TABLE TAB_COL_STATS ADD CONSTRAINT TAB_COL_STATS_PK PRIMARY KEY (CS_ID);
@@ -283,7 +283,7 @@ ALTER TABLE DBS ADD CONSTRAINT DBS_PK PRIMARY KEY (DB_ID);
CREATE TABLE TBL_COL_PRIVS
(
TBL_COLUMN_GRANT_ID bigint NOT NULL,
- "COLUMN_NAME" nvarchar(1000) NULL,
+ "COLUMN_NAME" nvarchar(767) NULL,
CREATE_TIME int NOT NULL,
GRANT_OPTION smallint NOT NULL CHECK (GRANT_OPTION IN (0,1)),
GRANTOR nvarchar(128) NULL,
@@ -355,7 +355,7 @@ CREATE TABLE TBLS
OWNER nvarchar(767) NULL,
RETENTION int NOT NULL,
SD_ID bigint NULL,
- TBL_NAME nvarchar(128) NULL,
+ TBL_NAME nvarchar(256) NULL,
TBL_TYPE nvarchar(128) NULL,
VIEW_EXPANDED_TEXT text NULL,
VIEW_ORIGINAL_TEXT text NULL,
@@ -388,7 +388,7 @@ CREATE TABLE PARTITION_EVENTS
EVENT_TIME bigint NOT NULL,
EVENT_TYPE int NOT NULL,
PARTITION_NAME nvarchar(767) NULL,
- TBL_NAME nvarchar(128) NULL
+ TBL_NAME nvarchar(256) NULL
);
ALTER TABLE PARTITION_EVENTS ADD CONSTRAINT PARTITION_EVENTS_PK PRIMARY KEY (PART_NAME_ID);
@@ -397,7 +397,7 @@ ALTER TABLE PARTITION_EVENTS ADD CONSTRAINT PARTITION_EVENTS_PK PRIMARY KEY (PAR
CREATE TABLE SORT_COLS
(
SD_ID bigint NOT NULL,
- "COLUMN_NAME" nvarchar(1000) NULL,
+ "COLUMN_NAME" nvarchar(767) NULL,
"ORDER" int NOT NULL,
INTEGER_IDX int NOT NULL
);
@@ -471,7 +471,7 @@ CREATE TABLE SD_PARAMS
(
SD_ID bigint NOT NULL,
PARAM_KEY nvarchar(256) NOT NULL,
- PARAM_VALUE nvarchar(4000) NULL
+ PARAM_VALUE varchar(max) NULL
);
ALTER TABLE SD_PARAMS ADD CONSTRAINT SD_PARAMS_PK PRIMARY KEY (SD_ID,PARAM_KEY);
@@ -534,8 +534,8 @@ CREATE TABLE COLUMNS_V2
(
CD_ID bigint NOT NULL,
COMMENT nvarchar(256) NULL,
- "COLUMN_NAME" nvarchar(1000) NOT NULL,
- TYPE_NAME nvarchar(4000) NOT NULL,
+ "COLUMN_NAME" nvarchar(767) NOT NULL,
+ TYPE_NAME varchar(max) NOT NULL,
INTEGER_IDX int NOT NULL
);
@@ -546,7 +546,7 @@ CREATE TABLE SERDE_PARAMS
(
SERDE_ID bigint NOT NULL,
PARAM_KEY nvarchar(256) NOT NULL,
- PARAM_VALUE nvarchar(4000) NULL
+ PARAM_VALUE varchar(max) NULL
);
ALTER TABLE SERDE_PARAMS ADD CONSTRAINT SERDE_PARAMS_PK PRIMARY KEY (SERDE_ID,PARAM_KEY);
@@ -566,7 +566,7 @@ CREATE TABLE TABLE_PARAMS
(
TBL_ID bigint NOT NULL,
PARAM_KEY nvarchar(256) NOT NULL,
- PARAM_VALUE nvarchar(4000) NULL
+ PARAM_VALUE varchar(max) NULL
);
ALTER TABLE TABLE_PARAMS ADD CONSTRAINT TABLE_PARAMS_PK PRIMARY KEY (TBL_ID,PARAM_KEY);
@@ -578,7 +578,7 @@ CREATE TABLE NOTIFICATION_LOG
EVENT_TIME int NOT NULL,
EVENT_TYPE nvarchar(32) NOT NULL,
DB_NAME nvarchar(128) NULL,
- TBL_NAME nvarchar(128) NULL,
+ TBL_NAME nvarchar(256) NULL,
MESSAGE_FORMAT nvarchar(16)
MESSAGE text NULL
);
diff --git metastore/scripts/upgrade/mssql/hive-txn-schema-0.14.0.mssql.sql metastore/scripts/upgrade/mssql/hive-txn-schema-0.14.0.mssql.sql
index cba9637..b7dda59 100644
--- metastore/scripts/upgrade/mssql/hive-txn-schema-0.14.0.mssql.sql
+++ metastore/scripts/upgrade/mssql/hive-txn-schema-0.14.0.mssql.sql
@@ -36,7 +36,7 @@ PRIMARY KEY CLUSTERED
CREATE TABLE COMPLETED_TXN_COMPONENTS(
CTC_TXNID bigint NULL,
CTC_DATABASE varchar(128) NOT NULL,
- CTC_TABLE varchar(128) NULL,
+ CTC_TABLE varchar(256) NULL,
CTC_PARTITION varchar(767) NULL
);
diff --git metastore/scripts/upgrade/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql metastore/scripts/upgrade/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql
index a4b8fda..4995349 100644
--- metastore/scripts/upgrade/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql
+++ metastore/scripts/upgrade/mssql/upgrade-2.1.0-to-2.2.0.mssql.sql
@@ -2,6 +2,7 @@ SELECT 'Upgrading MetaStore schema from 2.1.0 to 2.2.0' AS MESSAGE;
:r 022-HIVE-14496.mssql.sql
:r 023-HIVE-10562.mssql.sql
+:r 024-HIVE-12274.mssql.sql
UPDATE VERSION SET SCHEMA_VERSION='2.2.0', VERSION_COMMENT='Hive release version 2.2.0' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 2.1.0 to 2.2.0' AS MESSAGE;
diff --git metastore/scripts/upgrade/mysql/039-HIVE-12274.mysql.sql metastore/scripts/upgrade/mysql/039-HIVE-12274.mysql.sql
new file mode 100644
index 0000000..cdaf286
--- /dev/null
+++ metastore/scripts/upgrade/mysql/039-HIVE-12274.mysql.sql
@@ -0,0 +1,18 @@
+ALTER TABLE COLUMNS_V2 MODIFY TYPE_NAME MEDIUMTEXT;
+ALTER TABLE TABLE_PARAMS MODIFY PARAM_VALUE MEDIUMTEXT;
+ALTER TABLE SERDE_PARAMS MODIFY PARAM_VALUE MEDIUMTEXT;
+ALTER TABLE SD_PARAMS MODIFY PARAM_VALUE MEDIUMTEXT;
+
+ALTER TABLE TBLS MODIFY TBL_NAME varchar(256) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL;
+ALTER TABLE NOTIFICATION_LOG MODIFY TBL_NAME varchar(256) CHARACTER SET latin1 COLLATE latin1_bin;
+ALTER TABLE PARTITION_EVENTS MODIFY TBL_NAME varchar(256) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL;
+ALTER TABLE TAB_COL_STATS MODIFY TABLE_NAME varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL;
+ALTER TABLE PART_COL_STATS MODIFY TABLE_NAME varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL;
+ALTER TABLE COMPLETED_TXN_COMPONENTS MODIFY CTC_TABLE varchar(256) CHARACTER SET latin1 COLLATE latin1_bin;
+
+ALTER TABLE COLUMNS_V2 MODIFY COLUMN_NAME varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL;
+ALTER TABLE PART_COL_PRIVS MODIFY COLUMN_NAME varchar(767) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL;
+ALTER TABLE TBL_COL_PRIVS MODIFY COLUMN_NAME varchar(767) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL;
+ALTER TABLE SORT_COLS MODIFY COLUMN_NAME varchar(767) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL;
+ALTER TABLE TAB_COL_STATS MODIFY COLUMN_NAME varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL;
+ALTER TABLE PART_COL_STATS MODIFY COLUMN_NAME varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL;
diff --git metastore/scripts/upgrade/mysql/hive-schema-2.2.0.mysql.sql metastore/scripts/upgrade/mysql/hive-schema-2.2.0.mysql.sql
index 537b191..d1852df 100644
--- metastore/scripts/upgrade/mysql/hive-schema-2.2.0.mysql.sql
+++ metastore/scripts/upgrade/mysql/hive-schema-2.2.0.mysql.sql
@@ -53,7 +53,7 @@ CREATE TABLE IF NOT EXISTS `COLUMNS_V2` (
`CD_ID` bigint(20) NOT NULL,
`COMMENT` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
`COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
- `TYPE_NAME` varchar(4000) DEFAULT NULL,
+ `TYPE_NAME` MEDIUMTEXT DEFAULT NULL,
`INTEGER_IDX` int(11) NOT NULL,
PRIMARY KEY (`CD_ID`,`COLUMN_NAME`),
KEY `COLUMNS_V2_N49` (`CD_ID`),
@@ -232,7 +232,7 @@ CREATE TABLE IF NOT EXISTS `PARTITION_EVENTS` (
`EVENT_TIME` bigint(20) NOT NULL,
`EVENT_TYPE` int(11) NOT NULL,
`PARTITION_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
- `TBL_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+ `TBL_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
PRIMARY KEY (`PART_NAME_ID`),
KEY `PARTITIONEVENTINDEX` (`PARTITION_NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -296,7 +296,7 @@ CREATE TABLE IF NOT EXISTS `PARTITION_PARAMS` (
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `PART_COL_PRIVS` (
`PART_COLUMN_GRANT_ID` bigint(20) NOT NULL,
- `COLUMN_NAME` varchar(1000) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+ `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
`CREATE_TIME` int(11) NOT NULL,
`GRANT_OPTION` smallint(6) NOT NULL,
`GRANTOR` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
@@ -406,7 +406,7 @@ CREATE TABLE IF NOT EXISTS `SDS` (
CREATE TABLE IF NOT EXISTS `SD_PARAMS` (
`SD_ID` bigint(20) NOT NULL,
`PARAM_KEY` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
- `PARAM_VALUE` varchar(4000) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+ `PARAM_VALUE` MEDIUMTEXT CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
PRIMARY KEY (`SD_ID`,`PARAM_KEY`),
KEY `SD_PARAMS_N49` (`SD_ID`),
CONSTRAINT `SD_PARAMS_FK1` FOREIGN KEY (`SD_ID`) REFERENCES `SDS` (`SD_ID`)
@@ -449,7 +449,7 @@ CREATE TABLE IF NOT EXISTS `SERDES` (
CREATE TABLE IF NOT EXISTS `SERDE_PARAMS` (
`SERDE_ID` bigint(20) NOT NULL,
`PARAM_KEY` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
- `PARAM_VALUE` varchar(4000) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+ `PARAM_VALUE` MEDIUMTEXT CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
PRIMARY KEY (`SERDE_ID`,`PARAM_KEY`),
KEY `SERDE_PARAMS_N49` (`SERDE_ID`),
CONSTRAINT `SERDE_PARAMS_FK1` FOREIGN KEY (`SERDE_ID`) REFERENCES `SERDES` (`SERDE_ID`)
@@ -544,7 +544,7 @@ CREATE TABLE IF NOT EXISTS `SKEWED_VALUES` (
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `SORT_COLS` (
`SD_ID` bigint(20) NOT NULL,
- `COLUMN_NAME` varchar(1000) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+ `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
`ORDER` int(11) NOT NULL,
`INTEGER_IDX` int(11) NOT NULL,
PRIMARY KEY (`SD_ID`,`INTEGER_IDX`),
@@ -562,7 +562,7 @@ CREATE TABLE IF NOT EXISTS `SORT_COLS` (
CREATE TABLE IF NOT EXISTS `TABLE_PARAMS` (
`TBL_ID` bigint(20) NOT NULL,
`PARAM_KEY` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
- `PARAM_VALUE` varchar(4000) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+ `PARAM_VALUE` MEDIUMTEXT CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
PRIMARY KEY (`TBL_ID`,`PARAM_KEY`),
KEY `TABLE_PARAMS_N49` (`TBL_ID`),
CONSTRAINT `TABLE_PARAMS_FK1` FOREIGN KEY (`TBL_ID`) REFERENCES `TBLS` (`TBL_ID`)
@@ -583,7 +583,7 @@ CREATE TABLE IF NOT EXISTS `TBLS` (
`OWNER` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
`RETENTION` int(11) NOT NULL,
`SD_ID` bigint(20) DEFAULT NULL,
- `TBL_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+ `TBL_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
`TBL_TYPE` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
`VIEW_EXPANDED_TEXT` mediumtext,
`VIEW_ORIGINAL_TEXT` mediumtext,
@@ -605,7 +605,7 @@ CREATE TABLE IF NOT EXISTS `TBLS` (
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE IF NOT EXISTS `TBL_COL_PRIVS` (
`TBL_COLUMN_GRANT_ID` bigint(20) NOT NULL,
- `COLUMN_NAME` varchar(1000) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
+ `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
`CREATE_TIME` int(11) NOT NULL,
`GRANT_OPTION` smallint(6) NOT NULL,
`GRANTOR` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
@@ -650,8 +650,8 @@ CREATE TABLE IF NOT EXISTS `TBL_PRIVS` (
CREATE TABLE IF NOT EXISTS `TAB_COL_STATS` (
`CS_ID` bigint(20) NOT NULL,
`DB_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
- `TABLE_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
- `COLUMN_NAME` varchar(1000) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+ `TABLE_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+ `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
`COLUMN_TYPE` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
`TBL_ID` bigint(20) NOT NULL,
`LONG_LOW_VALUE` bigint(20),
@@ -677,9 +677,9 @@ CREATE TABLE IF NOT EXISTS `TAB_COL_STATS` (
CREATE TABLE IF NOT EXISTS `PART_COL_STATS` (
`CS_ID` bigint(20) NOT NULL,
`DB_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
- `TABLE_NAME` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+ `TABLE_NAME` varchar(256) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
`PARTITION_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
- `COLUMN_NAME` varchar(1000) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
+ `COLUMN_NAME` varchar(767) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
`COLUMN_TYPE` varchar(128) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL,
`PART_ID` bigint(20) NOT NULL,
`LONG_LOW_VALUE` bigint(20),
@@ -797,7 +797,7 @@ CREATE TABLE IF NOT EXISTS `NOTIFICATION_LOG`
`EVENT_TIME` INT(11) NOT NULL,
`EVENT_TYPE` varchar(32) NOT NULL,
`DB_NAME` varchar(128),
- `TBL_NAME` varchar(128),
+ `TBL_NAME` varchar(256),
`MESSAGE` longtext,
`MESSAGE_FORMAT` varchar(16),
PRIMARY KEY (`NL_ID`)
diff --git metastore/scripts/upgrade/mysql/hive-txn-schema-2.2.0.mysql.sql metastore/scripts/upgrade/mysql/hive-txn-schema-2.2.0.mysql.sql
index 58835cb..ac39a32 100644
--- metastore/scripts/upgrade/mysql/hive-txn-schema-2.2.0.mysql.sql
+++ metastore/scripts/upgrade/mysql/hive-txn-schema-2.2.0.mysql.sql
@@ -41,7 +41,7 @@ CREATE TABLE TXN_COMPONENTS (
CREATE TABLE COMPLETED_TXN_COMPONENTS (
CTC_TXNID bigint NOT NULL,
CTC_DATABASE varchar(128) NOT NULL,
- CTC_TABLE varchar(128),
+ CTC_TABLE varchar(256),
CTC_PARTITION varchar(767)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
diff --git metastore/scripts/upgrade/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql metastore/scripts/upgrade/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql
index 509c532..e221439 100644
--- metastore/scripts/upgrade/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql
+++ metastore/scripts/upgrade/mysql/upgrade-2.1.0-to-2.2.0.mysql.sql
@@ -2,6 +2,7 @@ SELECT 'Upgrading MetaStore schema from 2.1.0 to 2.2.0' AS ' ';
SOURCE 037-HIVE-14496.mysql.sql;
SOURCE 038-HIVE-10562.mysql.sql;
+SOURCE 039-HIVE-12274.mysql.sql;
UPDATE VERSION SET SCHEMA_VERSION='2.2.0', VERSION_COMMENT='Hive release version 2.2.0' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 2.1.0 to 2.2.0' AS ' ';
diff --git metastore/scripts/upgrade/oracle/039-HIVE-12274.oracle.sql metastore/scripts/upgrade/oracle/039-HIVE-12274.oracle.sql
new file mode 100644
index 0000000..2ca73dd
--- /dev/null
+++ metastore/scripts/upgrade/oracle/039-HIVE-12274.oracle.sql
@@ -0,0 +1,21 @@
+-- change PARAM_VALUE to CLOBs
+ALTER TABLE COLUMNS_V2 MODIFY (TYPE_NAME CLOB);;
+ALTER TABLE TABLE_PARAMS MODIFY (PARAM_VALUE CLOB);
+ALTER TABLE SERDE_PARAMS MODIFY (PARAM_VALUE CLOB);
+ALTER TABLE SD_PARAMS MODIFY (PARAM_VALUE CLOB);
+
+-- Expand the hive table name length to 256
+ALTER TABLE TBLS MODIFY (TBL_NAME VARCHAR2(256));
+ALTER TABLE NOTIFICATION_LOG MODIFY (TBL_NAME VARCHAR2(256));
+ALTER TABLE PARTITION_EVENTS MODIFY (TBL_NAME VARCHAR2(256));
+ALTER TABLE TAB_COL_STATS MODIFY (TABLE_NAME VARCHAR2(256));
+ALTER TABLE PART_COL_STATS MODIFY (TABLE_NAME VARCHAR2(256));
+ALTER TABLE COMPLETED_TXN_COMPONENTS MODIFY (CTC_TABLE VARCHAR2(256));
+
+-- Expand the hive column name length to 256
+ALTER TABLE COLUMNS_V2 MODIFY (COLUMN_NAME VARCHAR(767) NOT NULL);
+ALTER TABLE PART_COL_PRIVS MODIFY (COLUMN_NAME VARCHAR2(767));
+ALTER TABLE TBL_COL_PRIVS MODIFY (COLUMN_NAME VARCHAR2(767));
+ALTER TABLE SORT_COLS MODIFY (COLUMN_NAME VARCHAR2(767));
+ALTER TABLE TAB_COL_STATS MODIFY (COLUMN_NAME VARCHAR2(767));
+ALTER TABLE PART_COL_STATS MODIFY (COLUMN_NAME VARCHAR2(767) NOT NULL);
diff --git metastore/scripts/upgrade/oracle/hive-schema-2.2.0.oracle.sql metastore/scripts/upgrade/oracle/hive-schema-2.2.0.oracle.sql
index 1d652a8..ef22134 100644
--- metastore/scripts/upgrade/oracle/hive-schema-2.2.0.oracle.sql
+++ metastore/scripts/upgrade/oracle/hive-schema-2.2.0.oracle.sql
@@ -29,7 +29,7 @@ ALTER TABLE NUCLEUS_TABLES ADD CONSTRAINT NUCLEUS_TABLES_PK PRIMARY KEY (CLASS_N
CREATE TABLE PART_COL_PRIVS
(
PART_COLUMN_GRANT_ID NUMBER NOT NULL,
- "COLUMN_NAME" VARCHAR2(1000) NULL,
+ "COLUMN_NAME" VARCHAR2(767) NULL,
CREATE_TIME NUMBER (10) NOT NULL,
GRANT_OPTION NUMBER (5) NOT NULL,
GRANTOR VARCHAR2(128) NULL,
@@ -55,8 +55,8 @@ CREATE TABLE COLUMNS_V2
(
CD_ID NUMBER NOT NULL,
"COMMENT" VARCHAR2(256) NULL,
- "COLUMN_NAME" VARCHAR2(1000) NOT NULL,
- TYPE_NAME VARCHAR2(4000) NOT NULL,
+ "COLUMN_NAME" VARCHAR2(767) NOT NULL,
+ TYPE_NAME CLOB NOT NULL,
INTEGER_IDX NUMBER(10) NOT NULL
);
@@ -166,7 +166,7 @@ ALTER TABLE INDEX_PARAMS ADD CONSTRAINT INDEX_PARAMS_PK PRIMARY KEY (INDEX_ID,PA
CREATE TABLE TBL_COL_PRIVS
(
TBL_COLUMN_GRANT_ID NUMBER NOT NULL,
- "COLUMN_NAME" VARCHAR2(1000) NULL,
+ "COLUMN_NAME" VARCHAR2(767) NULL,
CREATE_TIME NUMBER (10) NOT NULL,
GRANT_OPTION NUMBER (5) NOT NULL,
GRANTOR VARCHAR2(128) NULL,
@@ -222,7 +222,7 @@ CREATE TABLE SD_PARAMS
(
SD_ID NUMBER NOT NULL,
PARAM_KEY VARCHAR2(256) NOT NULL,
- PARAM_VALUE VARCHAR2(4000) NULL
+ PARAM_VALUE CLOB NULL
);
ALTER TABLE SD_PARAMS ADD CONSTRAINT SD_PARAMS_PK PRIMARY KEY (SD_ID,PARAM_KEY);
@@ -263,7 +263,7 @@ CREATE TABLE TABLE_PARAMS
(
TBL_ID NUMBER NOT NULL,
PARAM_KEY VARCHAR2(256) NOT NULL,
- PARAM_VALUE VARCHAR2(4000) NULL
+ PARAM_VALUE CLOB NULL
);
ALTER TABLE TABLE_PARAMS ADD CONSTRAINT TABLE_PARAMS_PK PRIMARY KEY (TBL_ID,PARAM_KEY);
@@ -272,7 +272,7 @@ ALTER TABLE TABLE_PARAMS ADD CONSTRAINT TABLE_PARAMS_PK PRIMARY KEY (TBL_ID,PARA
CREATE TABLE SORT_COLS
(
SD_ID NUMBER NOT NULL,
- "COLUMN_NAME" VARCHAR2(1000) NULL,
+ "COLUMN_NAME" VARCHAR2(767) NULL,
"ORDER" NUMBER (10) NOT NULL,
INTEGER_IDX NUMBER(10) NOT NULL
);
@@ -325,7 +325,7 @@ CREATE TABLE SERDE_PARAMS
(
SERDE_ID NUMBER NOT NULL,
PARAM_KEY VARCHAR2(256) NOT NULL,
- PARAM_VALUE VARCHAR2(4000) NULL
+ PARAM_VALUE CLOB NULL
);
ALTER TABLE SERDE_PARAMS ADD CONSTRAINT SERDE_PARAMS_PK PRIMARY KEY (SERDE_ID,PARAM_KEY);
@@ -372,7 +372,7 @@ CREATE TABLE TBLS
OWNER VARCHAR2(767) NULL,
RETENTION NUMBER (10) NOT NULL,
SD_ID NUMBER NULL,
- TBL_NAME VARCHAR2(128) NULL,
+ TBL_NAME VARCHAR2(256) NULL,
TBL_TYPE VARCHAR2(128) NULL,
VIEW_EXPANDED_TEXT CLOB NULL,
VIEW_ORIGINAL_TEXT CLOB NULL,
@@ -389,7 +389,7 @@ CREATE TABLE PARTITION_EVENTS
EVENT_TIME NUMBER NOT NULL,
EVENT_TYPE NUMBER (10) NOT NULL,
PARTITION_NAME VARCHAR2(767) NULL,
- TBL_NAME VARCHAR2(128) NULL
+ TBL_NAME VARCHAR2(256) NULL
);
ALTER TABLE PARTITION_EVENTS ADD CONSTRAINT PARTITION_EVENTS_PK PRIMARY KEY (PART_NAME_ID);
@@ -467,8 +467,8 @@ ALTER TABLE SKEWED_VALUES ADD CONSTRAINT SKEWED_VALUES_FK2 FOREIGN KEY (SD_ID_OI
CREATE TABLE TAB_COL_STATS (
CS_ID NUMBER NOT NULL,
DB_NAME VARCHAR2(128) NOT NULL,
- TABLE_NAME VARCHAR2(128) NOT NULL,
- COLUMN_NAME VARCHAR2(1000) NOT NULL,
+ TABLE_NAME VARCHAR2(256) NOT NULL,
+ COLUMN_NAME VARCHAR2(767) NOT NULL,
COLUMN_TYPE VARCHAR2(128) NOT NULL,
TBL_ID NUMBER NOT NULL,
LONG_LOW_VALUE NUMBER,
@@ -502,9 +502,9 @@ CREATE INDEX TAB_COL_STATS_N49 ON TAB_COL_STATS(TBL_ID);
CREATE TABLE PART_COL_STATS (
CS_ID NUMBER NOT NULL,
DB_NAME VARCHAR2(128) NOT NULL,
- TABLE_NAME VARCHAR2(128) NOT NULL,
+ TABLE_NAME VARCHAR2(256) NOT NULL,
PARTITION_NAME VARCHAR2(767) NOT NULL,
- COLUMN_NAME VARCHAR2(1000) NOT NULL,
+ COLUMN_NAME VARCHAR2(767) NOT NULL,
COLUMN_TYPE VARCHAR2(128) NOT NULL,
PART_ID NUMBER NOT NULL,
LONG_LOW_VALUE NUMBER,
@@ -559,7 +559,7 @@ CREATE TABLE NOTIFICATION_LOG
EVENT_TIME NUMBER(10) NOT NULL,
EVENT_TYPE VARCHAR2(32) NOT NULL,
DB_NAME VARCHAR2(128),
- TBL_NAME VARCHAR2(128),
+ TBL_NAME VARCHAR2(256),
MESSAGE CLOB NULL,
MESSAGE_FORMAT VARCHAR(16) NULL
);
diff --git metastore/scripts/upgrade/oracle/hive-txn-schema-2.2.0.oracle.sql metastore/scripts/upgrade/oracle/hive-txn-schema-2.2.0.oracle.sql
index 57d3abd..80adfc2 100644
--- metastore/scripts/upgrade/oracle/hive-txn-schema-2.2.0.oracle.sql
+++ metastore/scripts/upgrade/oracle/hive-txn-schema-2.2.0.oracle.sql
@@ -32,7 +32,7 @@ CREATE TABLE TXNS (
CREATE TABLE TXN_COMPONENTS (
TC_TXNID NUMBER(19) REFERENCES TXNS (TXN_ID),
TC_DATABASE VARCHAR2(128) NOT NULL,
- TC_TABLE VARCHAR2(128),
+ TC_TABLE VARCHAR2(256),
TC_PARTITION VARCHAR2(767) NULL,
TC_OPERATION_TYPE char(1) NOT NULL
) ROWDEPENDENCIES;
diff --git metastore/scripts/upgrade/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql metastore/scripts/upgrade/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql
index f31fda9..53ec681 100644
--- metastore/scripts/upgrade/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql
+++ metastore/scripts/upgrade/oracle/upgrade-2.1.0-to-2.2.0.oracle.sql
@@ -2,6 +2,7 @@ SELECT 'Upgrading MetaStore schema from 2.1.0 to 2.2.0' AS Status from dual;
@037-HIVE-14496.oracle.sql;
@038-HIVE-10562.oracle.sql;
+@039-HIVE-12274.oracle.sql;
UPDATE VERSION SET SCHEMA_VERSION='2.2.0', VERSION_COMMENT='Hive release version 2.2.0' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 2.1.0 to 2.2.0' AS Status from dual;
diff --git metastore/scripts/upgrade/postgres/038-HIVE-12274.postgres.sql metastore/scripts/upgrade/postgres/038-HIVE-12274.postgres.sql
new file mode 100644
index 0000000..c3c6692
--- /dev/null
+++ metastore/scripts/upgrade/postgres/038-HIVE-12274.postgres.sql
@@ -0,0 +1,18 @@
+alter table "SERDE_PARAMS" alter column "PARAM_VALUE" type text using cast("PARAM_VALUE" as text);
+alter table "TABLE_PARAMS" alter column "PARAM_VALUE" type text using cast("PARAM_VALUE" as text);
+alter table "SD_PARAMS" alter column "PARAM_VALUE" type text using cast("PARAM_VALUE" as text);
+alter table "COLUMNS_V2" alter column "TYPE_NAME" type text using cast("TYPE_NAME" as text);
+
+alter table "TBLS" ALTER COLUMN "TBL_NAME" TYPE varchar(256);
+alter table "NOTIFICATION_LOG" alter column "TBL_NAME" TYPE varchar(256);
+alter table "PARTITION_EVENTS" alter column "TBL_NAME" TYPE varchar(256);
+alter table "TAB_COL_STATS" alter column "TABLE_NAME" TYPE varchar(256);
+alter table "PART_COL_STATS" alter column "TABLE_NAME" TYPE varchar(256);
+alter table COMPLETED_TXN_COMPONENTS alter column CTC_TABLE TYPE varchar(256);
+
+alter table "COLUMNS_V2" alter column "COLUMN_NAME" TYPE varchar(767);
+alter table "PART_COL_PRIVS" alter column "COLUMN_NAME" TYPE varchar(767);
+alter table "TBL_COL_PRIVS" alter column "COLUMN_NAME" TYPE varchar(767);
+alter table "SORT_COLS" alter column "COLUMN_NAME" TYPE varchar(767);
+alter table "TAB_COL_STATS" alter column "COLUMN_NAME" TYPE varchar(767);
+alter table "PART_COL_STATS" alter column "COLUMN_NAME" TYPE varchar(767);
diff --git metastore/scripts/upgrade/postgres/hive-schema-2.2.0.postgres.sql metastore/scripts/upgrade/postgres/hive-schema-2.2.0.postgres.sql
index 81deaa2..87e1ab9 100644
--- metastore/scripts/upgrade/postgres/hive-schema-2.2.0.postgres.sql
+++ metastore/scripts/upgrade/postgres/hive-schema-2.2.0.postgres.sql
@@ -42,8 +42,8 @@ CREATE TABLE "CDS" (
CREATE TABLE "COLUMNS_V2" (
"CD_ID" bigint NOT NULL,
"COMMENT" character varying(4000),
- "COLUMN_NAME" character varying(1000) NOT NULL,
- "TYPE_NAME" character varying(4000),
+ "COLUMN_NAME" character varying(767) NOT NULL,
+ "TYPE_NAME" text,
"INTEGER_IDX" integer NOT NULL
);
@@ -172,7 +172,7 @@ CREATE TABLE "PARTITION_EVENTS" (
"EVENT_TIME" bigint NOT NULL,
"EVENT_TYPE" integer NOT NULL,
"PARTITION_NAME" character varying(767),
- "TBL_NAME" character varying(128)
+ "TBL_NAME" character varying(256)
);
@@ -217,7 +217,7 @@ CREATE TABLE "PARTITION_PARAMS" (
CREATE TABLE "PART_COL_PRIVS" (
"PART_COLUMN_GRANT_ID" bigint NOT NULL,
- "COLUMN_NAME" character varying(1000) DEFAULT NULL::character varying,
+ "COLUMN_NAME" character varying(767) DEFAULT NULL::character varying,
"CREATE_TIME" bigint NOT NULL,
"GRANT_OPTION" smallint NOT NULL,
"GRANTOR" character varying(128) DEFAULT NULL::character varying,
@@ -298,7 +298,7 @@ CREATE TABLE "SDS" (
CREATE TABLE "SD_PARAMS" (
"SD_ID" bigint NOT NULL,
"PARAM_KEY" character varying(256) NOT NULL,
- "PARAM_VALUE" character varying(4000) DEFAULT NULL::character varying
+ "PARAM_VALUE" text DEFAULT NULL
);
@@ -330,7 +330,7 @@ CREATE TABLE "SERDES" (
CREATE TABLE "SERDE_PARAMS" (
"SERDE_ID" bigint NOT NULL,
"PARAM_KEY" character varying(256) NOT NULL,
- "PARAM_VALUE" character varying(4000) DEFAULT NULL::character varying
+ "PARAM_VALUE" text DEFAULT NULL
);
@@ -340,7 +340,7 @@ CREATE TABLE "SERDE_PARAMS" (
CREATE TABLE "SORT_COLS" (
"SD_ID" bigint NOT NULL,
- "COLUMN_NAME" character varying(1000) DEFAULT NULL::character varying,
+ "COLUMN_NAME" character varying(767) DEFAULT NULL::character varying,
"ORDER" bigint NOT NULL,
"INTEGER_IDX" bigint NOT NULL
);
@@ -353,7 +353,7 @@ CREATE TABLE "SORT_COLS" (
CREATE TABLE "TABLE_PARAMS" (
"TBL_ID" bigint NOT NULL,
"PARAM_KEY" character varying(256) NOT NULL,
- "PARAM_VALUE" character varying(4000) DEFAULT NULL::character varying
+ "PARAM_VALUE" text DEFAULT NULL
);
@@ -369,7 +369,7 @@ CREATE TABLE "TBLS" (
"OWNER" character varying(767) DEFAULT NULL::character varying,
"RETENTION" bigint NOT NULL,
"SD_ID" bigint,
- "TBL_NAME" character varying(128) DEFAULT NULL::character varying,
+ "TBL_NAME" character varying(256) DEFAULT NULL::character varying,
"TBL_TYPE" character varying(128) DEFAULT NULL::character varying,
"VIEW_EXPANDED_TEXT" text,
"VIEW_ORIGINAL_TEXT" text,
@@ -383,7 +383,7 @@ CREATE TABLE "TBLS" (
CREATE TABLE "TBL_COL_PRIVS" (
"TBL_COLUMN_GRANT_ID" bigint NOT NULL,
- "COLUMN_NAME" character varying(1000) DEFAULT NULL::character varying,
+ "COLUMN_NAME" character varying(767) DEFAULT NULL::character varying,
"CREATE_TIME" bigint NOT NULL,
"GRANT_OPTION" smallint NOT NULL,
"GRANTOR" character varying(128) DEFAULT NULL::character varying,
@@ -486,8 +486,8 @@ CREATE TABLE "DELEGATION_TOKENS"
CREATE TABLE "TAB_COL_STATS" (
"CS_ID" bigint NOT NULL,
"DB_NAME" character varying(128) DEFAULT NULL::character varying,
- "TABLE_NAME" character varying(128) DEFAULT NULL::character varying,
- "COLUMN_NAME" character varying(1000) DEFAULT NULL::character varying,
+ "TABLE_NAME" character varying(256) DEFAULT NULL::character varying,
+ "COLUMN_NAME" character varying(767) DEFAULT NULL::character varying,
"COLUMN_TYPE" character varying(128) DEFAULT NULL::character varying,
"TBL_ID" bigint NOT NULL,
"LONG_LOW_VALUE" bigint,
@@ -521,9 +521,9 @@ CREATE TABLE "VERSION" (
CREATE TABLE "PART_COL_STATS" (
"CS_ID" bigint NOT NULL,
"DB_NAME" character varying(128) DEFAULT NULL::character varying,
- "TABLE_NAME" character varying(128) DEFAULT NULL::character varying,
+ "TABLE_NAME" character varying(256) DEFAULT NULL::character varying,
"PARTITION_NAME" character varying(767) DEFAULT NULL::character varying,
- "COLUMN_NAME" character varying(1000) DEFAULT NULL::character varying,
+ "COLUMN_NAME" character varying(767) DEFAULT NULL::character varying,
"COLUMN_TYPE" character varying(128) DEFAULT NULL::character varying,
"PART_ID" bigint NOT NULL,
"LONG_LOW_VALUE" bigint,
@@ -574,7 +574,7 @@ CREATE TABLE "NOTIFICATION_LOG"
"EVENT_TIME" INTEGER NOT NULL,
"EVENT_TYPE" VARCHAR(32) NOT NULL,
"DB_NAME" VARCHAR(128),
- "TBL_NAME" VARCHAR(128),
+ "TBL_NAME" VARCHAR(256),
"MESSAGE" text,
"MESSAGE_FORMAT" VARCHAR(16),
PRIMARY KEY ("NL_ID")
diff --git metastore/scripts/upgrade/postgres/hive-txn-schema-2.2.0.postgres.sql metastore/scripts/upgrade/postgres/hive-txn-schema-2.2.0.postgres.sql
index 63ce2ee..8471c32 100644
--- metastore/scripts/upgrade/postgres/hive-txn-schema-2.2.0.postgres.sql
+++ metastore/scripts/upgrade/postgres/hive-txn-schema-2.2.0.postgres.sql
@@ -40,7 +40,7 @@ CREATE TABLE TXN_COMPONENTS (
CREATE TABLE COMPLETED_TXN_COMPONENTS (
CTC_TXNID bigint,
CTC_DATABASE varchar(128) NOT NULL,
- CTC_TABLE varchar(128),
+ CTC_TABLE varchar(256),
CTC_PARTITION varchar(767)
);
diff --git metastore/scripts/upgrade/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql metastore/scripts/upgrade/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql
index 0f64a90..732e184 100644
--- metastore/scripts/upgrade/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql
+++ metastore/scripts/upgrade/postgres/upgrade-2.1.0-to-2.2.0.postgres.sql
@@ -2,6 +2,7 @@ SELECT 'Upgrading MetaStore schema from 2.1.0 to 2.2.0';
\i 036-HIVE-14496.postgres.sql;
\i 037-HIVE-10562.postgres.sql;
+\i 038-HIVE-12274.postgres.sql;
UPDATE "VERSION" SET "SCHEMA_VERSION"='2.2.0', "VERSION_COMMENT"='Hive release version 2.2.0' where "VER_ID"=1;
SELECT 'Finished upgrading MetaStore schema from 2.1.0 to 2.2.0';
diff --git metastore/src/model/package.jdo metastore/src/model/package.jdo
index e7d26fb..969e199 100644
--- metastore/src/model/package.jdo
+++ metastore/src/model/package.jdo
@@ -63,10 +63,10 @@
-
+
-
+
@@ -118,7 +118,7 @@
-
+
@@ -170,7 +170,7 @@
-
+
@@ -245,14 +245,14 @@
-
+
-
+
@@ -274,10 +274,10 @@
-
+
-
+
@@ -343,7 +343,7 @@
-
+
@@ -360,7 +360,7 @@
-
+
@@ -719,7 +719,7 @@
-
+
@@ -764,7 +764,7 @@
-
+
@@ -797,7 +797,7 @@
-
+
@@ -844,13 +844,13 @@
-
+
-
+
@@ -905,7 +905,7 @@
-
+
@@ -914,7 +914,7 @@
-
+
@@ -1044,7 +1044,7 @@
-
+