Repository: hbase Updated Branches: refs/heads/branch-1 2c280c718 -> 94c4d568b
HBASE-15609 Remove PB references from Result, DoubleColumnInterpreter and any such public facing class for 2.0 (Ram) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/94c4d568 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/94c4d568 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/94c4d568 Branch: refs/heads/branch-1 Commit: 94c4d568b54e5b9faf3fa6b9db4107c8ecb08291 Parents: 2c280c7 Author: Ramkrishna <ramkrishna.s.vasude...@intel.com> Authored: Mon May 9 14:57:39 2016 +0530 Committer: Ramkrishna <ramkrishna.s.vasude...@intel.com> Committed: Mon May 9 14:57:39 2016 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/ClusterStatus.java | 2 ++ .../src/main/java/org/apache/hadoop/hbase/client/Result.java | 2 ++ .../hbase/client/coprocessor/BigDecimalColumnInterpreter.java | 5 ++++- .../hbase/client/coprocessor/DoubleColumnInterpreter.java | 3 ++- .../hadoop/hbase/client/coprocessor/LongColumnInterpreter.java | 5 ++++- .../src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java | 3 +++ 6 files changed, 17 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/94c4d568/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java index c8caa96..f1e2d56 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java @@ -366,6 +366,7 @@ public class ClusterStatus extends VersionedWritable { * * @return the protobuf ClusterStatus */ + @Deprecated public ClusterStatusProtos.ClusterStatus convert() { ClusterStatusProtos.ClusterStatus.Builder builder = ClusterStatusProtos.ClusterStatus.newBuilder(); @@ -432,6 +433,7 @@ public class ClusterStatus extends VersionedWritable { * @param proto the protobuf ClusterStatus * @return the converted ClusterStatus */ + @Deprecated public static ClusterStatus convert(ClusterStatusProtos.ClusterStatus proto) { Map<ServerName, ServerLoad> servers = null; http://git-wip-us.apache.org/repos/asf/hbase/blob/94c4d568/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java index e764c4e..3e645b0 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Result.java @@ -1001,6 +1001,7 @@ public class Result implements CellScannable, CellScanner { * @param loadStats statistics about the current region from which this was returned */ @InterfaceAudience.Private + @Deprecated public void setStatistics(ClientProtos.RegionLoadStats loadStats) { this.stats = loadStats; } @@ -1009,6 +1010,7 @@ public class Result implements CellScannable, CellScanner { * @return the associated statistics about the region from which this was returned. Can be * <tt>null</tt> if stats are disabled. */ + @Deprecated public ClientProtos.RegionLoadStats getStats() { return stats; } http://git-wip-us.apache.org/repos/asf/hbase/blob/94c4d568/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java index d693f0c..d2e609e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/BigDecimalColumnInterpreter.java @@ -24,8 +24,10 @@ import java.math.RoundingMode; import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.coprocessor.ColumnInterpreter; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BigDecimalMsg; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg; @@ -36,7 +38,8 @@ import org.apache.hadoop.hbase.util.Bytes; * is required at the RegionServer also. * */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) +@InterfaceStability.Evolving public class BigDecimalColumnInterpreter extends ColumnInterpreter<BigDecimal, BigDecimal, EmptyMsg, BigDecimalMsg, BigDecimalMsg> { http://git-wip-us.apache.org/repos/asf/hbase/blob/94c4d568/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java index 6db94d2..ce34c78 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/DoubleColumnInterpreter.java @@ -23,6 +23,7 @@ import java.io.IOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.coprocessor.ColumnInterpreter; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.DoubleMsg; @@ -36,7 +37,7 @@ import org.apache.hadoop.hbase.util.Bytes; * TestDoubleColumnInterpreter methods for its sample usage. * Its methods handle null arguments gracefully. */ -@InterfaceAudience.Public +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) @InterfaceStability.Evolving public class DoubleColumnInterpreter extends ColumnInterpreter<Double, Double, EmptyMsg, DoubleMsg, DoubleMsg>{ http://git-wip-us.apache.org/repos/asf/hbase/blob/94c4d568/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java index e63fd3b..3ea3802 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/LongColumnInterpreter.java @@ -21,7 +21,9 @@ package org.apache.hadoop.hbase.client.coprocessor; import java.io.IOException; import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.coprocessor.ColumnInterpreter; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.LongMsg; @@ -35,7 +37,8 @@ import org.apache.hadoop.hbase.util.Bytes; * TestAggregateProtocol methods for its sample usage. * Its methods handle null arguments gracefully. */ -@InterfaceAudience.Private +@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.COPROC) +@InterfaceStability.Evolving public class LongColumnInterpreter extends ColumnInterpreter<Long, Long, EmptyMsg, LongMsg, LongMsg> { http://git-wip-us.apache.org/repos/asf/hbase/blob/94c4d568/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java index bcbe41f..939002c 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ProcedureInfo.java @@ -162,6 +162,7 @@ public class ProcedureInfo implements Cloneable { } @InterfaceAudience.Private + @Deprecated public ForeignExceptionMessage getForeignExceptionMessage() { return exception; } @@ -221,6 +222,7 @@ public class ProcedureInfo implements Cloneable { * instance. */ @InterfaceAudience.Private + @Deprecated public static ProcedureProtos.Procedure convertToProcedureProto( final ProcedureInfo procInfo) { ProcedureProtos.Procedure.Builder builder = ProcedureProtos.Procedure.newBuilder(); @@ -256,6 +258,7 @@ public class ProcedureInfo implements Cloneable { * instance. */ @InterfaceAudience.Private + @Deprecated public static ProcedureInfo convert(final ProcedureProtos.Procedure procProto) { NonceKey nonceKey = null; if (procProto.getNonce() != HConstants.NO_NONCE) {
