You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2016/08/16 23:40:31 UTC
hbase git commit: HBASE-16420 Fix source incompatibility of Table
interface (Phil Yang)
Repository: hbase
Updated Branches:
refs/heads/branch-1.2 470667420 -> 45beeec0f
HBASE-16420 Fix source incompatibility of Table interface (Phil Yang)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/45beeec0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/45beeec0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/45beeec0
Branch: refs/heads/branch-1.2
Commit: 45beeec0fbfe99bf41d166f00973d0c5efd025c9
Parents: 4706674
Author: stack <st...@apache.org>
Authored: Tue Aug 16 16:40:23 2016 -0700
Committer: stack <st...@apache.org>
Committed: Tue Aug 16 16:40:23 2016 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/client/HTable.java | 4 +--
.../apache/hadoop/hbase/client/HTablePool.java | 15 ---------
.../org/apache/hadoop/hbase/client/Table.java | 34 --------------------
.../hadoop/hbase/rest/client/RemoteHTable.java | 15 ---------
.../hadoop/hbase/client/HTableWrapper.java | 15 ---------
5 files changed, 2 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/45beeec0/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
----------------------------------------------------------------------
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 a61375c..c1890b3 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;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/45beeec0/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTablePool.java
----------------------------------------------------------------------
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 2d18367..5e5eeda 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
@@ -670,20 +670,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();
- }
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/45beeec0/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Table.java
----------------------------------------------------------------------
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();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/45beeec0/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/client/RemoteHTable.java
----------------------------------------------------------------------
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();
- }
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/45beeec0/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HTableWrapper.java
----------------------------------------------------------------------
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();
- }
}