You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pv...@apache.org on 2022/03/21 14:54:58 UTC
[hive] branch master updated: HIVE-26049: Inconsistent TBL_NAME lengths in HMS schema (Janos Kovacs reviewed by Peter Vary) (#3119)
This is an automated email from the ASF dual-hosted git repository.
pvary 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 1f49cb4 HIVE-26049: Inconsistent TBL_NAME lengths in HMS schema (Janos Kovacs reviewed by Peter Vary) (#3119)
1f49cb4 is described below
commit 1f49cb433151d60508ba0dd5042652a24c1b778b
Author: Janos Kovacs <ko...@gmail.com>
AuthorDate: Mon Mar 21 15:54:47 2022 +0100
HIVE-26049: Inconsistent TBL_NAME lengths in HMS schema (Janos Kovacs reviewed by Peter Vary) (#3119)
---
.../main/sql/derby/hive-schema-4.0.0-alpha-1.derby.sql | 14 +++++++-------
.../sql/derby/upgrade-3.2.0-to-4.0.0-alpha-1.derby.sql | 9 +++++++++
.../main/sql/mssql/hive-schema-4.0.0-alpha-1.mssql.sql | 16 ++++++++--------
.../sql/mssql/upgrade-3.2.0-to-4.0.0-alpha-1.mssql.sql | 12 ++++++++++++
.../main/sql/mysql/hive-schema-4.0.0-alpha-1.mysql.sql | 14 +++++++-------
.../sql/mysql/upgrade-3.2.0-to-4.0.0-alpha-1.mysql.sql | 9 +++++++++
.../main/sql/oracle/hive-schema-4.0.0-alpha-1.oracle.sql | 14 +++++++-------
.../sql/oracle/upgrade-3.2.0-to-4.0.0-alpha-1.oracle.sql | 9 +++++++++
.../sql/postgres/hive-schema-4.0.0-alpha-1.postgres.sql | 14 +++++++-------
.../postgres/upgrade-3.2.0-to-4.0.0-alpha-1.postgres.sql | 9 +++++++++
10 files changed, 84 insertions(+), 36 deletions(-)
diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-alpha-1.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-alpha-1.derby.sql
index a92ccf7..147983e 100644
--- a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-alpha-1.derby.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0-alpha-1.derby.sql
@@ -555,7 +555,7 @@ INSERT INTO TXNS (TXN_ID, TXN_STATE, TXN_STARTED, TXN_LAST_HEARTBEAT, TXN_USER,
CREATE TABLE TXN_COMPONENTS (
TC_TXNID bigint NOT NULL REFERENCES TXNS (TXN_ID),
TC_DATABASE varchar(128) NOT NULL,
- TC_TABLE varchar(128),
+ TC_TABLE varchar(256),
TC_PARTITION varchar(767),
TC_OPERATION_TYPE char(1) NOT NULL,
TC_WRITEID bigint
@@ -585,7 +585,7 @@ CREATE TABLE HIVE_LOCKS (
HL_LOCK_INT_ID bigint NOT NULL,
HL_TXNID bigint NOT NULL,
HL_DB varchar(128) NOT NULL,
- HL_TABLE varchar(128),
+ HL_TABLE varchar(256),
HL_PARTITION varchar(767),
HL_LOCK_STATE char(1) NOT NULL,
HL_LOCK_TYPE char(1) NOT NULL,
@@ -610,7 +610,7 @@ INSERT INTO NEXT_LOCK_ID VALUES(1);
CREATE TABLE COMPACTION_QUEUE (
CQ_ID bigint PRIMARY KEY,
CQ_DATABASE varchar(128) NOT NULL,
- CQ_TABLE varchar(128) NOT NULL,
+ CQ_TABLE varchar(256) NOT NULL,
CQ_PARTITION varchar(767),
CQ_STATE char(1) NOT NULL,
CQ_TYPE char(1) NOT NULL,
@@ -641,7 +641,7 @@ INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1);
CREATE TABLE COMPLETED_COMPACTIONS (
CC_ID bigint PRIMARY KEY,
CC_DATABASE varchar(128) NOT NULL,
- CC_TABLE varchar(128) NOT NULL,
+ CC_TABLE varchar(256) NOT NULL,
CC_PARTITION varchar(767),
CC_STATE char(1) NOT NULL,
CC_TYPE char(1) NOT NULL,
@@ -665,7 +665,7 @@ CREATE INDEX COMPLETED_COMPACTIONS_RES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_
-- HIVE-25842
CREATE TABLE COMPACTION_METRICS_CACHE (
CMC_DATABASE varchar(128) NOT NULL,
- CMC_TABLE varchar(128) NOT NULL,
+ CMC_TABLE varchar(256) NOT NULL,
CMC_PARTITION varchar(767),
CMC_METRIC_TYPE varchar(128) NOT NULL,
CMC_METRIC_VALUE integer NOT NULL,
@@ -683,7 +683,7 @@ CREATE TABLE AUX_TABLE (
--This is a good candidate for Index orgainzed table
CREATE TABLE WRITE_SET (
WS_DATABASE varchar(128) NOT NULL,
- WS_TABLE varchar(128) NOT NULL,
+ WS_TABLE varchar(256) NOT NULL,
WS_PARTITION varchar(767),
WS_TXNID bigint NOT NULL,
WS_COMMIT_ID bigint NOT NULL,
@@ -773,7 +773,7 @@ CREATE TABLE TXN_WRITE_NOTIFICATION_LOG (
WNL_TXNID bigint NOT NULL,
WNL_WRITEID bigint NOT NULL,
WNL_DATABASE varchar(128) NOT NULL,
- WNL_TABLE varchar(128) NOT NULL,
+ WNL_TABLE varchar(256) NOT NULL,
WNL_PARTITION varchar(767) NOT NULL,
WNL_TABLE_OBJ clob NOT NULL,
WNL_PARTITION_OBJ clob,
diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0-alpha-1.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0-alpha-1.derby.sql
index d38e20e..ed9b822 100644
--- a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0-alpha-1.derby.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.2.0-to-4.0.0-alpha-1.derby.sql
@@ -198,5 +198,14 @@ CREATE TABLE COMPACTION_METRICS_CACHE (
-- HIVE-25993
ALTER TABLE "APP"."COMPACTION_QUEUE" ADD COLUMN "CQ_RETRY_RETENTION" bigint NOT NULL DEFAULT 0;
+-- HIVE-26049
+ALTER TABLE "APP"."TXN_COMPONENTS" ALTER "TC_TABLE" SET DATA TYPE VARCHAR(256);
+ALTER TABLE "APP"."HIVE_LOCKS" ALTER "HL_TABLE" SET DATA TYPE VARCHAR(256);
+ALTER TABLE "APP"."COMPACTION_QUEUE" ALTER "CQ_TABLE" SET DATA TYPE VARCHAR(256);
+ALTER TABLE "APP"."COMPLETED_COMPACTIONS" ALTER "CC_TABLE" SET DATA TYPE VARCHAR(256);
+ALTER TABLE "APP"."COMPACTION_METRICS_CACHE" ALTER "CMC_TABLE" SET DATA TYPE VARCHAR(256);
+ALTER TABLE "APP"."WRITE_SET" ALTER "WS_TABLE" SET DATA TYPE VARCHAR(256);
+ALTER TABLE "APP"."TXN_WRITE_NOTIFICATION_LOG" ALTER "WNL_TABLE" SET DATA TYPE VARCHAR(256);
+
-- This needs to be the last thing done. Insert any changes above this line.
UPDATE "APP".VERSION SET SCHEMA_VERSION='4.0.0-alpha-1', VERSION_COMMENT='Hive release version 4.0.0-alpha-1' where VER_ID=1;
diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-alpha-1.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-alpha-1.mssql.sql
index 57b0fd5..a26ae95 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-alpha-1.mssql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0-alpha-1.mssql.sql
@@ -1029,7 +1029,7 @@ ALTER TABLE DBS ADD CONSTRAINT "DBS_FK1" FOREIGN KEY ("CTLG_NAME") REFERENCES CT
CREATE TABLE COMPACTION_QUEUE(
CQ_ID bigint NOT NULL,
CQ_DATABASE nvarchar(128) NOT NULL,
- CQ_TABLE nvarchar(128) NOT NULL,
+ CQ_TABLE nvarchar(256) NOT NULL,
CQ_PARTITION nvarchar(767) NULL,
CQ_STATE char(1) NOT NULL,
CQ_TYPE char(1) NOT NULL,
@@ -1059,7 +1059,7 @@ PRIMARY KEY CLUSTERED
CREATE TABLE COMPLETED_COMPACTIONS (
CC_ID bigint NOT NULL,
CC_DATABASE nvarchar(128) NOT NULL,
- CC_TABLE nvarchar(128) NOT NULL,
+ CC_TABLE nvarchar(256) NOT NULL,
CC_PARTITION nvarchar(767) NULL,
CC_STATE char(1) NOT NULL,
CC_TYPE char(1) NOT NULL,
@@ -1087,7 +1087,7 @@ CREATE INDEX COMPLETED_COMPACTIONS_RES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_
-- HIVE-25842
CREATE TABLE COMPACTION_METRICS_CACHE (
CMC_DATABASE nvarchar(128) NOT NULL,
- CMC_TABLE nvarchar(128) NOT NULL,
+ CMC_TABLE nvarchar(256) NOT NULL,
CMC_PARTITION nvarchar(767) NULL,
CMC_METRIC_TYPE nvarchar(128) NOT NULL,
CMC_METRIC_VALUE int NOT NULL,
@@ -1097,7 +1097,7 @@ CREATE TABLE COMPACTION_METRICS_CACHE (
CREATE TABLE COMPLETED_TXN_COMPONENTS(
CTC_TXNID bigint NOT NULL,
CTC_DATABASE nvarchar(128) NOT NULL,
- CTC_TABLE nvarchar(128) NULL,
+ CTC_TABLE nvarchar(256) NULL,
CTC_PARTITION nvarchar(767) NULL,
CTC_TIMESTAMP datetime2 DEFAULT CURRENT_TIMESTAMP NOT NULL,
CTC_WRITEID bigint,
@@ -1112,7 +1112,7 @@ CREATE TABLE HIVE_LOCKS(
HL_LOCK_INT_ID bigint NOT NULL,
HL_TXNID bigint NOT NULL,
HL_DB nvarchar(128) NOT NULL,
- HL_TABLE nvarchar(128) NULL,
+ HL_TABLE nvarchar(256) NULL,
HL_PARTITION nvarchar(767) NULL,
HL_LOCK_STATE char(1) NOT NULL,
HL_LOCK_TYPE char(1) NOT NULL,
@@ -1172,7 +1172,7 @@ INSERT INTO TXNS (TXN_ID, TXN_STATE, TXN_STARTED, TXN_LAST_HEARTBEAT, TXN_USER,
CREATE TABLE TXN_COMPONENTS(
TC_TXNID bigint NOT NULL,
TC_DATABASE nvarchar(128) NOT NULL,
- TC_TABLE nvarchar(128) NULL,
+ TC_TABLE nvarchar(256) NULL,
TC_PARTITION nvarchar(767) NULL,
TC_OPERATION_TYPE char(1) NOT NULL,
TC_WRITEID bigint
@@ -1218,7 +1218,7 @@ CREATE INDEX CONSTRAINTS_CONSTRAINT_TYPE_INDEX ON KEY_CONSTRAINTS(CONSTRAINT_TYP
CREATE TABLE WRITE_SET (
WS_DATABASE nvarchar(128) NOT NULL,
- WS_TABLE nvarchar(128) NOT NULL,
+ WS_TABLE nvarchar(256) NOT NULL,
WS_PARTITION nvarchar(767),
WS_TXNID bigint NOT NULL,
WS_COMMIT_ID bigint NOT NULL,
@@ -1335,7 +1335,7 @@ CREATE TABLE TXN_WRITE_NOTIFICATION_LOG (
WNL_TXNID bigint NOT NULL,
WNL_WRITEID bigint NOT NULL,
WNL_DATABASE nvarchar(128) NOT NULL,
- WNL_TABLE nvarchar(128) NOT NULL,
+ WNL_TABLE nvarchar(256) NOT NULL,
WNL_PARTITION nvarchar(767) NOT NULL,
WNL_TABLE_OBJ text NOT NULL,
WNL_PARTITION_OBJ text,
diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0-alpha-1.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0-alpha-1.mssql.sql
index 25c1807..4af6f30 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0-alpha-1.mssql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0-alpha-1.mssql.sql
@@ -249,6 +249,18 @@ CREATE TABLE COMPACTION_METRICS_CACHE (
-- HIVE-25993
ALTER TABLE "COMPACTION_QUEUE" ADD "CQ_RETRY_RETENTION" bigint NOT NULL DEFAULT 0;
+-- HIVE-26049
+ALTER TABLE "TXN_COMPONENTS" ALTER COLUMN "TC_TABLE" nvarchar(256);
+ALTER TABLE "COMPLETED_TXN_COMPONENTS" ALTER COLUMN "CTC_TABLE" nvarchar(256);
+ALTER TABLE "HIVE_LOCKS" ALTER COLUMN "HL_TABLE" nvarchar(256);
+ALTER TABLE "COMPACTION_QUEUE" ALTER COLUMN "CQ_TABLE" nvarchar(256) NOT NULL;
+ALTER TABLE "COMPLETED_COMPACTIONS" ALTER COLUMN "CC_TABLE" nvarchar(256) NOT NULL;
+ALTER TABLE "COMPACTION_METRICS_CACHE" ALTER COLUMN "CMC_TABLE" nvarchar(256) NOT NULL;
+ALTER TABLE "WRITE_SET" ALTER COLUMN "WS_TABLE" nvarchar(256) NOT NULL;
+ALTER TABLE "TXN_WRITE_NOTIFICATION_LOG" DROP CONSTRAINT "TXN_WRITE_NOTIFICATION_LOG_PK";
+ALTER TABLE "TXN_WRITE_NOTIFICATION_LOG" ALTER COLUMN "WNL_TABLE" nvarchar(256) NOT NULL;
+ALTER TABLE "TXN_WRITE_NOTIFICATION_LOG" ADD CONSTRAINT "TXN_WRITE_NOTIFICATION_LOG_PK" PRIMARY KEY ("WNL_TXNID", "WNL_DATABASE", "WNL_TABLE", "WNL_PARTITION");
+
-- These lines need to be last. Insert any changes above.
UPDATE VERSION SET SCHEMA_VERSION='4.0.0-alpha-1', VERSION_COMMENT='Hive release version 4.0.0-alpha-1' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1' AS MESSAGE;
diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-alpha-1.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-alpha-1.mysql.sql
index 805c552..5c02024 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-alpha-1.mysql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0-alpha-1.mysql.sql
@@ -1014,7 +1014,7 @@ INSERT INTO TXNS (TXN_ID, TXN_STATE, TXN_STARTED, TXN_LAST_HEARTBEAT, TXN_USER,
CREATE TABLE TXN_COMPONENTS (
TC_TXNID bigint NOT NULL,
TC_DATABASE varchar(128) NOT NULL,
- TC_TABLE varchar(128),
+ TC_TABLE varchar(256),
TC_PARTITION varchar(767),
TC_OPERATION_TYPE char(1) NOT NULL,
TC_WRITEID bigint,
@@ -1045,7 +1045,7 @@ CREATE TABLE HIVE_LOCKS (
HL_LOCK_INT_ID bigint NOT NULL,
HL_TXNID bigint NOT NULL,
HL_DB varchar(128) NOT NULL,
- HL_TABLE varchar(128),
+ HL_TABLE varchar(256),
HL_PARTITION varchar(767),
HL_LOCK_STATE char(1) not null,
HL_LOCK_TYPE char(1) not null,
@@ -1071,7 +1071,7 @@ INSERT INTO NEXT_LOCK_ID VALUES(1);
CREATE TABLE COMPACTION_QUEUE (
CQ_ID bigint PRIMARY KEY,
CQ_DATABASE varchar(128) NOT NULL,
- CQ_TABLE varchar(128) NOT NULL,
+ CQ_TABLE varchar(256) NOT NULL,
CQ_PARTITION varchar(767),
CQ_STATE char(1) NOT NULL,
CQ_TYPE char(1) NOT NULL,
@@ -1097,7 +1097,7 @@ CREATE TABLE COMPACTION_QUEUE (
CREATE TABLE COMPLETED_COMPACTIONS (
CC_ID bigint PRIMARY KEY,
CC_DATABASE varchar(128) NOT NULL,
- CC_TABLE varchar(128) NOT NULL,
+ CC_TABLE varchar(256) NOT NULL,
CC_PARTITION varchar(767),
CC_STATE char(1) NOT NULL,
CC_TYPE char(1) NOT NULL,
@@ -1121,7 +1121,7 @@ CREATE INDEX COMPLETED_COMPACTIONS_RES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_
-- HIVE-25842
CREATE TABLE COMPACTION_METRICS_CACHE (
CMC_DATABASE varchar(128) NOT NULL,
- CMC_TABLE varchar(128) NOT NULL,
+ CMC_TABLE varchar(256) NOT NULL,
CMC_PARTITION varchar(767),
CMC_METRIC_TYPE varchar(128) NOT NULL,
CMC_METRIC_VALUE int NOT NULL,
@@ -1142,7 +1142,7 @@ CREATE TABLE AUX_TABLE (
CREATE TABLE WRITE_SET (
WS_DATABASE varchar(128) NOT NULL,
- WS_TABLE varchar(128) NOT NULL,
+ WS_TABLE varchar(256) NOT NULL,
WS_PARTITION varchar(767),
WS_TXNID bigint NOT NULL,
WS_COMMIT_ID bigint NOT NULL,
@@ -1237,7 +1237,7 @@ CREATE TABLE TXN_WRITE_NOTIFICATION_LOG (
WNL_TXNID bigint NOT NULL,
WNL_WRITEID bigint NOT NULL,
WNL_DATABASE varchar(128) NOT NULL,
- WNL_TABLE varchar(128) NOT NULL,
+ WNL_TABLE varchar(256) NOT NULL,
WNL_PARTITION varchar(767) NOT NULL,
WNL_TABLE_OBJ longtext NOT NULL,
WNL_PARTITION_OBJ longtext,
diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0-alpha-1.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0-alpha-1.mysql.sql
index 9ea178a..da0d27f 100644
--- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0-alpha-1.mysql.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0-alpha-1.mysql.sql
@@ -226,6 +226,15 @@ CREATE TABLE COMPACTION_METRICS_CACHE (
-- HIVE-25993
ALTER TABLE `COMPACTION_QUEUE` ADD COLUMN `CQ_RETRY_RETENTION` bigint NOT NULL DEFAULT 0;
+-- HIVE-26049
+ALTER TABLE TXN_COMPONENTS MODIFY TC_TABLE varchar(256);
+ALTER TABLE HIVE_LOCKS MODIFY HL_TABLE varchar(256);
+ALTER TABLE COMPACTION_QUEUE MODIFY CQ_TABLE varchar(256) NOT NULL;
+ALTER TABLE COMPLETED_COMPACTIONS MODIFY CC_TABLE varchar(256) NOT NULL;
+ALTER TABLE COMPACTION_METRICS_CACHE MODIFY CMC_TABLE varchar(256) NOT NULL;
+ALTER TABLE WRITE_SET MODIFY WS_TABLE varchar(256) NOT NULL;
+ALTER TABLE TXN_WRITE_NOTIFICATION_LOG MODIFY WNL_TABLE varchar(256) NOT NULL;
+
-- These lines need to be last. Insert any changes above.
UPDATE VERSION SET SCHEMA_VERSION='4.0.0-alpha-1', VERSION_COMMENT='Hive release version 4.0.0-alpha-1' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1' AS MESSAGE;
diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-alpha-1.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-alpha-1.oracle.sql
index 1ba6ab3..e16912c 100644
--- a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-alpha-1.oracle.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0-alpha-1.oracle.sql
@@ -1018,7 +1018,7 @@ INSERT INTO TXNS (TXN_ID, TXN_STATE, TXN_STARTED, TXN_LAST_HEARTBEAT, TXN_USER,
CREATE TABLE TXN_COMPONENTS (
TC_TXNID NUMBER(19) NOT NULL 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,
TC_WRITEID NUMBER(19)
@@ -1048,7 +1048,7 @@ CREATE TABLE HIVE_LOCKS (
HL_LOCK_INT_ID NUMBER(19) NOT NULL,
HL_TXNID NUMBER(19) NOT NULL,
HL_DB VARCHAR2(128) NOT NULL,
- HL_TABLE VARCHAR2(128),
+ HL_TABLE VARCHAR2(256),
HL_PARTITION VARCHAR2(767),
HL_LOCK_STATE CHAR(1) NOT NULL,
HL_LOCK_TYPE CHAR(1) NOT NULL,
@@ -1073,7 +1073,7 @@ INSERT INTO NEXT_LOCK_ID VALUES(1);
CREATE TABLE COMPACTION_QUEUE (
CQ_ID NUMBER(19) PRIMARY KEY,
CQ_DATABASE varchar(128) NOT NULL,
- CQ_TABLE varchar(128) NOT NULL,
+ CQ_TABLE varchar(256) NOT NULL,
CQ_PARTITION varchar(767),
CQ_STATE char(1) NOT NULL,
CQ_TYPE char(1) NOT NULL,
@@ -1104,7 +1104,7 @@ INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1);
CREATE TABLE COMPLETED_COMPACTIONS (
CC_ID NUMBER(19) PRIMARY KEY,
CC_DATABASE varchar(128) NOT NULL,
- CC_TABLE varchar(128) NOT NULL,
+ CC_TABLE varchar(256) NOT NULL,
CC_PARTITION varchar(767),
CC_STATE char(1) NOT NULL,
CC_TYPE char(1) NOT NULL,
@@ -1128,7 +1128,7 @@ CREATE INDEX COMPLETED_COMPACTIONS_RES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_
-- HIVE-25842
CREATE TABLE COMPACTION_METRICS_CACHE (
CMC_DATABASE varchar(128) NOT NULL,
- CMC_TABLE varchar(128) NOT NULL,
+ CMC_TABLE varchar(256) NOT NULL,
CMC_PARTITION varchar(767),
CMC_METRIC_TYPE varchar(128) NOT NULL,
CMC_METRIC_VALUE number(10) NOT NULL,
@@ -1144,7 +1144,7 @@ CREATE TABLE AUX_TABLE (
CREATE TABLE WRITE_SET (
WS_DATABASE varchar2(128) NOT NULL,
- WS_TABLE varchar2(128) NOT NULL,
+ WS_TABLE varchar2(256) NOT NULL,
WS_PARTITION varchar2(767),
WS_TXNID number(19) NOT NULL,
WS_COMMIT_ID number(19) NOT NULL,
@@ -1233,7 +1233,7 @@ CREATE TABLE TXN_WRITE_NOTIFICATION_LOG (
WNL_TXNID number(19) NOT NULL,
WNL_WRITEID number(19) NOT NULL,
WNL_DATABASE varchar(128) NOT NULL,
- WNL_TABLE varchar(128) NOT NULL,
+ WNL_TABLE varchar(256) NOT NULL,
WNL_PARTITION varchar(767),
WNL_TABLE_OBJ clob NOT NULL,
WNL_PARTITION_OBJ clob,
diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0-alpha-1.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0-alpha-1.oracle.sql
index 9ec8258..6558bfe 100644
--- a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0-alpha-1.oracle.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0-alpha-1.oracle.sql
@@ -223,6 +223,15 @@ CREATE TABLE COMPACTION_METRICS_CACHE (
-- HIVE-25993
ALTER TABLE COMPACTION_QUEUE ADD "CQ_RETRY_RETENTION" NUMBER(19) DEFAULT 0 NOT NULL;
+-- HIVE-26049
+ALTER TABLE TXN_COMPONENTS MODIFY ("TC_TABLE" VARCHAR2(256));
+ALTER TABLE HIVE_LOCKS MODIFY ("HL_TABLE" VARCHAR2(256));
+ALTER TABLE COMPACTION_QUEUE MODIFY ("CQ_TABLE" varchar(256));
+ALTER TABLE COMPLETED_COMPACTIONS MODIFY ("CC_TABLE" varchar(256));
+ALTER TABLE COMPACTION_METRICS_CACHE MODIFY ("CMC_TABLE" varchar(256));
+ALTER TABLE WRITE_SET MODIFY ("WS_TABLE" VARCHAR2(256));
+ALTER TABLE TXN_WRITE_NOTIFICATION_LOG MODIFY ("WNL_TABLE" varchar(256));
+
-- These lines need to be last. Insert any changes above.
UPDATE VERSION SET SCHEMA_VERSION='4.0.0-alpha-1', VERSION_COMMENT='Hive release version 4.0.0-alpha-1' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1' AS Status from dual;
diff --git a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-alpha-1.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-alpha-1.postgres.sql
index ed1a807..9a2190c 100644
--- a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-alpha-1.postgres.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.0.0-alpha-1.postgres.sql
@@ -1727,7 +1727,7 @@ INSERT INTO "TXNS" ("TXN_ID", "TXN_STATE", "TXN_STARTED", "TXN_LAST_HEARTBEAT",
CREATE TABLE "TXN_COMPONENTS" (
"TC_TXNID" bigint NOT NULL REFERENCES "TXNS" ("TXN_ID"),
"TC_DATABASE" varchar(128) NOT NULL,
- "TC_TABLE" varchar(128),
+ "TC_TABLE" varchar(256),
"TC_PARTITION" varchar(767) DEFAULT NULL,
"TC_OPERATION_TYPE" char(1) NOT NULL,
"TC_WRITEID" bigint
@@ -1757,7 +1757,7 @@ CREATE TABLE "HIVE_LOCKS" (
"HL_LOCK_INT_ID" bigint NOT NULL,
"HL_TXNID" bigint NOT NULL,
"HL_DB" varchar(128) NOT NULL,
- "HL_TABLE" varchar(128),
+ "HL_TABLE" varchar(256),
"HL_PARTITION" varchar(767) DEFAULT NULL,
"HL_LOCK_STATE" char(1) NOT NULL,
"HL_LOCK_TYPE" char(1) NOT NULL,
@@ -1782,7 +1782,7 @@ INSERT INTO "NEXT_LOCK_ID" VALUES(1);
CREATE TABLE "COMPACTION_QUEUE" (
"CQ_ID" bigint PRIMARY KEY,
"CQ_DATABASE" varchar(128) NOT NULL,
- "CQ_TABLE" varchar(128) NOT NULL,
+ "CQ_TABLE" varchar(256) NOT NULL,
"CQ_PARTITION" varchar(767),
"CQ_STATE" char(1) NOT NULL,
"CQ_TYPE" char(1) NOT NULL,
@@ -1813,7 +1813,7 @@ INSERT INTO "NEXT_COMPACTION_QUEUE_ID" VALUES(1);
CREATE TABLE "COMPLETED_COMPACTIONS" (
"CC_ID" bigint PRIMARY KEY,
"CC_DATABASE" varchar(128) NOT NULL,
- "CC_TABLE" varchar(128) NOT NULL,
+ "CC_TABLE" varchar(256) NOT NULL,
"CC_PARTITION" varchar(767),
"CC_STATE" char(1) NOT NULL,
"CC_TYPE" char(1) NOT NULL,
@@ -1837,7 +1837,7 @@ CREATE INDEX "COMPLETED_COMPACTIONS_RES" ON "COMPLETED_COMPACTIONS" ("CC_DATABAS
-- HIVE-25842
CREATE TABLE "COMPACTION_METRICS_CACHE" (
"CMC_DATABASE" varchar(128) NOT NULL,
- "CMC_TABLE" varchar(128) NOT NULL,
+ "CMC_TABLE" varchar(256) NOT NULL,
"CMC_PARTITION" varchar(767),
"CMC_METRIC_TYPE" varchar(128) NOT NULL,
"CMC_METRIC_VALUE" integer NOT NULL,
@@ -1853,7 +1853,7 @@ CREATE TABLE "AUX_TABLE" (
CREATE TABLE "WRITE_SET" (
"WS_DATABASE" varchar(128) NOT NULL,
- "WS_TABLE" varchar(128) NOT NULL,
+ "WS_TABLE" varchar(256) NOT NULL,
"WS_PARTITION" varchar(767),
"WS_TXNID" bigint NOT NULL,
"WS_COMMIT_ID" bigint NOT NULL,
@@ -1945,7 +1945,7 @@ CREATE TABLE "TXN_WRITE_NOTIFICATION_LOG" (
"WNL_TXNID" bigint NOT NULL,
"WNL_WRITEID" bigint NOT NULL,
"WNL_DATABASE" varchar(128) NOT NULL,
- "WNL_TABLE" varchar(128) NOT NULL,
+ "WNL_TABLE" varchar(256) NOT NULL,
"WNL_PARTITION" varchar(767) NOT NULL,
"WNL_TABLE_OBJ" text NOT NULL,
"WNL_PARTITION_OBJ" text,
diff --git a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0-alpha-1.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0-alpha-1.postgres.sql
index a165d98..071a873 100644
--- a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0-alpha-1.postgres.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-3.2.0-to-4.0.0-alpha-1.postgres.sql
@@ -360,6 +360,15 @@ CREATE TABLE "COMPACTION_METRICS_CACHE" (
-- HIVE-25993
ALTER TABLE "COMPACTION_QUEUE" ADD "CQ_RETRY_RETENTION" bigint NOT NULL DEFAULT 0;
+-- HIVE-26049
+ALTER TABLE "TXN_COMPONENTS" ALTER "TC_TABLE" TYPE varchar(256);
+ALTER TABLE "HIVE_LOCKS" ALTER "HL_TABLE" TYPE varchar(256);
+ALTER TABLE "COMPACTION_QUEUE" ALTER "CQ_TABLE" TYPE varchar(256);
+ALTER TABLE "COMPLETED_COMPACTIONS" ALTER "CC_TABLE" TYPE varchar(256);
+ALTER TABLE "COMPACTION_METRICS_CACHE" ALTER "CMC_TABLE" TYPE varchar(256);
+ALTER TABLE "WRITE_SET" ALTER "WS_TABLE" TYPE varchar(256);
+ALTER TABLE "TXN_WRITE_NOTIFICATION_LOG" ALTER "WNL_TABLE" TYPE varchar(256);
+
-- These lines need to be last. Insert any changes above.
UPDATE "VERSION" SET "SCHEMA_VERSION"='4.0.0-alpha-1', "VERSION_COMMENT"='Hive release version 4.0.0-alpha-1' where "VER_ID"=1;
SELECT 'Finished upgrading MetaStore schema from 3.2.0 to 4.0.0-alpha-1';