diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql index e14e423344..764a557e46 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mssql/hive-schema-4.0.0.mssql.sql @@ -1318,7 +1318,7 @@ CREATE TABLE "SCHEDULED_EXECUTIONS" ( CREATE INDEX IDX_SCHEDULED_EX_LAST_UPDATE ON "SCHEDULED_EXECUTIONS" ("LAST_UPDATE_TIME"); CREATE INDEX IDX_SCHEDULED_EX_SQ_ID ON "SCHEDULED_EXECUTIONS" ("SCHEDULED_QUERY_ID"); ---HIVE-23516 +-- HIVE-23516 CREATE TABLE "REPLICATION_METRICS" ( "RM_SCHEDULED_EXECUTION_ID" bigint PRIMARY KEY, "RM_POLICY" varchar(256) NOT NULL, @@ -1327,7 +1327,7 @@ CREATE TABLE "REPLICATION_METRICS" ( "RM_PROGRESS" varchar(max) ); ---Create indexes for the replication metrics table +-- Create indexes for the replication metrics table CREATE INDEX "POLICY_IDX" ON "REPLICATION_METRICS" ("RM_POLICY"); CREATE INDEX "DUMP_IDX" ON "REPLICATION_METRICS" ("RM_DUMP_EXECUTION_ID"); diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql index 53edaa2488..e6de9a3caa 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql @@ -357,7 +357,9 @@ UPDATE COMPLETED_TXN_COMPONENTS SET CTC_WRITEID = CTC_TXNID; -- HIVE-23211: Fix metastore schema differences between init scripts, and upgrade scripts -- Not updating possible NULL values, since if NULLs existing in this table, the upgrade should fail +DROP INDEX TC_TXNID_INDEX ON TXN_COMPONENTS; ALTER TABLE TXN_COMPONENTS ALTER COLUMN TC_TXNID bigint NOT NULL; +CREATE INDEX TC_TXNID_INDEX ON TXN_COMPONENTS (TC_TXNID); ALTER TABLE COMPLETED_TXN_COMPONENTS ALTER COLUMN CTC_TXNID bigint NOT NULL; -- These lines need to be last. Insert any changes above. diff --git a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql index e61a6cff3b..1cbbe92f94 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mssql/upgrade-3.2.0-to-4.0.0.mssql.sql @@ -119,7 +119,7 @@ Exec sp_rename 'TXN_LOCK_TBL.NTXN_NEXT', 'TXN_LOCK', 'COLUMN'; ALTER TABLE TXN_COMPONENTS WITH CHECK ADD FOREIGN KEY(TC_TXNID) REFERENCES TXNS (TXN_ID); CREATE INDEX TC_TXNID_INDEX ON TXN_COMPONENTS (TC_TXNID); ---HIVE-23516 +-- HIVE-23516 CREATE TABLE "REPLICATION_METRICS" ( "RM_SCHEDULED_EXECUTION_ID" bigint PRIMARY KEY, "RM_POLICY" varchar(256) NOT NULL, @@ -128,7 +128,7 @@ CREATE TABLE "REPLICATION_METRICS" ( "RM_PROGRESS" varchar(max) ); ---Create indexes for the replication metrics table +-- Create indexes for the replication metrics table CREATE INDEX "POLICY_IDX" ON "REPLICATION_METRICS" ("RM_POLICY"); CREATE INDEX "DUMP_IDX" ON "REPLICATION_METRICS" ("RM_DUMP_EXECUTION_ID"); diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql index 0c2d50894c..659e732c27 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/hive-schema-4.0.0.mysql.sql @@ -1242,7 +1242,7 @@ CREATE INDEX IDX_SCHEDULED_EXECUTIONS_LAST_UPDATE_TIME ON SCHEDULED_EXECUTIONS ( CREATE INDEX IDX_SCHEDULED_EXECUTIONS_SCHEDULED_QUERY_ID ON SCHEDULED_EXECUTIONS (SCHEDULED_QUERY_ID); CREATE UNIQUE INDEX UNIQUE_SCHEDULED_EXECUTIONS_ID ON SCHEDULED_EXECUTIONS (SCHEDULED_EXECUTION_ID); ---Create table replication metrics +-- Create table replication metrics CREATE TABLE REPLICATION_METRICS ( RM_SCHEDULED_EXECUTION_ID bigint NOT NULL, RM_POLICY varchar(256) NOT NULL, @@ -1252,7 +1252,7 @@ CREATE TABLE REPLICATION_METRICS ( PRIMARY KEY(RM_SCHEDULED_EXECUTION_ID) ); ---Create indexes for the replication metrics table +-- Create indexes for the replication metrics table CREATE INDEX POLICY_IDX ON REPLICATION_METRICS (RM_POLICY); CREATE INDEX DUMP_IDX ON REPLICATION_METRICS (RM_DUMP_EXECUTION_ID); diff --git a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql index 6de44030e8..5961499f03 100644 --- a/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql +++ b/standalone-metastore/metastore-server/src/main/sql/mysql/upgrade-3.2.0-to-4.0.0.mysql.sql @@ -90,7 +90,7 @@ DEALLOCATE PREPARE stmt; RENAME TABLE NEXT_TXN_ID TO TXN_LOCK_TBL; ALTER TABLE TXN_LOCK_TBL RENAME COLUMN NTXN_NEXT TO TXN_LOCK; ---Create table replication metrics +-- Create table replication metrics CREATE TABLE REPLICATION_METRICS ( RM_SCHEDULED_EXECUTION_ID bigint NOT NULL, RM_POLICY varchar(256) NOT NULL, @@ -100,7 +100,7 @@ CREATE TABLE REPLICATION_METRICS ( PRIMARY KEY(RM_SCHEDULED_EXECUTION_ID) ); ---Create indexes for the replication metrics table +-- Create indexes for the replication metrics table CREATE INDEX POLICY_IDX ON REPLICATION_METRICS (RM_POLICY); CREATE INDEX DUMP_IDX ON REPLICATION_METRICS (RM_DUMP_EXECUTION_ID); diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql index c2e41a59cc..e323050ffb 100644 --- a/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql +++ b/standalone-metastore/metastore-server/src/main/sql/oracle/hive-schema-4.0.0.oracle.sql @@ -101,7 +101,7 @@ CREATE TABLE DBS OWNER_NAME VARCHAR2(128) NULL, OWNER_TYPE VARCHAR2(10) NULL, CTLG_NAME VARCHAR2(256) DEFAULT 'hive' NOT NULL, - CREATE_TIME NUMBER (10) + CREATE_TIME NUMBER (10), DB_MANAGED_LOCATION_URI VARCHAR2(4000) NULL );