From ee42158f1553cac1057dec68f13c5dd5fdc62b5c Mon Sep 17 00:00:00 2001 From: Deepesh Khandelwal Date: Fri, 20 Jun 2014 11:30:49 -0700 Subject: [PATCH] HIVE-7118: Oracle upgrade schema scripts do not map Java long datatype columns correctly for transaction related tables --- .../upgrade/oracle/019-HIVE-7118.oracle.sql | 38 ++++++++++++++++++++++ .../upgrade/oracle/hive-schema-0.13.0.oracle.sql | 30 ++++++++--------- .../oracle/hive-txn-schema-0.13.0.oracle.sql | 30 ++++++++--------- 3 files changed, 68 insertions(+), 30 deletions(-) create mode 100644 metastore/scripts/upgrade/oracle/019-HIVE-7118.oracle.sql diff --git a/metastore/scripts/upgrade/oracle/019-HIVE-7118.oracle.sql b/metastore/scripts/upgrade/oracle/019-HIVE-7118.oracle.sql new file mode 100644 index 0000000..b34f406 --- /dev/null +++ b/metastore/scripts/upgrade/oracle/019-HIVE-7118.oracle.sql @@ -0,0 +1,38 @@ +ALTER TABLE TXNS MODIFY ( + TXN_ID NUMBER(19), + TXN_STARTED NUMBER(19), + TXN_LAST_HEARTBEAT NUMBER(19) +); + +ALTER TABLE TXN_COMPONENTS MODIFY ( + TC_TXNID NUMBER(19) +); + +ALTER TABLE COMPLETED_TXN_COMPONENTS MODIFY ( + CTC_TXNID NUMBER(19) +); + +ALTER TABLE NEXT_TXN_ID MODIFY ( + NTXN_NEXT NUMBER(19) +); + +ALTER TABLE HIVE_LOCKS MODIFY ( + HL_LOCK_EXT_ID NUMBER(19), + HL_LOCK_INT_ID NUMBER(19), + HL_TXNID NUMBER(19), + HL_LAST_HEARTBEAT NUMBER(19), + HL_ACQUIRED_AT NUMBER(19) +); + +ALTER TABLE NEXT_LOCK_ID MODIFY ( + NL_NEXT NUMBER(19) +); + +ALTER TABLE COMPACTION_QUEUE MODIFY ( + CQ_ID NUMBER(19), + CQ_START NUMBER(19) +); + +ALTER TABLE NEXT_COMPACTION_QUEUE_ID MODIFY ( + NCQ_NEXT NUMBER(19) +); diff --git a/metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql b/metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql index f819187..6bd8df9 100644 --- a/metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql +++ b/metastore/scripts/upgrade/oracle/hive-schema-0.13.0.oracle.sql @@ -760,44 +760,44 @@ CREATE INDEX FUNC_RU_N49 ON FUNC_RU (FUNC_ID); -- ----------------------------------------------------------------------------------------------------------------------------------------------- CREATE TABLE TXNS ( - TXN_ID NUMBER(10) PRIMARY KEY, + TXN_ID NUMBER(19) PRIMARY KEY, TXN_STATE char(1) NOT NULL, - TXN_STARTED NUMBER(10) NOT NULL, - TXN_LAST_HEARTBEAT NUMBER(10) NOT NULL, + TXN_STARTED NUMBER(19) NOT NULL, + TXN_LAST_HEARTBEAT NUMBER(19) NOT NULL, TXN_USER varchar(128) NOT NULL, TXN_HOST varchar(128) NOT NULL ); CREATE TABLE TXN_COMPONENTS ( - TC_TXNID NUMBER(10) REFERENCES TXNS (TXN_ID), + TC_TXNID NUMBER(19) REFERENCES TXNS (TXN_ID), TC_DATABASE VARCHAR2(128) NOT NULL, TC_TABLE VARCHAR2(128), TC_PARTITION VARCHAR2(767) NULL ); CREATE TABLE COMPLETED_TXN_COMPONENTS ( - CTC_TXNID NUMBER(10), + CTC_TXNID NUMBER(19), CTC_DATABASE varchar(128) NOT NULL, CTC_TABLE varchar(128), CTC_PARTITION varchar(767) ); CREATE TABLE NEXT_TXN_ID ( - NTXN_NEXT NUMBER(10) NOT NULL + NTXN_NEXT NUMBER(19) NOT NULL ); INSERT INTO NEXT_TXN_ID VALUES(1); CREATE TABLE HIVE_LOCKS ( - HL_LOCK_EXT_ID NUMBER(10) NOT NULL, - HL_LOCK_INT_ID NUMBER(10) NOT NULL, - HL_TXNID NUMBER(10), + HL_LOCK_EXT_ID NUMBER(19) NOT NULL, + HL_LOCK_INT_ID NUMBER(19) NOT NULL, + HL_TXNID NUMBER(19), HL_DB VARCHAR2(128) NOT NULL, HL_TABLE VARCHAR2(128), HL_PARTITION VARCHAR2(767), HL_LOCK_STATE CHAR(1) NOT NULL, HL_LOCK_TYPE CHAR(1) NOT NULL, - HL_LAST_HEARTBEAT NUMBER(10) NOT NULL, - HL_ACQUIRED_AT NUMBER(10), + HL_LAST_HEARTBEAT NUMBER(19) NOT NULL, + HL_ACQUIRED_AT NUMBER(19), HL_USER varchar(128) NOT NULL, HL_HOST varchar(128) NOT NULL, PRIMARY KEY(HL_LOCK_EXT_ID, HL_LOCK_INT_ID) @@ -806,24 +806,24 @@ CREATE TABLE HIVE_LOCKS ( CREATE INDEX HL_TXNID_INDEX ON HIVE_LOCKS (HL_TXNID); CREATE TABLE NEXT_LOCK_ID ( - NL_NEXT NUMBER(10) NOT NULL + NL_NEXT NUMBER(19) NOT NULL ); INSERT INTO NEXT_LOCK_ID VALUES(1); CREATE TABLE COMPACTION_QUEUE ( - CQ_ID NUMBER(10) PRIMARY KEY, + CQ_ID NUMBER(19) PRIMARY KEY, CQ_DATABASE varchar(128) NOT NULL, CQ_TABLE varchar(128) NOT NULL, CQ_PARTITION varchar(767), CQ_STATE char(1) NOT NULL, CQ_TYPE char(1) NOT NULL, CQ_WORKER_ID varchar(128), - CQ_START NUMBER(10), + CQ_START NUMBER(19), CQ_RUN_AS varchar(128) ); CREATE TABLE NEXT_COMPACTION_QUEUE_ID ( - NCQ_NEXT NUMBER(10) NOT NULL + NCQ_NEXT NUMBER(19) NOT NULL ); INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1); diff --git a/metastore/scripts/upgrade/oracle/hive-txn-schema-0.13.0.oracle.sql b/metastore/scripts/upgrade/oracle/hive-txn-schema-0.13.0.oracle.sql index c2ff663..7435ea8 100644 --- a/metastore/scripts/upgrade/oracle/hive-txn-schema-0.13.0.oracle.sql +++ b/metastore/scripts/upgrade/oracle/hive-txn-schema-0.13.0.oracle.sql @@ -18,44 +18,44 @@ -- CREATE TABLE TXNS ( - TXN_ID NUMBER(10) PRIMARY KEY, + TXN_ID NUMBER(19) PRIMARY KEY, TXN_STATE char(1) NOT NULL, - TXN_STARTED NUMBER(10) NOT NULL, - TXN_LAST_HEARTBEAT NUMBER(10) NOT NULL, + TXN_STARTED NUMBER(19) NOT NULL, + TXN_LAST_HEARTBEAT NUMBER(19) NOT NULL, TXN_USER varchar(128) NOT NULL, TXN_HOST varchar(128) NOT NULL ); CREATE TABLE TXN_COMPONENTS ( - TC_TXNID NUMBER(10) REFERENCES TXNS (TXN_ID), + TC_TXNID NUMBER(19) REFERENCES TXNS (TXN_ID), TC_DATABASE VARCHAR2(128) NOT NULL, TC_TABLE VARCHAR2(128), TC_PARTITION VARCHAR2(767) NULL ); CREATE TABLE COMPLETED_TXN_COMPONENTS ( - CTC_TXNID NUMBER(10), + CTC_TXNID NUMBER(19), CTC_DATABASE varchar(128) NOT NULL, CTC_TABLE varchar(128), CTC_PARTITION varchar(767) ); CREATE TABLE NEXT_TXN_ID ( - NTXN_NEXT NUMBER(10) NOT NULL + NTXN_NEXT NUMBER(19) NOT NULL ); INSERT INTO NEXT_TXN_ID VALUES(1); CREATE TABLE HIVE_LOCKS ( - HL_LOCK_EXT_ID NUMBER(10) NOT NULL, - HL_LOCK_INT_ID NUMBER(10) NOT NULL, - HL_TXNID NUMBER(10), + HL_LOCK_EXT_ID NUMBER(19) NOT NULL, + HL_LOCK_INT_ID NUMBER(19) NOT NULL, + HL_TXNID NUMBER(19), HL_DB VARCHAR2(128) NOT NULL, HL_TABLE VARCHAR2(128), HL_PARTITION VARCHAR2(767), HL_LOCK_STATE CHAR(1) NOT NULL, HL_LOCK_TYPE CHAR(1) NOT NULL, - HL_LAST_HEARTBEAT NUMBER(10) NOT NULL, - HL_ACQUIRED_AT NUMBER(10), + HL_LAST_HEARTBEAT NUMBER(19) NOT NULL, + HL_ACQUIRED_AT NUMBER(19), HL_USER varchar(128) NOT NULL, HL_HOST varchar(128) NOT NULL, PRIMARY KEY(HL_LOCK_EXT_ID, HL_LOCK_INT_ID) @@ -64,24 +64,24 @@ CREATE TABLE HIVE_LOCKS ( CREATE INDEX HL_TXNID_INDEX ON HIVE_LOCKS (HL_TXNID); CREATE TABLE NEXT_LOCK_ID ( - NL_NEXT NUMBER(10) NOT NULL + NL_NEXT NUMBER(19) NOT NULL ); INSERT INTO NEXT_LOCK_ID VALUES(1); CREATE TABLE COMPACTION_QUEUE ( - CQ_ID NUMBER(10) PRIMARY KEY, + CQ_ID NUMBER(19) PRIMARY KEY, CQ_DATABASE varchar(128) NOT NULL, CQ_TABLE varchar(128) NOT NULL, CQ_PARTITION varchar(767), CQ_STATE char(1) NOT NULL, CQ_TYPE char(1) NOT NULL, CQ_WORKER_ID varchar(128), - CQ_START NUMBER(10), + CQ_START NUMBER(19), CQ_RUN_AS varchar(128) ); CREATE TABLE NEXT_COMPACTION_QUEUE_ID ( - NCQ_NEXT NUMBER(10) NOT NULL + NCQ_NEXT NUMBER(19) NOT NULL ); INSERT INTO NEXT_COMPACTION_QUEUE_ID VALUES(1); -- 1.8.5.2 (Apple Git-48)