diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestScheduledReplicationScenarios.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestScheduledReplicationScenarios.java index 2e1e5e0544..017607e87b 100644 --- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestScheduledReplicationScenarios.java +++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/parse/TestScheduledReplicationScenarios.java @@ -180,6 +180,7 @@ public void testAcidTablesReplLoadBootstrapIncr() throws Throwable { } @Test + @Ignore("HIVE-23395") public void testExternalTablesReplLoadBootstrapIncr() throws Throwable { // Bootstrap String withClause = " WITH('" + HiveConf.ConfVars.REPL_EXTERNAL_TABLE_BASE_DIR.varname 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 e5c4582f4a..cba72cd0fd 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 @@ -1320,7 +1320,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, @@ -1329,7 +1329,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 33f4df8c62..fa1250ce08 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 @@ -123,7 +123,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, @@ -132,7 +132,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 e5eb9a1fd6..e036b31a9d 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 @@ -1244,7 +1244,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, @@ -1254,7 +1254,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 f534bebc4a..c1c888bb63 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 @@ -92,9 +92,9 @@ PREPARE stmt FROM @s; EXECUTE stmt; DEALLOCATE PREPARE stmt; RENAME TABLE NEXT_TXN_ID TO TXN_LOCK_TBL; -ALTER TABLE TXN_LOCK_TBL RENAME COLUMN NTXN_NEXT TO TXN_LOCK; +ALTER TABLE TXN_LOCK_TBL CHANGE NTXN_NEXT TXN_LOCK bigint; ---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, @@ -104,7 +104,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 aefef5e0c8..c7bf0bae22 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 ); diff --git a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql index 3a894b532b..61467105d0 100644 --- a/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql +++ b/standalone-metastore/metastore-server/src/main/sql/oracle/upgrade-3.2.0-to-4.0.0.oracle.sql @@ -89,7 +89,7 @@ INSERT INTO TXNS (TXN_ID, TXN_STATE, TXN_STARTED, TXN_LAST_HEARTBEAT, TXN_USER, CREATE SEQUENCE TXNS_TXN_ID_SEQ INCREMENT BY 1 START WITH 1000000001 CACHE 20; ALTER TABLE TXNS MODIFY TXN_ID default TXNS_TXN_ID_SEQ.nextval; -RENAME TABLE NEXT_TXN_ID TO TXN_LOCK_TBL; +RENAME NEXT_TXN_ID TO TXN_LOCK_TBL; ALTER TABLE TXN_LOCK_TBL RENAME COLUMN NTXN_NEXT TO TXN_LOCK; --Create table replication metrics diff --git a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/DatabaseRule.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/DatabaseRule.java index e06011f6a5..4be763921b 100644 --- a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/DatabaseRule.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/DatabaseRule.java @@ -134,10 +134,10 @@ public void after() { // stopAndRmDockerContainer return; } try { - if (runCmdAndPrintStreams(buildStopCmd(), 60) != 0) { + if (runCmdAndPrintStreams(buildStopCmd(), 600) != 0) { throw new RuntimeException("Unable to stop docker container"); } - if (runCmdAndPrintStreams(buildRmCmd(), 15) != 0) { + if (runCmdAndPrintStreams(buildRmCmd(), 600) != 0) { throw new RuntimeException("Unable to remove docker container"); } } catch (InterruptedException | IOException e) { diff --git a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java index dcd9ec54fa..228087f886 100644 --- a/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java +++ b/standalone-metastore/metastore-server/src/test/java/org/apache/hadoop/hive/metastore/dbinstall/rules/Mysql.java @@ -54,7 +54,7 @@ public String getJdbcDriver() { @Override public String getJdbcUrl() { - return "jdbc:mysql://localhost:3306/" + HIVE_DB + "?sessionVariables=sql_mode=ANSI_QUOTES"; + return "jdbc:mysql://localhost:3306/" + HIVE_DB; } @Override