You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by sa...@apache.org on 2018/05/31 11:46:10 UTC
hive git commit: Revert "HIVE-19340: Disable timeout of transactions
opened by replication task at target cluster (Mahesh Kumar Behera,
reviewed by Sankar Hariappan)"
Repository: hive
Updated Branches:
refs/heads/master cab1e60b0 -> 77ffe96d3
Revert "HIVE-19340: Disable timeout of transactions opened by replication task at target cluster (Mahesh Kumar Behera, reviewed by Sankar Hariappan)"
This reverts commit 702a676570efee20915ce6832fe7ddee42611ce3.
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/77ffe96d
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/77ffe96d
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/77ffe96d
Branch: refs/heads/master
Commit: 77ffe96d344d30ffe9140788a5fb6b9b09538077
Parents: cab1e60
Author: Sankar Hariappan <sa...@apache.org>
Authored: Thu May 31 17:13:54 2018 +0530
Committer: Sankar Hariappan <sa...@apache.org>
Committed: Thu May 31 17:13:54 2018 +0530
----------------------------------------------------------------------
.../hive/metastore/txn/TestTxnHandler.java | 31 +-------------------
.../hadoop/hive/metastore/txn/TxnDbUtil.java | 1 -
.../hadoop/hive/metastore/txn/TxnHandler.java | 21 ++-----------
.../main/sql/derby/hive-schema-3.0.0.derby.sql | 3 +-
.../sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql | 3 --
.../main/sql/mssql/hive-schema-3.0.0.mssql.sql | 1 -
.../sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql | 3 --
.../main/sql/mysql/hive-schema-3.0.0.mysql.sql | 3 +-
.../sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql | 5 +---
.../sql/oracle/hive-schema-3.0.0.oracle.sql | 3 +-
.../oracle/upgrade-2.3.0-to-3.0.0.oracle.sql | 5 +---
.../sql/postgres/hive-schema-3.0.0.postgres.sql | 3 +-
.../upgrade-2.3.0-to-3.0.0.postgres.sql | 3 --
13 files changed, 10 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/ql/src/test/org/apache/hadoop/hive/metastore/txn/TestTxnHandler.java
----------------------------------------------------------------------
diff --git a/ql/src/test/org/apache/hadoop/hive/metastore/txn/TestTxnHandler.java b/ql/src/test/org/apache/hadoop/hive/metastore/txn/TestTxnHandler.java
index 9294c2b..372c709 100644
--- a/ql/src/test/org/apache/hadoop/hive/metastore/txn/TestTxnHandler.java
+++ b/ql/src/test/org/apache/hadoop/hive/metastore/txn/TestTxnHandler.java
@@ -1169,37 +1169,8 @@ public class TestTxnHandler {
} finally {
txnHandler.setTimeout(timeout);
}
- }
- @Test
- public void testReplTimeouts() throws Exception {
- long timeout = txnHandler.setTimeout(1);
- try {
- OpenTxnRequest request = new OpenTxnRequest(3, "me", "localhost");
- OpenTxnsResponse response = txnHandler.openTxns(request);
- request.setReplPolicy("default.*");
- request.setReplSrcTxnIds(response.getTxn_ids());
- OpenTxnsResponse responseRepl = txnHandler.openTxns(request);
- Thread.sleep(10);
- txnHandler.performTimeOuts();
- GetOpenTxnsInfoResponse rsp = txnHandler.getOpenTxnsInfo();
- int numAborted = 0;
- int numOpen = 0;
- for (TxnInfo txnInfo : rsp.getOpen_txns()) {
- if (TxnState.ABORTED == txnInfo.getState()) {
- assertTrue(response.getTxn_ids().contains(txnInfo.getId()));
- numAborted++;
- }
- if (TxnState.OPEN == txnInfo.getState()) {
- assertTrue(responseRepl.getTxn_ids().contains(txnInfo.getId()));
- numOpen++;
- }
- }
- assertEquals(3, numAborted);
- assertEquals(3, numOpen);
- } finally {
- txnHandler.setTimeout(timeout);
- }
+
}
@Test
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java
index 7b58cbe..4597166 100644
--- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java
+++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnDbUtil.java
@@ -79,7 +79,6 @@ public final class TxnDbUtil {
" TXN_STARTED bigint NOT NULL," +
" TXN_LAST_HEARTBEAT bigint NOT NULL," +
" TXN_USER varchar(128) NOT NULL," +
- " TXN_TYPE integer," +
" TXN_HOST varchar(128) NOT NULL)");
stmt.execute("CREATE TABLE TXN_COMPONENTS (" +
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
index 565fb89..d1b0d32 100644
--- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
+++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.java
@@ -209,19 +209,6 @@ abstract class TxnHandler implements TxnStore, TxnStore.MutexAPI {
//todo: make these like OperationType and remove above char constatns
enum TxnStatus {OPEN, ABORTED, COMMITTED, UNKNOWN}
- public enum TxnType {
- DEFAULT(0), REPL_CREATED(1), READ_ONLY(2);
-
- private final int value;
- TxnType(int value) {
- this.value = value;
- }
-
- public int getValue() {
- return value;
- }
- }
-
// Lock states
static final protected char LOCK_ACQUIRED = 'a';
static final protected char LOCK_WAITING = 'w';
@@ -615,7 +602,6 @@ abstract class TxnHandler implements TxnStore, TxnStore.MutexAPI {
throws SQLException, MetaException {
int numTxns = rqst.getNum_txns();
ResultSet rs = null;
- TxnType txnType = TxnType.DEFAULT;
try {
if (rqst.isSetReplPolicy()) {
List<Long> targetTxnIdList = getTargetTxnIdList(rqst.getReplPolicy(), rqst.getReplSrcTxnIds(), stmt);
@@ -629,7 +615,6 @@ abstract class TxnHandler implements TxnStore, TxnStore.MutexAPI {
rqst.getReplPolicy() + " and Source transaction id : " + rqst.getReplSrcTxnIds().toString());
return targetTxnIdList;
}
- txnType = TxnType.REPL_CREATED;
}
String s = sqlGenerator.addForUpdateClause("select ntxn_next from NEXT_TXN_ID");
@@ -651,10 +636,10 @@ abstract class TxnHandler implements TxnStore, TxnStore.MutexAPI {
for (long i = first; i < first + numTxns; i++) {
txnIds.add(i);
rows.add(i + "," + quoteChar(TXN_OPEN) + "," + now + "," + now + ","
- + quoteString(rqst.getUser()) + "," + quoteString(rqst.getHostname()) + "," + txnType.getValue());
+ + quoteString(rqst.getUser()) + "," + quoteString(rqst.getHostname()));
}
List<String> queries = sqlGenerator.createInsertValuesStmt(
- "TXNS (txn_id, txn_state, txn_started, txn_last_heartbeat, txn_user, txn_host, txn_type)", rows);
+ "TXNS (txn_id, txn_state, txn_started, txn_last_heartbeat, txn_user, txn_host)", rows);
for (String q : queries) {
LOG.debug("Going to execute update <" + q + ">");
stmt.execute(q);
@@ -4239,7 +4224,7 @@ abstract class TxnHandler implements TxnStore, TxnStore.MutexAPI {
while(true) {
stmt = dbConn.createStatement();
String s = " txn_id from TXNS where txn_state = '" + TXN_OPEN +
- "' and txn_last_heartbeat < " + (now - timeout) + " and txn_type != " + TxnType.REPL_CREATED.getValue();
+ "' and txn_last_heartbeat < " + (now - timeout);
//safety valve for extreme cases
s = sqlGenerator.addLimitClause(10 * TIMED_OUT_TXN_ABORT_BATCH_SIZE, s);
LOG.debug("Going to execute query <" + s + ">");
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/sql/derby/hive-schema-3.0.0.derby.sql
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/sql/derby/hive-schema-3.0.0.derby.sql b/standalone-metastore/src/main/sql/derby/hive-schema-3.0.0.derby.sql
index 158e51e..e818e1b 100644
--- a/standalone-metastore/src/main/sql/derby/hive-schema-3.0.0.derby.sql
+++ b/standalone-metastore/src/main/sql/derby/hive-schema-3.0.0.derby.sql
@@ -503,8 +503,7 @@ CREATE TABLE TXNS (
TXN_HOST varchar(128) NOT NULL,
TXN_AGENT_INFO varchar(128),
TXN_META_INFO varchar(128),
- TXN_HEARTBEAT_COUNT integer,
- TXN_TYPE integer
+ TXN_HEARTBEAT_COUNT integer
);
CREATE TABLE TXN_COMPONENTS (
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql b/standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql
index ff44d44..7b7a8a2 100644
--- a/standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql
+++ b/standalone-metastore/src/main/sql/derby/upgrade-2.3.0-to-3.0.0.derby.sql
@@ -279,9 +279,6 @@ INSERT INTO TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_TXNID, T2W_WRITEID)
UPDATE TXN_COMPONENTS SET TC_WRITEID = TC_TXNID;
UPDATE COMPLETED_TXN_COMPONENTS SET CTC_WRITEID = CTC_TXNID;
--- HIVE-19340
-ALTER TABLE TXNS ADD COLUMN TXN_TYPE integer;
-
-- This needs to be the last thing done. Insert any changes above this line.
UPDATE "APP".VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1;
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql b/standalone-metastore/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql
index 926f305..c88fb18 100644
--- a/standalone-metastore/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql
+++ b/standalone-metastore/src/main/sql/mssql/hive-schema-3.0.0.mssql.sql
@@ -1084,7 +1084,6 @@ CREATE TABLE TXNS(
TXN_AGENT_INFO nvarchar(128) NULL,
TXN_META_INFO nvarchar(128) NULL,
TXN_HEARTBEAT_COUNT int NULL,
- TXN_TYPE int NULL,
PRIMARY KEY CLUSTERED
(
TXN_ID ASC
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql b/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql
index 12ecc7b..14c3deb 100644
--- a/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql
+++ b/standalone-metastore/src/main/sql/mssql/upgrade-2.3.0-to-3.0.0.mssql.sql
@@ -346,9 +346,6 @@ INSERT INTO TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_TXNID, T2W_WRITEID)
UPDATE TXN_COMPONENTS SET TC_WRITEID = TC_TXNID;
UPDATE COMPLETED_TXN_COMPONENTS SET CTC_WRITEID = CTC_TXNID;
--- HIVE-19340
-ALTER TABLE TXNS ADD TXN_TYPE int;
-
-- These lines need to be last. Insert any changes above.
UPDATE VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0' AS MESSAGE;
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql b/standalone-metastore/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql
index 7f74d61..c54df55 100644
--- a/standalone-metastore/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql
+++ b/standalone-metastore/src/main/sql/mysql/hive-schema-3.0.0.mysql.sql
@@ -977,8 +977,7 @@ CREATE TABLE TXNS (
TXN_HOST varchar(128) NOT NULL,
TXN_AGENT_INFO varchar(128),
TXN_META_INFO varchar(128),
- TXN_HEARTBEAT_COUNT int,
- TXN_TYPE int
+ TXN_HEARTBEAT_COUNT int
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE TXN_COMPONENTS (
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql b/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql
index b556f5c..9b87563 100644
--- a/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql
+++ b/standalone-metastore/src/main/sql/mysql/upgrade-2.3.0-to-3.0.0.mysql.sql
@@ -319,11 +319,8 @@ UPDATE COMPLETED_TXN_COMPONENTS SET CTC_WRITEID = CTC_TXNID;
ALTER TABLE TXN_COMPONENTS MODIFY COLUMN TC_TABLE varchar(128) NULL;
--- HIVE-19340
-ALTER TABLE TXNS ADD COLUMN TXN_TYPE int;
-
-- These lines need to be last. Insert any changes above.
UPDATE VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0' AS ' ';
-ALTER TABLE `TBLS` ADD COLUMN `OWNER_TYPE` VARCHAR(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL;
+ALTER TABLE `TBLS` ADD COLUMN `OWNER_TYPE` VARCHAR(10) CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql b/standalone-metastore/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql
index e5acd2d..63cc1f7 100644
--- a/standalone-metastore/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql
+++ b/standalone-metastore/src/main/sql/oracle/hive-schema-3.0.0.oracle.sql
@@ -954,8 +954,7 @@ CREATE TABLE TXNS (
TXN_HOST varchar(128) NOT NULL,
TXN_AGENT_INFO varchar2(128),
TXN_META_INFO varchar2(128),
- TXN_HEARTBEAT_COUNT number(10),
- TXN_TYPE number(10)
+ TXN_HEARTBEAT_COUNT number(10)
) ROWDEPENDENCIES;
CREATE TABLE TXN_COMPONENTS (
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql b/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql
index 64cb741..ce3437f 100644
--- a/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql
+++ b/standalone-metastore/src/main/sql/oracle/upgrade-2.3.0-to-3.0.0.oracle.sql
@@ -335,11 +335,8 @@ INSERT INTO TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_TXNID, T2W_WRITEID)
UPDATE TXN_COMPONENTS SET TC_WRITEID = TC_TXNID;
UPDATE COMPLETED_TXN_COMPONENTS SET CTC_WRITEID = CTC_TXNID;
--- HIVE-19340
-ALTER TABLE TXNS ADD TXN_TYPE NUMBER(10);
-
-- These lines need to be last. Insert any changes above.
UPDATE VERSION SET SCHEMA_VERSION='3.0.0', VERSION_COMMENT='Hive release version 3.0.0' where VER_ID=1;
SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0' AS Status from dual;
-ALTER TABLE TBLS ADD OWNER_TYPE VARCHAR2(10) NULL;
+ALTER TABLE TBLS ADD OWNER_TYPE VARCHAR2(10) NULL;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql b/standalone-metastore/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql
index 2c94f37..d210a55 100644
--- a/standalone-metastore/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql
+++ b/standalone-metastore/src/main/sql/postgres/hive-schema-3.0.0.postgres.sql
@@ -1641,8 +1641,7 @@ CREATE TABLE TXNS (
TXN_HOST varchar(128) NOT NULL,
TXN_AGENT_INFO varchar(128),
TXN_META_INFO varchar(128),
- TXN_HEARTBEAT_COUNT integer,
- TXN_TYPE integer
+ TXN_HEARTBEAT_COUNT integer
);
CREATE TABLE TXN_COMPONENTS (
http://git-wip-us.apache.org/repos/asf/hive/blob/77ffe96d/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql b/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql
index e53db10..f2571d8 100644
--- a/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql
+++ b/standalone-metastore/src/main/sql/postgres/upgrade-2.3.0-to-3.0.0.postgres.sql
@@ -354,9 +354,6 @@ INSERT INTO TXN_TO_WRITE_ID (T2W_DATABASE, T2W_TABLE, T2W_TXNID, T2W_WRITEID)
UPDATE TXN_COMPONENTS SET TC_WRITEID = TC_TXNID;
UPDATE COMPLETED_TXN_COMPONENTS SET CTC_WRITEID = CTC_TXNID;
--- HIVE-19340
-ALTER TABLE TXNS ADD COLUMN TXN_TYPE integer;
-
-- These lines need to be last. Insert any changes above.
UPDATE "VERSION" SET "SCHEMA_VERSION"='3.0.0', "VERSION_COMMENT"='Hive release version 3.0.0' where "VER_ID"=1;
SELECT 'Finished upgrading MetaStore schema from 2.3.0 to 3.0.0';