hbase git commit: HBASE-19351 Deprecated is missing in Table implementations

2017-11-28 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/branch-2 8b6f305ac -> 12efae482


HBASE-19351 Deprecated is missing in Table implementations

Signed-off-by: Michael Stack 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/12efae48
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/12efae48
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/12efae48

Branch: refs/heads/branch-2
Commit: 12efae4829830f920c5a7d47ea00f8f3c9c7c342
Parents: 8b6f305
Author: Peter Somogyi 
Authored: Mon Nov 27 17:09:56 2017 +0100
Committer: Michael Stack 
Committed: Tue Nov 28 11:18:07 2017 -0800

--
 .../java/org/apache/hadoop/hbase/client/HTable.java  |  8 ++--
 .../hadoop/hbase/rest/client/RemoteHTable.java   | 15 ---
 .../hadoop/hbase/regionserver/RegionAsTable.java |  7 +++
 .../TestRegionServerReadRequestMetrics.java  |  5 +++--
 4 files changed, 28 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/12efae48/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 61d955f..6030f86 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
@@ -233,6 +233,7 @@ public class HTable implements Table {
* {@inheritDoc}
*/
   @Override
+  @Deprecated
   public HTableDescriptor getTableDescriptor() throws IOException {
 HTableDescriptor htd = HBaseAdmin.getHTableDescriptor(tableName, 
connection, rpcCallerFactory,
   rpcControllerFactory, operationTimeoutMs, readRpcTimeoutMs);
@@ -745,7 +746,7 @@ public class HTable implements Table {
   final byte [] family, final byte [] qualifier, final byte [] value,
   final Put put)
   throws IOException {
-return checkAndPut(row, family, qualifier, CompareOp.EQUAL, value, put);
+return checkAndPut(row, family, qualifier, CompareOperator.EQUAL, value, 
put);
   }
 
   private boolean doCheckAndPut(final byte [] row, final byte [] family,
@@ -773,6 +774,7 @@ public class HTable implements Table {
* {@inheritDoc}
*/
   @Override
+  @Deprecated
   public boolean checkAndPut(final byte [] row, final byte [] family,
   final byte [] qualifier, final CompareOp compareOp, final byte [] value,
   final Put put)
@@ -799,7 +801,7 @@ public class HTable implements Table {
   @Override
   public boolean checkAndDelete(final byte [] row, final byte [] family, final 
byte [] qualifier,
   final byte [] value, final Delete delete) throws IOException {
-return checkAndDelete(row, family, qualifier, CompareOp.EQUAL, value, 
delete);
+return checkAndDelete(row, family, qualifier, CompareOperator.EQUAL, 
value, delete);
   }
 
   private boolean doCheckAndDelete(final byte [] row, final byte [] family,
@@ -845,6 +847,7 @@ public class HTable implements Table {
* {@inheritDoc}
*/
   @Override
+  @Deprecated
   public boolean checkAndDelete(final byte [] row, final byte [] family,
   final byte [] qualifier, final CompareOp compareOp, final byte [] value,
   final Delete delete)
@@ -919,6 +922,7 @@ public class HTable implements Table {
* {@inheritDoc}
*/
   @Override
+  @Deprecated
   public boolean checkAndMutate(final byte [] row, final byte [] family, final 
byte [] qualifier,
 final CompareOp compareOp, final byte [] value, final RowMutations rm)
   throws IOException {

http://git-wip-us.apache.org/repos/asf/hbase/blob/12efae48/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 1eaaa65..39eb0a9 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
@@ -251,6 +251,7 @@ public class RemoteHTable implements Table {
   }
 
   @Override
+  @Deprecated
   public HTableDescriptor getTableDescriptor() throws IOException {
 StringBuilder sb = new StringBuilder();
 sb.append('/');
@@ -702,6 +703,7 @@ public class RemoteHTable implements Table {
   }
 
   @Override
+  @Deprecated
   public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier,
   CompareOp compareOp, byte[] value, Put put) throws IOException {
 throw new IOException("checkAndPut for non-equal comparison not 
implemented");

hbase git commit: HBASE-19351 Deprecated is missing in Table implementations

2017-11-28 Thread stack 
Repository: hbase
Updated Branches:
  refs/heads/master b75510284 -> b5a01685f


HBASE-19351 Deprecated is missing in Table implementations

Signed-off-by: Michael Stack 


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b5a01685
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b5a01685
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b5a01685

Branch: refs/heads/master
Commit: b5a01685f4aff0d97ec53a6eca26bd37dd9d9037
Parents: b755102
Author: Peter Somogyi 
Authored: Mon Nov 27 17:09:56 2017 +0100
Committer: Michael Stack 
Committed: Tue Nov 28 11:17:35 2017 -0800

--
 .../java/org/apache/hadoop/hbase/client/HTable.java  |  8 ++--
 .../hadoop/hbase/rest/client/RemoteHTable.java   | 15 ---
 .../hadoop/hbase/regionserver/RegionAsTable.java |  7 +++
 .../TestRegionServerReadRequestMetrics.java  |  5 +++--
 4 files changed, 28 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b5a01685/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 61d955f..6030f86 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
@@ -233,6 +233,7 @@ public class HTable implements Table {
* {@inheritDoc}
*/
   @Override
+  @Deprecated
   public HTableDescriptor getTableDescriptor() throws IOException {
 HTableDescriptor htd = HBaseAdmin.getHTableDescriptor(tableName, 
connection, rpcCallerFactory,
   rpcControllerFactory, operationTimeoutMs, readRpcTimeoutMs);
@@ -745,7 +746,7 @@ public class HTable implements Table {
   final byte [] family, final byte [] qualifier, final byte [] value,
   final Put put)
   throws IOException {
-return checkAndPut(row, family, qualifier, CompareOp.EQUAL, value, put);
+return checkAndPut(row, family, qualifier, CompareOperator.EQUAL, value, 
put);
   }
 
   private boolean doCheckAndPut(final byte [] row, final byte [] family,
@@ -773,6 +774,7 @@ public class HTable implements Table {
* {@inheritDoc}
*/
   @Override
+  @Deprecated
   public boolean checkAndPut(final byte [] row, final byte [] family,
   final byte [] qualifier, final CompareOp compareOp, final byte [] value,
   final Put put)
@@ -799,7 +801,7 @@ public class HTable implements Table {
   @Override
   public boolean checkAndDelete(final byte [] row, final byte [] family, final 
byte [] qualifier,
   final byte [] value, final Delete delete) throws IOException {
-return checkAndDelete(row, family, qualifier, CompareOp.EQUAL, value, 
delete);
+return checkAndDelete(row, family, qualifier, CompareOperator.EQUAL, 
value, delete);
   }
 
   private boolean doCheckAndDelete(final byte [] row, final byte [] family,
@@ -845,6 +847,7 @@ public class HTable implements Table {
* {@inheritDoc}
*/
   @Override
+  @Deprecated
   public boolean checkAndDelete(final byte [] row, final byte [] family,
   final byte [] qualifier, final CompareOp compareOp, final byte [] value,
   final Delete delete)
@@ -919,6 +922,7 @@ public class HTable implements Table {
* {@inheritDoc}
*/
   @Override
+  @Deprecated
   public boolean checkAndMutate(final byte [] row, final byte [] family, final 
byte [] qualifier,
 final CompareOp compareOp, final byte [] value, final RowMutations rm)
   throws IOException {

http://git-wip-us.apache.org/repos/asf/hbase/blob/b5a01685/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 1eaaa65..39eb0a9 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
@@ -251,6 +251,7 @@ public class RemoteHTable implements Table {
   }
 
   @Override
+  @Deprecated
   public HTableDescriptor getTableDescriptor() throws IOException {
 StringBuilder sb = new StringBuilder();
 sb.append('/');
@@ -702,6 +703,7 @@ public class RemoteHTable implements Table {
   }
 
   @Override
+  @Deprecated
   public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier,
   CompareOp compareOp, byte[] value, Put put) throws IOException {
 throw new IOException("checkAndPut for non-equal comparison not 
implemented");
@@