[39/50] [abbrv] hbase git commit: HBASE-15609 Remove PB references from Result, DoubleColumnInterpreter and any such public facing class for 2.0 (Ram)

2016-05-10 Thread syuanjiang 
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/97ad33c6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/97ad33c6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/97ad33c6

Branch: refs/heads/hbase-12439
Commit: 97ad33c6918dc39811fc86d82b38e43e60361bf5
Parents: 5e0
Author: Ramkrishna 
Authored: Mon May 9 14:56:00 2016 +0530
Committer: Ramkrishna 
Committed: Mon May 9 14:56:00 2016 +0530

--
 .../java/org/apache/hadoop/hbase/ClusterId.java |   4 +-
 .../org/apache/hadoop/hbase/ClusterStatus.java  | 113 
 .../hadoop/hbase/client/AsyncProcess.java   |   6 +-
 .../hbase/client/ClusterStatusListener.java |   3 +-
 .../apache/hadoop/hbase/client/HBaseAdmin.java  |   5 +-
 .../hadoop/hbase/client/MetricsConnection.java  |   7 +-
 .../hadoop/hbase/client/RegionLoadStats.java|  50 
 .../org/apache/hadoop/hbase/client/Result.java  |  20 +--
 .../hadoop/hbase/client/ResultStatsUtil.java|   5 +-
 .../hbase/client/ServerStatisticTracker.java|   3 +-
 .../hadoop/hbase/client/StatisticTrackable.java |   4 +-
 .../hbase/client/backoff/ServerStatistics.java  |   6 +-
 .../BigDecimalColumnInterpreter.java|   5 +-
 .../coprocessor/DoubleColumnInterpreter.java|   3 +-
 .../coprocessor/LongColumnInterpreter.java  |   5 +-
 .../hbase/coprocessor/ColumnInterpreter.java|   5 +-
 .../hadoop/hbase/protobuf/ProtobufUtil.java | 128 +++
 .../client/TestClientExponentialBackoff.java|   5 +-
 .../org/apache/hadoop/hbase/ProcedureInfo.java  |  76 +--
 .../org/apache/hadoop/hbase/ProcedureState.java |  30 +
 .../org/apache/hadoop/hbase/ProcedureUtil.java  | 103 +++
 .../hadoop/hbase/procedure2/Procedure.java  |  21 ++-
 .../store/wal/ProcedureWALFormatReader.java |   3 +-
 .../procedure2/ProcedureTestingUtility.java |  12 +-
 .../hadoop/hbase/master/MasterRpcServices.java  |   7 +-
 .../master/procedure/ProcedureSyncWait.java |   2 +-
 .../apache/hadoop/hbase/client/TestResult.java  |   3 +-
 .../master/procedure/TestProcedureAdmin.java|   2 +-
 28 files changed, 385 insertions(+), 251 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/97ad33c6/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java
--
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java
index 6a3b14f..c127627 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java
@@ -81,7 +81,7 @@ public class ClusterId {
   /**
* @return A pb instance to represent this instance.
*/
-  ClusterIdProtos.ClusterId convert() {
+  public ClusterIdProtos.ClusterId convert() {
 ClusterIdProtos.ClusterId.Builder builder = 
ClusterIdProtos.ClusterId.newBuilder();
 return builder.setClusterId(this.id).build();
   }
@@ -90,7 +90,7 @@ public class ClusterId {
* @param cid
* @return A {@link ClusterId} made from the passed in cid
*/
-  static ClusterId convert(final ClusterIdProtos.ClusterId cid) {
+  public static ClusterId convert(final ClusterIdProtos.ClusterId cid) {
 return new ClusterId(cid.getClusterId());
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/97ad33c6/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 4b73dda..bc97a95 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
@@ -346,117 +346,4 @@ public class ClusterStatus extends VersionedWritable {
 }
 return sb.toString();
   }
-
-  /**
-* Convert a ClusterStatus to a protobuf ClusterStatus
-*
-* @return the protobuf ClusterStatus
-*/
-  public ClusterStatusProtos.ClusterStatus convert() {
-ClusterStatusProtos.ClusterStatus.Builder builder =
-ClusterStatusProtos.ClusterStatus.newBuilder();
-
builder.setHbaseVersion(HBaseVersionFileContent.newBuilder().setVersion(getHBaseVersion()));
-
-if (liveServers != null){
-  for (Map.Entry entry : liveServers.entrySet()) {
-LiveServerInfo.Builder lsi =
-  
LiveServerInfo.newBuilder().setServer(ProtobufUtil.toServerName(entry.getKey()));
-lsi.setServerLoad(entry.getValue().obtainS

hbase git commit: HBASE-15609 Remove PB references from Result, DoubleColumnInterpreter and any such public facing class for 2.0 (Ram)

2016-05-09 Thread ramkrishna 
Repository: hbase
Updated Branches:
  refs/heads/branch-1.3 b4573c803 -> fdf117ec6


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/fdf117ec
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fdf117ec
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fdf117ec

Branch: refs/heads/branch-1.3
Commit: fdf117ec69440e75d703d1091f7a3718747e4f64
Parents: b4573c8
Author: Ramkrishna 
Authored: Mon May 9 14:58:31 2016 +0530
Committer: Ramkrishna 
Committed: Mon May 9 14:58:31 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/fdf117ec/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 servers = null;

http://git-wip-us.apache.org/repos/asf/hbase/blob/fdf117ec/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
* null if stats are disabled.
*/
+  @Deprecated
   public ClientProtos.RegionLoadStats getStats() {
 return stats;
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/fdf117ec/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.By

hbase git commit: HBASE-15609 Remove PB references from Result, DoubleColumnInterpreter and any such public facing class for 2.0 (Ram)

2016-05-09 Thread ramkrishna 
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 
Authored: Mon May 9 14:57:39 2016 +0530
Committer: Ramkrishna 
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 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
* null 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;

hbase git commit: HBASE-15609 Remove PB references from Result, DoubleColumnInterpreter and any such public facing class for 2.0 (Ram)

2016-05-09 Thread ramkrishna 
Repository: hbase
Updated Branches:
  refs/heads/master 5e091 -> 97ad33c69


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/97ad33c6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/97ad33c6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/97ad33c6

Branch: refs/heads/master
Commit: 97ad33c6918dc39811fc86d82b38e43e60361bf5
Parents: 5e0
Author: Ramkrishna 
Authored: Mon May 9 14:56:00 2016 +0530
Committer: Ramkrishna 
Committed: Mon May 9 14:56:00 2016 +0530

--
 .../java/org/apache/hadoop/hbase/ClusterId.java |   4 +-
 .../org/apache/hadoop/hbase/ClusterStatus.java  | 113 
 .../hadoop/hbase/client/AsyncProcess.java   |   6 +-
 .../hbase/client/ClusterStatusListener.java |   3 +-
 .../apache/hadoop/hbase/client/HBaseAdmin.java  |   5 +-
 .../hadoop/hbase/client/MetricsConnection.java  |   7 +-
 .../hadoop/hbase/client/RegionLoadStats.java|  50 
 .../org/apache/hadoop/hbase/client/Result.java  |  20 +--
 .../hadoop/hbase/client/ResultStatsUtil.java|   5 +-
 .../hbase/client/ServerStatisticTracker.java|   3 +-
 .../hadoop/hbase/client/StatisticTrackable.java |   4 +-
 .../hbase/client/backoff/ServerStatistics.java  |   6 +-
 .../BigDecimalColumnInterpreter.java|   5 +-
 .../coprocessor/DoubleColumnInterpreter.java|   3 +-
 .../coprocessor/LongColumnInterpreter.java  |   5 +-
 .../hbase/coprocessor/ColumnInterpreter.java|   5 +-
 .../hadoop/hbase/protobuf/ProtobufUtil.java | 128 +++
 .../client/TestClientExponentialBackoff.java|   5 +-
 .../org/apache/hadoop/hbase/ProcedureInfo.java  |  76 +--
 .../org/apache/hadoop/hbase/ProcedureState.java |  30 +
 .../org/apache/hadoop/hbase/ProcedureUtil.java  | 103 +++
 .../hadoop/hbase/procedure2/Procedure.java  |  21 ++-
 .../store/wal/ProcedureWALFormatReader.java |   3 +-
 .../procedure2/ProcedureTestingUtility.java |  12 +-
 .../hadoop/hbase/master/MasterRpcServices.java  |   7 +-
 .../master/procedure/ProcedureSyncWait.java |   2 +-
 .../apache/hadoop/hbase/client/TestResult.java  |   3 +-
 .../master/procedure/TestProcedureAdmin.java|   2 +-
 28 files changed, 385 insertions(+), 251 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/97ad33c6/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java
--
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java
index 6a3b14f..c127627 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterId.java
@@ -81,7 +81,7 @@ public class ClusterId {
   /**
* @return A pb instance to represent this instance.
*/
-  ClusterIdProtos.ClusterId convert() {
+  public ClusterIdProtos.ClusterId convert() {
 ClusterIdProtos.ClusterId.Builder builder = 
ClusterIdProtos.ClusterId.newBuilder();
 return builder.setClusterId(this.id).build();
   }
@@ -90,7 +90,7 @@ public class ClusterId {
* @param cid
* @return A {@link ClusterId} made from the passed in cid
*/
-  static ClusterId convert(final ClusterIdProtos.ClusterId cid) {
+  public static ClusterId convert(final ClusterIdProtos.ClusterId cid) {
 return new ClusterId(cid.getClusterId());
   }
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/97ad33c6/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 4b73dda..bc97a95 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
@@ -346,117 +346,4 @@ public class ClusterStatus extends VersionedWritable {
 }
 return sb.toString();
   }
-
-  /**
-* Convert a ClusterStatus to a protobuf ClusterStatus
-*
-* @return the protobuf ClusterStatus
-*/
-  public ClusterStatusProtos.ClusterStatus convert() {
-ClusterStatusProtos.ClusterStatus.Builder builder =
-ClusterStatusProtos.ClusterStatus.newBuilder();
-
builder.setHbaseVersion(HBaseVersionFileContent.newBuilder().setVersion(getHBaseVersion()));
-
-if (liveServers != null){
-  for (Map.Entry entry : liveServers.entrySet()) {
-LiveServerInfo.Builder lsi =
-  
LiveServerInfo.newBuilder().setServer(ProtobufUtil.toServ