From 47696c17f1d60b96db44bc926b7f6347b626b2f2 Mon Sep 17 00:00:00 2001 From: saihemanth Date: Mon, 1 Jun 2026 16:12:57 -0700 Subject: [PATCH 1/2] HIVE-29643: Add missing primary keys to backend tables across different types of vendors --- .../sql/derby/hive-schema-4.3.0.derby.sql | 27 ++++++----- .../derby/upgrade-4.2.0-to-4.3.0.derby.sql | 17 +++++++ .../sql/mssql/hive-schema-4.3.0.mssql.sql | 46 ++++++++++++------- .../mssql/upgrade-4.2.0-to-4.3.0.mssql.sql | 29 ++++++++++++ .../sql/mysql/hive-schema-4.3.0.mysql.sql | 42 +++++++++++------ .../mysql/upgrade-4.2.0-to-4.3.0.mysql.sql | 13 ++++++ .../sql/oracle/hive-schema-4.3.0.oracle.sql | 25 ++++++---- .../oracle/upgrade-4.2.0-to-4.3.0.oracle.sql | 17 +++++++ .../postgres/hive-schema-4.3.0.postgres.sql | 25 ++++++---- .../upgrade-4.2.0-to-4.3.0.postgres.sql | 17 +++++++ 10 files changed, 199 insertions(+), 59 deletions(-) diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.3.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.3.0.derby.sql index 39d17cc88be7..4c5feec8c7a7 100644 --- a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.3.0.derby.sql +++ b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.3.0.derby.sql @@ -536,6 +536,7 @@ INSERT INTO TXNS (TXN_ID, TXN_STATE, TXN_STARTED, TXN_LAST_HEARTBEAT, TXN_USER, VALUES(0, 'c', 0, 0, '', ''); CREATE TABLE TXN_COMPONENTS ( + TC_ID bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, TC_TXNID bigint NOT NULL REFERENCES TXNS (TXN_ID), TC_DATABASE varchar(128) NOT NULL, TC_TABLE varchar(256), @@ -547,6 +548,7 @@ CREATE TABLE TXN_COMPONENTS ( CREATE INDEX TC_TXNID_INDEX ON TXN_COMPONENTS (TC_TXNID); CREATE TABLE COMPLETED_TXN_COMPONENTS ( + CTC_ID bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, CTC_TXNID bigint NOT NULL, CTC_DATABASE varchar(128) NOT NULL, CTC_TABLE varchar(256), @@ -559,9 +561,10 @@ CREATE TABLE COMPLETED_TXN_COMPONENTS ( CREATE INDEX COMPLETED_TXN_COMPONENTS_IDX ON COMPLETED_TXN_COMPONENTS (CTC_DATABASE, CTC_TABLE, CTC_PARTITION); CREATE TABLE TXN_LOCK_TBL ( + TLT_ID bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, TXN_LOCK bigint NOT NULL ); -INSERT INTO TXN_LOCK_TBL VALUES(1); +INSERT INTO TXN_LOCK_TBL (TXN_LOCK) VALUES(1); CREATE TABLE HIVE_LOCKS ( HL_LOCK_EXT_ID bigint NOT NULL, @@ -587,9 +590,10 @@ CREATE TABLE HIVE_LOCKS ( CREATE INDEX HL_TXNID_INDEX ON HIVE_LOCKS (HL_TXNID); CREATE TABLE NEXT_LOCK_ID ( + NL_ID bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, NL_NEXT bigint NOT NULL ); -INSERT INTO NEXT_LOCK_ID VALUES(1); +INSERT INTO NEXT_LOCK_ID (NL_NEXT) VALUES(1); CREATE TABLE COMPACTION_QUEUE ( CQ_ID bigint PRIMARY KEY, @@ -621,9 +625,10 @@ CREATE TABLE COMPACTION_QUEUE ( ); CREATE TABLE NEXT_COMPACTION_QUEUE_ID ( + NCQI_ID bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, NCQ_NEXT bigint NOT NULL ); -INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1); +INSERT INTO NEXT_COMPACTION_QUEUE_ID (NCQ_NEXT) VALUES(1); CREATE TABLE COMPLETED_COMPACTIONS ( CC_ID bigint PRIMARY KEY, @@ -657,6 +662,7 @@ CREATE INDEX COMPLETED_COMPACTIONS_RES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_ -- HIVE-25842 CREATE TABLE COMPACTION_METRICS_CACHE ( + CMC_ID bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, CMC_DATABASE varchar(128) NOT NULL, CMC_TABLE varchar(256) NOT NULL, CMC_PARTITION varchar(767), @@ -672,9 +678,8 @@ CREATE TABLE AUX_TABLE ( PRIMARY KEY(MT_KEY1, MT_KEY2) ); ---1st 4 cols make up a PK but since WS_PARTITION is nullable we can't declare such PK ---This is a good candidate for Index orgainzed table CREATE TABLE WRITE_SET ( + WS_ID bigint PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY, WS_DATABASE varchar(128) NOT NULL, WS_TABLE varchar(256) NOT NULL, WS_PARTITION varchar(767), @@ -687,25 +692,25 @@ CREATE TABLE TXN_TO_WRITE_ID ( T2W_TXNID bigint NOT NULL, T2W_DATABASE varchar(128) NOT NULL, T2W_TABLE varchar(256) NOT NULL, - T2W_WRITEID bigint NOT NULL + T2W_WRITEID bigint NOT NULL, + PRIMARY KEY (T2W_DATABASE, T2W_TABLE, T2W_TXNID) ); -CREATE UNIQUE INDEX TBL_TO_TXN_ID_IDX ON TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_TXNID); CREATE UNIQUE INDEX TBL_TO_WRITE_ID_IDX ON TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_WRITEID); CREATE TABLE NEXT_WRITE_ID ( NWI_DATABASE varchar(128) NOT NULL, NWI_TABLE varchar(256) NOT NULL, - NWI_NEXT bigint NOT NULL + NWI_NEXT bigint NOT NULL, + PRIMARY KEY (NWI_DATABASE, NWI_TABLE) ); -CREATE UNIQUE INDEX NEXT_WRITE_ID_IDX ON NEXT_WRITE_ID (NWI_DATABASE, NWI_TABLE); - CREATE TABLE MIN_HISTORY_WRITE_ID ( MH_TXNID bigint NOT NULL REFERENCES TXNS (TXN_ID), MH_DATABASE varchar(128) NOT NULL, MH_TABLE varchar(256) NOT NULL, - MH_WRITEID bigint NOT NULL + MH_WRITEID bigint NOT NULL, + PRIMARY KEY (MH_TXNID, MH_DATABASE, MH_TABLE, MH_WRITEID) ); CREATE INDEX MIN_HISTORY_WRITE_ID_IDX ON MIN_HISTORY_WRITE_ID (MH_DATABASE, MH_TABLE, MH_WRITEID); diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.2.0-to-4.3.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.2.0-to-4.3.0.derby.sql index 4aa072134523..dd308589c735 100644 --- a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.2.0-to-4.3.0.derby.sql +++ b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-4.2.0-to-4.3.0.derby.sql @@ -3,5 +3,22 @@ ALTER TABLE MATERIALIZATION_REBUILD_LOCKS ADD COLUMN MRL_CAT_NAME varchar(128) N CREATE INDEX MIN_HISTORY_WRITE_ID_IDX ON MIN_HISTORY_WRITE_ID (MH_DATABASE, MH_TABLE, MH_WRITEID); +ALTER TABLE TXN_COMPONENTS ADD COLUMN TC_ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY; +ALTER TABLE COMPLETED_TXN_COMPONENTS ADD COLUMN CTC_ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY; +ALTER TABLE COMPACTION_METRICS_CACHE ADD COLUMN CMC_ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY; +ALTER TABLE WRITE_SET ADD COLUMN WS_ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY; + +DROP INDEX TBL_TO_TXN_ID_IDX; +ALTER TABLE TXN_TO_WRITE_ID ADD PRIMARY KEY (T2W_DATABASE, T2W_TABLE, T2W_TXNID); + +DROP INDEX NEXT_WRITE_ID_IDX; +ALTER TABLE NEXT_WRITE_ID ADD PRIMARY KEY (NWI_DATABASE, NWI_TABLE); + +ALTER TABLE MIN_HISTORY_WRITE_ID ADD PRIMARY KEY (MH_TXNID, MH_DATABASE, MH_TABLE, MH_WRITEID); + +ALTER TABLE TXN_LOCK_TBL ADD COLUMN TLT_ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY; +ALTER TABLE NEXT_LOCK_ID ADD COLUMN NL_ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY; +ALTER TABLE NEXT_COMPACTION_QUEUE_ID ADD COLUMN NCQI_ID BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY; + -- This needs to be the last thing done. Insert any changes above this line. UPDATE "APP".VERSION SET SCHEMA_VERSION='4.3.0', VERSION_COMMENT='Hive release version 4.3.0' where VER_ID=1; diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.3.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.3.0.mssql.sql index ad2a45fc02b9..b2ca19b2f451 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.3.0.mssql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.3.0.mssql.sql @@ -1033,22 +1033,26 @@ CREATE INDEX COMPLETED_COMPACTIONS_RES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_ -- HIVE-25842 CREATE TABLE COMPACTION_METRICS_CACHE ( + CMC_ID bigint NOT NULL IDENTITY(1,1), CMC_DATABASE 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, - CMC_VERSION int NOT NULL + CMC_VERSION int NOT NULL, + PRIMARY KEY CLUSTERED (CMC_ID ASC) ); CREATE TABLE COMPLETED_TXN_COMPONENTS( + CTC_ID bigint NOT NULL IDENTITY(1,1), CTC_TXNID bigint NOT NULL, CTC_DATABASE nvarchar(128) NOT NULL, CTC_TABLE nvarchar(256) NULL, CTC_PARTITION nvarchar(767) NULL, CTC_TIMESTAMP datetime2 DEFAULT CURRENT_TIMESTAMP NOT NULL, CTC_WRITEID bigint, - CTC_UPDATE_DELETE char(1) NOT NULL + CTC_UPDATE_DELETE char(1) NOT NULL, + PRIMARY KEY CLUSTERED (CTC_ID ASC) ); @@ -1080,22 +1084,28 @@ PRIMARY KEY CLUSTERED ); CREATE TABLE NEXT_COMPACTION_QUEUE_ID( - NCQ_NEXT bigint NOT NULL + NCQI_ID bigint NOT NULL IDENTITY(1,1), + NCQ_NEXT bigint NOT NULL, + PRIMARY KEY CLUSTERED (NCQI_ID ASC) ); -INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1); +INSERT INTO NEXT_COMPACTION_QUEUE_ID (NCQ_NEXT) VALUES(1); CREATE TABLE NEXT_LOCK_ID( - NL_NEXT bigint NOT NULL + NL_ID bigint NOT NULL IDENTITY(1,1), + NL_NEXT bigint NOT NULL, + PRIMARY KEY CLUSTERED (NL_ID ASC) ); -INSERT INTO NEXT_LOCK_ID VALUES(1); +INSERT INTO NEXT_LOCK_ID (NL_NEXT) VALUES(1); CREATE TABLE TXN_LOCK_TBL( - TXN_LOCK bigint NOT NULL + TLT_ID bigint NOT NULL IDENTITY(1,1), + TXN_LOCK bigint NOT NULL, + PRIMARY KEY CLUSTERED (TLT_ID ASC) ); -INSERT INTO TXN_LOCK_TBL VALUES(1); +INSERT INTO TXN_LOCK_TBL (TXN_LOCK) VALUES(1); CREATE TABLE TXNS( TXN_ID bigint NOT NULL IDENTITY(1,1), @@ -1118,12 +1128,14 @@ INSERT INTO TXNS (TXN_ID, TXN_STATE, TXN_STARTED, TXN_LAST_HEARTBEAT, TXN_USER, VALUES(0, 'c', 0, 0, '', ''); CREATE TABLE TXN_COMPONENTS( + TC_ID bigint NOT NULL IDENTITY(1,1), TC_TXNID bigint NOT NULL, TC_DATABASE nvarchar(128) NOT NULL, TC_TABLE nvarchar(256) NULL, TC_PARTITION nvarchar(767) NULL, TC_OPERATION_TYPE char(1) NOT NULL, - TC_WRITEID bigint + TC_WRITEID bigint, + PRIMARY KEY CLUSTERED (TC_ID ASC) ); ALTER TABLE TXN_COMPONENTS WITH CHECK ADD FOREIGN KEY(TC_TXNID) REFERENCES TXNS (TXN_ID); @@ -1165,12 +1177,14 @@ CREATE INDEX CONSTRAINTS_PARENT_TBL_ID__INDEX ON KEY_CONSTRAINTS(PARENT_TBL_ID); CREATE INDEX CONSTRAINTS_CONSTRAINT_TYPE_INDEX ON KEY_CONSTRAINTS(CONSTRAINT_TYPE); CREATE TABLE WRITE_SET ( + WS_ID bigint NOT NULL IDENTITY(1,1), WS_DATABASE 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, - WS_OPERATION_TYPE char(1) NOT NULL + WS_OPERATION_TYPE char(1) NOT NULL, + PRIMARY KEY CLUSTERED (WS_ID ASC) ); CREATE TABLE METASTORE_DB_PROPERTIES ( @@ -1186,25 +1200,25 @@ CREATE TABLE TXN_TO_WRITE_ID ( T2W_TXNID bigint NOT NULL, T2W_DATABASE nvarchar(128) NOT NULL, T2W_TABLE nvarchar(256) NOT NULL, - T2W_WRITEID bigint NOT NULL + T2W_WRITEID bigint NOT NULL, + PRIMARY KEY CLUSTERED (T2W_DATABASE ASC, T2W_TABLE ASC, T2W_TXNID ASC) ); -CREATE UNIQUE INDEX TBL_TO_TXN_ID_IDX ON TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_TXNID); CREATE UNIQUE INDEX TBL_TO_WRITE_ID_IDX ON TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_WRITEID); CREATE TABLE NEXT_WRITE_ID ( NWI_DATABASE nvarchar(128) NOT NULL, NWI_TABLE nvarchar(256) NOT NULL, - NWI_NEXT bigint NOT NULL + NWI_NEXT bigint NOT NULL, + PRIMARY KEY CLUSTERED (NWI_DATABASE ASC, NWI_TABLE ASC) ); -CREATE UNIQUE INDEX NEXT_WRITE_ID_IDX ON NEXT_WRITE_ID (NWI_DATABASE, NWI_TABLE); - CREATE TABLE MIN_HISTORY_WRITE_ID ( MH_TXNID bigint NOT NULL, MH_DATABASE nvarchar(128) NOT NULL, MH_TABLE nvarchar(256) NOT NULL, - MH_WRITEID bigint NOT NULL + MH_WRITEID bigint NOT NULL, + PRIMARY KEY CLUSTERED (MH_TXNID ASC, MH_DATABASE ASC, MH_TABLE ASC, MH_WRITEID ASC) ); CREATE INDEX MIN_HISTORY_WRITE_ID_IDX ON MIN_HISTORY_WRITE_ID (MH_DATABASE, MH_TABLE, MH_WRITEID); diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.2.0-to-4.3.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.2.0-to-4.3.0.mssql.sql index 58a884a52c78..d5edfe6cc594 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.2.0-to-4.3.0.mssql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-4.2.0-to-4.3.0.mssql.sql @@ -5,6 +5,35 @@ ALTER TABLE MATERIALIZATION_REBUILD_LOCKS ADD MRL_CAT_NAME nvarchar(128) NOT NUL CREATE INDEX MIN_HISTORY_WRITE_ID_IDX ON MIN_HISTORY_WRITE_ID (MH_DATABASE, MH_TABLE, MH_WRITEID); +ALTER TABLE TXN_COMPONENTS ADD TC_ID bigint IDENTITY(1,1) NOT NULL; +ALTER TABLE TXN_COMPONENTS ADD CONSTRAINT TXN_COMPONENTS_PK PRIMARY KEY CLUSTERED (TC_ID); + +ALTER TABLE COMPLETED_TXN_COMPONENTS ADD CTC_ID bigint IDENTITY(1,1) NOT NULL; +ALTER TABLE COMPLETED_TXN_COMPONENTS ADD CONSTRAINT COMPLETED_TXN_COMPONENTS_PK PRIMARY KEY CLUSTERED (CTC_ID); + +ALTER TABLE COMPACTION_METRICS_CACHE ADD CMC_ID bigint IDENTITY(1,1) NOT NULL; +ALTER TABLE COMPACTION_METRICS_CACHE ADD CONSTRAINT COMPACTION_METRICS_CACHE_PK PRIMARY KEY CLUSTERED (CMC_ID); + +ALTER TABLE WRITE_SET ADD WS_ID bigint IDENTITY(1,1) NOT NULL; +ALTER TABLE WRITE_SET ADD CONSTRAINT WRITE_SET_PK PRIMARY KEY CLUSTERED (WS_ID); + +DROP INDEX TBL_TO_TXN_ID_IDX ON TXN_TO_WRITE_ID; +ALTER TABLE TXN_TO_WRITE_ID ADD CONSTRAINT TXN_TO_WRITE_ID_PK PRIMARY KEY CLUSTERED (T2W_DATABASE, T2W_TABLE, T2W_TXNID); + +DROP INDEX NEXT_WRITE_ID_IDX ON NEXT_WRITE_ID; +ALTER TABLE NEXT_WRITE_ID ADD CONSTRAINT NEXT_WRITE_ID_PK PRIMARY KEY CLUSTERED (NWI_DATABASE, NWI_TABLE); + +ALTER TABLE MIN_HISTORY_WRITE_ID ADD CONSTRAINT MIN_HISTORY_WRITE_ID_PK PRIMARY KEY CLUSTERED (MH_TXNID, MH_DATABASE, MH_TABLE, MH_WRITEID); + +ALTER TABLE TXN_LOCK_TBL ADD TLT_ID bigint IDENTITY(1,1) NOT NULL; +ALTER TABLE TXN_LOCK_TBL ADD CONSTRAINT TXN_LOCK_TBL_PK PRIMARY KEY CLUSTERED (TLT_ID); + +ALTER TABLE NEXT_LOCK_ID ADD NL_ID bigint IDENTITY(1,1) NOT NULL; +ALTER TABLE NEXT_LOCK_ID ADD CONSTRAINT NEXT_LOCK_ID_PK PRIMARY KEY CLUSTERED (NL_ID); + +ALTER TABLE NEXT_COMPACTION_QUEUE_ID ADD NCQI_ID bigint IDENTITY(1,1) NOT NULL; +ALTER TABLE NEXT_COMPACTION_QUEUE_ID ADD CONSTRAINT NEXT_COMPACTION_QUEUE_ID_PK PRIMARY KEY CLUSTERED (NCQI_ID); + -- These lines need to be last. Insert any changes above. UPDATE VERSION SET SCHEMA_VERSION='4.3.0', VERSION_COMMENT='Hive release version 4.3.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 4.2.0 to 4.3.0' AS MESSAGE; diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.3.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.3.0.mysql.sql index 03e37811f6cf..a59d67d38b91 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.3.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.3.0.mysql.sql @@ -965,33 +965,39 @@ INSERT INTO TXNS (TXN_ID, TXN_STATE, TXN_STARTED, TXN_LAST_HEARTBEAT, TXN_USER, VALUES(0, 'c', 0, 0, '', ''); CREATE TABLE TXN_COMPONENTS ( + TC_ID bigint NOT NULL AUTO_INCREMENT, TC_TXNID bigint NOT NULL, TC_DATABASE varchar(128) NOT NULL, TC_TABLE varchar(256), TC_PARTITION varchar(767), TC_OPERATION_TYPE char(1) NOT NULL, TC_WRITEID bigint, + PRIMARY KEY (TC_ID), FOREIGN KEY (TC_TXNID) REFERENCES TXNS (TXN_ID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; CREATE INDEX TC_TXNID_INDEX ON TXN_COMPONENTS (TC_TXNID); CREATE TABLE COMPLETED_TXN_COMPONENTS ( + CTC_ID bigint NOT NULL AUTO_INCREMENT, CTC_TXNID bigint NOT NULL, CTC_DATABASE varchar(128) NOT NULL, CTC_TABLE varchar(256), CTC_PARTITION varchar(767), CTC_TIMESTAMP timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL, CTC_WRITEID bigint, - CTC_UPDATE_DELETE char(1) NOT NULL + CTC_UPDATE_DELETE char(1) NOT NULL, + PRIMARY KEY (CTC_ID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; CREATE INDEX COMPLETED_TXN_COMPONENTS_IDX ON COMPLETED_TXN_COMPONENTS (CTC_DATABASE, CTC_TABLE, CTC_PARTITION) USING BTREE; CREATE TABLE TXN_LOCK_TBL ( - TXN_LOCK bigint NOT NULL + TLT_ID bigint NOT NULL AUTO_INCREMENT, + TXN_LOCK bigint NOT NULL, + PRIMARY KEY (TLT_ID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -INSERT INTO TXN_LOCK_TBL VALUES(1); +INSERT INTO TXN_LOCK_TBL (TXN_LOCK) VALUES(1); CREATE TABLE HIVE_LOCKS ( HL_LOCK_EXT_ID bigint NOT NULL, @@ -1018,9 +1024,11 @@ CREATE TABLE HIVE_LOCKS ( CREATE INDEX HL_TXNID_IDX ON HIVE_LOCKS (HL_TXNID); CREATE TABLE NEXT_LOCK_ID ( - NL_NEXT bigint NOT NULL + NL_ID bigint NOT NULL AUTO_INCREMENT, + NL_NEXT bigint NOT NULL, + PRIMARY KEY (NL_ID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -INSERT INTO NEXT_LOCK_ID VALUES(1); +INSERT INTO NEXT_LOCK_ID (NL_NEXT) VALUES(1); CREATE TABLE COMPACTION_QUEUE ( CQ_ID bigint PRIMARY KEY, @@ -1083,18 +1091,22 @@ CREATE INDEX COMPLETED_COMPACTIONS_RES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_ -- HIVE-25842 CREATE TABLE COMPACTION_METRICS_CACHE ( + CMC_ID bigint NOT NULL AUTO_INCREMENT, CMC_DATABASE 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, - CMC_VERSION int NOT NULL + CMC_VERSION int NOT NULL, + PRIMARY KEY (CMC_ID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; CREATE TABLE NEXT_COMPACTION_QUEUE_ID ( - NCQ_NEXT bigint NOT NULL + NCQI_ID bigint NOT NULL AUTO_INCREMENT, + NCQ_NEXT bigint NOT NULL, + PRIMARY KEY (NCQI_ID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1); +INSERT INTO NEXT_COMPACTION_QUEUE_ID (NCQ_NEXT) VALUES(1); CREATE TABLE AUX_TABLE ( MT_KEY1 varchar(128) NOT NULL, @@ -1104,37 +1116,39 @@ CREATE TABLE AUX_TABLE ( ) ENGINE=InnoDB DEFAULT CHARSET=latin1; CREATE TABLE WRITE_SET ( + WS_ID bigint NOT NULL AUTO_INCREMENT, WS_DATABASE 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, - WS_OPERATION_TYPE char(1) NOT NULL + WS_OPERATION_TYPE char(1) NOT NULL, + PRIMARY KEY (WS_ID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; CREATE TABLE TXN_TO_WRITE_ID ( T2W_TXNID bigint NOT NULL, T2W_DATABASE varchar(128) NOT NULL, T2W_TABLE varchar(256) NOT NULL, - T2W_WRITEID bigint NOT NULL + T2W_WRITEID bigint NOT NULL, + PRIMARY KEY (T2W_DATABASE, T2W_TABLE, T2W_TXNID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -CREATE UNIQUE INDEX TBL_TO_TXN_ID_IDX ON TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_TXNID); CREATE UNIQUE INDEX TBL_TO_WRITE_ID_IDX ON TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_WRITEID); CREATE TABLE NEXT_WRITE_ID ( NWI_DATABASE varchar(128) NOT NULL, NWI_TABLE varchar(256) NOT NULL, - NWI_NEXT bigint NOT NULL + NWI_NEXT bigint NOT NULL, + PRIMARY KEY (NWI_DATABASE, NWI_TABLE) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; -CREATE UNIQUE INDEX NEXT_WRITE_ID_IDX ON NEXT_WRITE_ID (NWI_DATABASE, NWI_TABLE); - CREATE TABLE MIN_HISTORY_WRITE_ID ( MH_TXNID bigint NOT NULL, MH_DATABASE varchar(128) NOT NULL, MH_TABLE varchar(256) NOT NULL, MH_WRITEID bigint NOT NULL, + PRIMARY KEY (MH_TXNID, MH_DATABASE, MH_TABLE, MH_WRITEID), FOREIGN KEY (MH_TXNID) REFERENCES TXNS (TXN_ID) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.2.0-to-4.3.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.2.0-to-4.3.0.mysql.sql index 5149dce33cff..78d2e402dacb 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.2.0-to-4.3.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-4.2.0-to-4.3.0.mysql.sql @@ -5,6 +5,19 @@ ALTER TABLE MATERIALIZATION_REBUILD_LOCKS ADD MRL_CAT_NAME varchar(128) NOT NUL CREATE INDEX MIN_HISTORY_WRITE_ID_IDX ON MIN_HISTORY_WRITE_ID (MH_DATABASE, MH_TABLE, MH_WRITEID); +ALTER TABLE TXN_COMPONENTS ADD TC_ID bigint NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST; +ALTER TABLE COMPLETED_TXN_COMPONENTS ADD CTC_ID bigint NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST; +ALTER TABLE COMPACTION_METRICS_CACHE ADD CMC_ID bigint NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST; +ALTER TABLE WRITE_SET ADD WS_ID bigint NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST; + +ALTER TABLE TXN_TO_WRITE_ID DROP INDEX TBL_TO_TXN_ID_IDX, ADD PRIMARY KEY (T2W_DATABASE, T2W_TABLE, T2W_TXNID); +ALTER TABLE NEXT_WRITE_ID DROP INDEX NEXT_WRITE_ID_IDX, ADD PRIMARY KEY (NWI_DATABASE, NWI_TABLE); +ALTER TABLE MIN_HISTORY_WRITE_ID ADD PRIMARY KEY (MH_TXNID, MH_DATABASE, MH_TABLE, MH_WRITEID); + +ALTER TABLE TXN_LOCK_TBL ADD TLT_ID bigint NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST; +ALTER TABLE NEXT_LOCK_ID ADD NL_ID bigint NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST; +ALTER TABLE NEXT_COMPACTION_QUEUE_ID ADD NCQI_ID bigint NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST; + -- These lines need to be last. Insert any changes above. UPDATE VERSION SET SCHEMA_VERSION='4.3.0', VERSION_COMMENT='Hive release version 4.3.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 4.2.0 to 4.3.0' AS MESSAGE; diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.3.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.3.0.oracle.sql index 33958a17852f..dfa488cde488 100644 --- a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.3.0.oracle.sql +++ b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.3.0.oracle.sql @@ -956,6 +956,7 @@ INSERT INTO TXNS (TXN_ID, TXN_STATE, TXN_STARTED, TXN_LAST_HEARTBEAT, TXN_USER, VALUES(0, 'c', 0, 0, '_', '_'); CREATE TABLE TXN_COMPONENTS ( + TC_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, TC_TXNID NUMBER(19) NOT NULL REFERENCES TXNS (TXN_ID), TC_DATABASE VARCHAR2(128) NOT NULL, TC_TABLE VARCHAR2(256), @@ -967,6 +968,7 @@ CREATE TABLE TXN_COMPONENTS ( CREATE INDEX TC_TXNID_INDEX ON TXN_COMPONENTS (TC_TXNID); CREATE TABLE COMPLETED_TXN_COMPONENTS ( + CTC_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, CTC_TXNID NUMBER(19) NOT NULL, CTC_DATABASE VARCHAR2(128) NOT NULL, CTC_TABLE VARCHAR2(256), @@ -979,9 +981,10 @@ CREATE TABLE COMPLETED_TXN_COMPONENTS ( CREATE INDEX COMPLETED_TXN_COMPONENTS_INDEX ON COMPLETED_TXN_COMPONENTS (CTC_DATABASE, CTC_TABLE, CTC_PARTITION); CREATE TABLE TXN_LOCK_TBL ( + TLT_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, TXN_LOCK NUMBER(19) NOT NULL ); -INSERT INTO TXN_LOCK_TBL VALUES(1); +INSERT INTO TXN_LOCK_TBL (TXN_LOCK) VALUES(1); CREATE TABLE HIVE_LOCKS ( HL_LOCK_EXT_ID NUMBER(19) NOT NULL, @@ -1007,9 +1010,10 @@ CREATE TABLE HIVE_LOCKS ( CREATE INDEX HL_TXNID_INDEX ON HIVE_LOCKS (HL_TXNID); CREATE TABLE NEXT_LOCK_ID ( + NL_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, NL_NEXT NUMBER(19) NOT NULL ); -INSERT INTO NEXT_LOCK_ID VALUES(1); +INSERT INTO NEXT_LOCK_ID (NL_NEXT) VALUES(1); CREATE TABLE COMPACTION_QUEUE ( CQ_ID NUMBER(19) PRIMARY KEY, @@ -1041,9 +1045,10 @@ CREATE TABLE COMPACTION_QUEUE ( ) ROWDEPENDENCIES; CREATE TABLE NEXT_COMPACTION_QUEUE_ID ( + NCQI_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, NCQ_NEXT NUMBER(19) NOT NULL ); -INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1); +INSERT INTO NEXT_COMPACTION_QUEUE_ID (NCQ_NEXT) VALUES(1); CREATE TABLE COMPLETED_COMPACTIONS ( CC_ID NUMBER(19) PRIMARY KEY, @@ -1077,6 +1082,7 @@ CREATE INDEX COMPLETED_COMPACTIONS_RES ON COMPLETED_COMPACTIONS (CC_DATABASE,CC_ -- HIVE-25842 CREATE TABLE COMPACTION_METRICS_CACHE ( + CMC_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, CMC_DATABASE varchar(128) NOT NULL, CMC_TABLE varchar(256) NOT NULL, CMC_PARTITION varchar(767), @@ -1093,6 +1099,7 @@ CREATE TABLE AUX_TABLE ( ); CREATE TABLE WRITE_SET ( + WS_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, WS_DATABASE varchar2(128) NOT NULL, WS_TABLE varchar2(256) NOT NULL, WS_PARTITION varchar2(767), @@ -1105,25 +1112,25 @@ CREATE TABLE TXN_TO_WRITE_ID ( T2W_TXNID NUMBER(19) NOT NULL, T2W_DATABASE VARCHAR2(128) NOT NULL, T2W_TABLE VARCHAR2(256) NOT NULL, - T2W_WRITEID NUMBER(19) NOT NULL + T2W_WRITEID NUMBER(19) NOT NULL, + PRIMARY KEY (T2W_DATABASE, T2W_TABLE, T2W_TXNID) ); -CREATE UNIQUE INDEX TBL_TO_TXN_ID_IDX ON TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_TXNID); CREATE UNIQUE INDEX TBL_TO_WRITE_ID_IDX ON TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_WRITEID); CREATE TABLE NEXT_WRITE_ID ( NWI_DATABASE VARCHAR2(128) NOT NULL, NWI_TABLE VARCHAR2(256) NOT NULL, - NWI_NEXT NUMBER(19) NOT NULL + NWI_NEXT NUMBER(19) NOT NULL, + PRIMARY KEY (NWI_DATABASE, NWI_TABLE) ); -CREATE UNIQUE INDEX NEXT_WRITE_ID_IDX ON NEXT_WRITE_ID (NWI_DATABASE, NWI_TABLE); - CREATE TABLE MIN_HISTORY_WRITE_ID ( MH_TXNID NUMBER(19) NOT NULL REFERENCES TXNS (TXN_ID), MH_DATABASE VARCHAR2(128) NOT NULL, MH_TABLE VARCHAR2(256) NOT NULL, - MH_WRITEID NUMBER(19) NOT NULL + MH_WRITEID NUMBER(19) NOT NULL, + PRIMARY KEY (MH_TXNID, MH_DATABASE, MH_TABLE, MH_WRITEID) ); CREATE INDEX MIN_HISTORY_WRITE_ID_IDX ON MIN_HISTORY_WRITE_ID (MH_DATABASE, MH_TABLE, MH_WRITEID); diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.2.0-to-4.3.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.2.0-to-4.3.0.oracle.sql index bb210a6623c5..cc7c98bb80c3 100644 --- a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.2.0-to-4.3.0.oracle.sql +++ b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-4.2.0-to-4.3.0.oracle.sql @@ -5,6 +5,23 @@ ALTER TABLE MATERIALIZATION_REBUILD_LOCKS ADD (MRL_CAT_NAME VARCHAR2(128) DEFAUL CREATE INDEX MIN_HISTORY_WRITE_ID_IDX ON MIN_HISTORY_WRITE_ID (MH_DATABASE, MH_TABLE, MH_WRITEID); +ALTER TABLE TXN_COMPONENTS ADD (TC_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY); +ALTER TABLE COMPLETED_TXN_COMPONENTS ADD (CTC_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY); +ALTER TABLE COMPACTION_METRICS_CACHE ADD (CMC_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY); +ALTER TABLE WRITE_SET ADD (WS_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY); + +DROP INDEX TBL_TO_TXN_ID_IDX; +ALTER TABLE TXN_TO_WRITE_ID ADD PRIMARY KEY (T2W_DATABASE, T2W_TABLE, T2W_TXNID); + +DROP INDEX NEXT_WRITE_ID_IDX; +ALTER TABLE NEXT_WRITE_ID ADD PRIMARY KEY (NWI_DATABASE, NWI_TABLE); + +ALTER TABLE MIN_HISTORY_WRITE_ID ADD PRIMARY KEY (MH_TXNID, MH_DATABASE, MH_TABLE, MH_WRITEID); + +ALTER TABLE TXN_LOCK_TBL ADD (TLT_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY); +ALTER TABLE NEXT_LOCK_ID ADD (NL_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY); +ALTER TABLE NEXT_COMPACTION_QUEUE_ID ADD (NCQI_ID NUMBER(19) GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY); + -- These lines need to be last. Insert any changes above. UPDATE VERSION SET SCHEMA_VERSION='4.3.0', VERSION_COMMENT='Hive release version 4.3.0' where VER_ID=1; SELECT 'Finished upgrading MetaStore schema from 4.2.0 to 4.3.0' AS Status from dual; diff --git a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.3.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.3.0.postgres.sql index 10eb38923261..9c9499c5495f 100644 --- a/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.3.0.postgres.sql +++ b/standalone-metastore/metastore-server/src/main/sql/postgres/hive-schema-4.3.0.postgres.sql @@ -1591,6 +1591,7 @@ INSERT INTO "TXNS" ("TXN_ID", "TXN_STATE", "TXN_STARTED", "TXN_LAST_HEARTBEAT", VALUES(0, 'c', 0, 0, '', ''); CREATE TABLE "TXN_COMPONENTS" ( + "TC_ID" bigserial PRIMARY KEY, "TC_TXNID" bigint NOT NULL REFERENCES "TXNS" ("TXN_ID"), "TC_DATABASE" varchar(128) NOT NULL, "TC_TABLE" varchar(256), @@ -1602,6 +1603,7 @@ CREATE TABLE "TXN_COMPONENTS" ( CREATE INDEX TC_TXNID_INDEX ON "TXN_COMPONENTS" USING hash ("TC_TXNID"); CREATE TABLE "COMPLETED_TXN_COMPONENTS" ( + "CTC_ID" bigserial PRIMARY KEY, "CTC_TXNID" bigint NOT NULL, "CTC_DATABASE" varchar(128) NOT NULL, "CTC_TABLE" varchar(256), @@ -1614,9 +1616,10 @@ CREATE TABLE "COMPLETED_TXN_COMPONENTS" ( CREATE INDEX COMPLETED_TXN_COMPONENTS_INDEX ON "COMPLETED_TXN_COMPONENTS" USING btree ("CTC_DATABASE", "CTC_TABLE", "CTC_PARTITION"); CREATE TABLE "TXN_LOCK_TBL" ( + "TLT_ID" bigserial PRIMARY KEY, "TXN_LOCK" bigint NOT NULL ); -INSERT INTO "TXN_LOCK_TBL" VALUES(1); +INSERT INTO "TXN_LOCK_TBL" ("TXN_LOCK") VALUES(1); CREATE TABLE "HIVE_LOCKS" ( "HL_LOCK_EXT_ID" bigint NOT NULL, @@ -1642,9 +1645,10 @@ CREATE TABLE "HIVE_LOCKS" ( CREATE INDEX HL_TXNID_INDEX ON "HIVE_LOCKS" USING hash ("HL_TXNID"); CREATE TABLE "NEXT_LOCK_ID" ( + "NL_ID" bigserial PRIMARY KEY, "NL_NEXT" bigint NOT NULL ); -INSERT INTO "NEXT_LOCK_ID" VALUES(1); +INSERT INTO "NEXT_LOCK_ID" ("NL_NEXT") VALUES(1); CREATE TABLE "COMPACTION_QUEUE" ( "CQ_ID" bigint PRIMARY KEY, @@ -1676,9 +1680,10 @@ CREATE TABLE "COMPACTION_QUEUE" ( ); CREATE TABLE "NEXT_COMPACTION_QUEUE_ID" ( + "NCQI_ID" bigserial PRIMARY KEY, "NCQ_NEXT" bigint NOT NULL ); -INSERT INTO "NEXT_COMPACTION_QUEUE_ID" VALUES(1); +INSERT INTO "NEXT_COMPACTION_QUEUE_ID" ("NCQ_NEXT") VALUES(1); CREATE TABLE "COMPLETED_COMPACTIONS" ( "CC_ID" bigint PRIMARY KEY, @@ -1712,6 +1717,7 @@ CREATE INDEX "COMPLETED_COMPACTIONS_RES" ON "COMPLETED_COMPACTIONS" ("CC_DATABAS -- HIVE-25842 CREATE TABLE "COMPACTION_METRICS_CACHE" ( + "CMC_ID" bigserial PRIMARY KEY, "CMC_DATABASE" varchar(128) NOT NULL, "CMC_TABLE" varchar(256) NOT NULL, "CMC_PARTITION" varchar(767), @@ -1728,6 +1734,7 @@ CREATE TABLE "AUX_TABLE" ( ); CREATE TABLE "WRITE_SET" ( + "WS_ID" bigserial PRIMARY KEY, "WS_DATABASE" varchar(128) NOT NULL, "WS_TABLE" varchar(256) NOT NULL, "WS_PARTITION" varchar(767), @@ -1740,25 +1747,25 @@ CREATE TABLE "TXN_TO_WRITE_ID" ( "T2W_TXNID" bigint NOT NULL, "T2W_DATABASE" varchar(128) NOT NULL, "T2W_TABLE" varchar(256) NOT NULL, - "T2W_WRITEID" bigint NOT NULL + "T2W_WRITEID" bigint NOT NULL, + PRIMARY KEY ("T2W_DATABASE", "T2W_TABLE", "T2W_TXNID") ); -CREATE UNIQUE INDEX "TBL_TO_TXN_ID_IDX" ON "TXN_TO_WRITE_ID" ("T2W_DATABASE", "T2W_TABLE", "T2W_TXNID"); CREATE UNIQUE INDEX "TBL_TO_WRITE_ID_IDX" ON "TXN_TO_WRITE_ID" ("T2W_DATABASE", "T2W_TABLE", "T2W_WRITEID"); CREATE TABLE "NEXT_WRITE_ID" ( "NWI_DATABASE" varchar(128) NOT NULL, "NWI_TABLE" varchar(256) NOT NULL, - "NWI_NEXT" bigint NOT NULL + "NWI_NEXT" bigint NOT NULL, + PRIMARY KEY ("NWI_DATABASE", "NWI_TABLE") ); -CREATE UNIQUE INDEX "NEXT_WRITE_ID_IDX" ON "NEXT_WRITE_ID" ("NWI_DATABASE", "NWI_TABLE"); - CREATE TABLE "MIN_HISTORY_WRITE_ID" ( "MH_TXNID" bigint NOT NULL REFERENCES "TXNS" ("TXN_ID"), "MH_DATABASE" varchar(128) NOT NULL, "MH_TABLE" varchar(256) NOT NULL, - "MH_WRITEID" bigint NOT NULL + "MH_WRITEID" bigint NOT NULL, + PRIMARY KEY ("MH_TXNID", "MH_DATABASE", "MH_TABLE", "MH_WRITEID") ); CREATE INDEX "MIN_HISTORY_WRITE_ID_IDX" ON "MIN_HISTORY_WRITE_ID" ("MH_DATABASE", "MH_TABLE", "MH_WRITEID"); diff --git a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.2.0-to-4.3.0.postgres.sql b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.2.0-to-4.3.0.postgres.sql index bdd28ce20298..f6a74d99d688 100644 --- a/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.2.0-to-4.3.0.postgres.sql +++ b/standalone-metastore/metastore-server/src/main/sql/postgres/upgrade-4.2.0-to-4.3.0.postgres.sql @@ -5,6 +5,23 @@ ALTER TABLE "MATERIALIZATION_REBUILD_LOCKS" ADD COLUMN "MRL_CAT_NAME" varchar(12 CREATE INDEX "MIN_HISTORY_WRITE_ID_IDX" ON "MIN_HISTORY_WRITE_ID" ("MH_DATABASE", "MH_TABLE", "MH_WRITEID"); +ALTER TABLE "TXN_COMPONENTS" ADD COLUMN "TC_ID" bigserial PRIMARY KEY; +ALTER TABLE "COMPLETED_TXN_COMPONENTS" ADD COLUMN "CTC_ID" bigserial PRIMARY KEY; +ALTER TABLE "COMPACTION_METRICS_CACHE" ADD COLUMN "CMC_ID" bigserial PRIMARY KEY; +ALTER TABLE "WRITE_SET" ADD COLUMN "WS_ID" bigserial PRIMARY KEY; + +DROP INDEX "TBL_TO_TXN_ID_IDX"; +ALTER TABLE "TXN_TO_WRITE_ID" ADD PRIMARY KEY ("T2W_DATABASE", "T2W_TABLE", "T2W_TXNID"); + +DROP INDEX "NEXT_WRITE_ID_IDX"; +ALTER TABLE "NEXT_WRITE_ID" ADD PRIMARY KEY ("NWI_DATABASE", "NWI_TABLE"); + +ALTER TABLE "MIN_HISTORY_WRITE_ID" ADD PRIMARY KEY ("MH_TXNID", "MH_DATABASE", "MH_TABLE", "MH_WRITEID"); + +ALTER TABLE "TXN_LOCK_TBL" ADD COLUMN "TLT_ID" bigserial PRIMARY KEY; +ALTER TABLE "NEXT_LOCK_ID" ADD COLUMN "NL_ID" bigserial PRIMARY KEY; +ALTER TABLE "NEXT_COMPACTION_QUEUE_ID" ADD COLUMN "NCQI_ID" bigserial PRIMARY KEY; + -- These lines need to be last. Insert any changes above. UPDATE "VERSION" SET "SCHEMA_VERSION"='4.3.0', "VERSION_COMMENT"='Hive release version 4.3.0' where "VER_ID"=1; SELECT 'Finished upgrading MetaStore schema from 4.2.0 to 4.3.0'; From 0804b407b9d91b8dbd3b44e9bb4807d20c235b51 Mon Sep 17 00:00:00 2001 From: saihemanth Date: Thu, 4 Jun 2026 16:55:05 -0700 Subject: [PATCH 2/2] Address test failures --- .../org/apache/hadoop/hive/metastore/utils/TestTxnDbUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestTxnDbUtil.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestTxnDbUtil.java index 96a1b8a15898..cb5ba8f631fd 100644 --- a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestTxnDbUtil.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/utils/TestTxnDbUtil.java @@ -240,8 +240,8 @@ public static void cleanDb(Configuration conf) throws Exception { DatabaseProduct databaseProduct = determineDatabaseProduct(dbProduct, conf); try { resetTxnSequence(databaseProduct, stmt); - stmt.executeUpdate("INSERT INTO \"NEXT_LOCK_ID\" VALUES(1)"); - stmt.executeUpdate("INSERT INTO \"NEXT_COMPACTION_QUEUE_ID\" VALUES(1)"); + stmt.executeUpdate("INSERT INTO \"NEXT_LOCK_ID\" (\"NL_NEXT\") VALUES(1)"); + stmt.executeUpdate("INSERT INTO \"NEXT_COMPACTION_QUEUE_ID\" (\"NCQ_NEXT\") VALUES(1)"); } catch (SQLException e) { if (!databaseProduct.isTableNotExistsError(e)) { LOG.error("Error initializing sequence values", e);