diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java index c5ead39..900ae2e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java @@ -1777,11 +1777,11 @@ public class HTable implements HTableInterface, RegionLocator { return operationTimeout; } - @Override public void setRpcTimeout(int rpcTimeout) { + public void setRpcTimeout(int rpcTimeout) { this.rpcTimeout = rpcTimeout; } - @Override public int getRpcTimeout() { + public int getRpcTimeout() { return rpcTimeout; } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java index d837bf8..d193d65 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java @@ -673,20 +673,5 @@ public class HTablePool implements Closeable { return table.checkAndMutate(row, family, qualifier, compareOp, value, mutation); } - @Override public void setOperationTimeout(int operationTimeout) { - table.setOperationTimeout(operationTimeout); - } - - @Override public int getOperationTimeout() { - return table.getOperationTimeout(); - } - - @Override public void setRpcTimeout(int rpcTimeout) { - table.setRpcTimeout(rpcTimeout); - } - - @Override public int getRpcTimeout() { - return table.getRpcTimeout(); - } } } diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java index ee742b2..7ed89fb 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java @@ -596,38 +596,4 @@ public interface Table extends Closeable { boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier, CompareFilter.CompareOp compareOp, byte[] value, RowMutations mutation) throws IOException; - /** - * Set timeout (millisecond) of each operation in this Table instance, will override the value - * of hbase.client.operation.timeout in configuration. - * Operation timeout is a top-level restriction that makes sure a blocking method will not be - * blocked more than this. In each operation, if rpc request fails because of timeout or - * other reason, it will retry until success or throw a RetriesExhaustedException. But if the - * total time being blocking reach the operation timeout before retries exhausted, it will break - * early and throw SocketTimeoutException. - * @param operationTimeout the total timeout of each operation in millisecond. - */ - @InterfaceAudience.Private - public void setOperationTimeout(int operationTimeout); - - /** - * Get timeout (millisecond) of each operation for in Table instance. - */ - @InterfaceAudience.Private - public int getOperationTimeout(); - - /** - * Set timeout (millisecond) of each rpc request in operations of this Table instance, will - * override the value of hbase.rpc.timeout in configuration. - * If a rpc request waiting too long, it will stop waiting and send a new request to retry until - * retries exhausted or operation timeout reached. - * @param rpcTimeout the timeout of each rpc request in millisecond. - */ - @InterfaceAudience.Private - public void setRpcTimeout(int rpcTimeout); - - /** - * Get timeout (millisecond) of each rpc request in this Table instance. - */ - @InterfaceAudience.Private - public int getRpcTimeout(); } diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java index 8fa1b8a..8c5c168 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java @@ -858,19 +858,4 @@ public class RemoteHTable implements Table { throw new UnsupportedOperationException("checkAndMutate not implemented"); } - @Override public void setOperationTimeout(int operationTimeout) { - throw new UnsupportedOperationException(); - } - - @Override public int getOperationTimeout() { - throw new UnsupportedOperationException(); - } - - @Override public void setRpcTimeout(int rpcTimeout) { - throw new UnsupportedOperationException(); - } - - @Override public int getRpcTimeout() { - throw new UnsupportedOperationException(); - } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HTableWrapper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HTableWrapper.java index 2d25f63..9cb0979 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HTableWrapper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HTableWrapper.java @@ -366,19 +366,4 @@ public class HTableWrapper implements HTableInterface { return table.checkAndMutate(row, family, qualifier, compareOp, value, rm); } - @Override public void setOperationTimeout(int operationTimeout) { - table.setOperationTimeout(operationTimeout); - } - - @Override public int getOperationTimeout() { - return table.getOperationTimeout(); - } - - @Override public void setRpcTimeout(int rpcTimeout) { - table.setRpcTimeout(rpcTimeout); - } - - @Override public int getRpcTimeout() { - return table.getRpcTimeout(); - } }