Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-18783 Declare the builder of ClusterStatus as IA.Private, and remove the Writables from ClusterStatus

This commit is contained in:
Chia-Ping Tsai 2017-09-09 04:39:57 +08:00
parent 6970c1e9eb
commit 26b009f1d1
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hbase-client/src/main/java/org/apache/hadoop/hbase/ClusterStatus.java
View File

@ -27,11 +27,9 @@ import java.util.Map;
import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.master.RegionState; import org.apache.hadoop.hbase.master.RegionState;
import org.apache.hadoop.io.VersionedWritable;
import com.google.common.base.Objects; import com.google.common.base.Objects;
/** /**
* Status information on the HBase cluster. * Status information on the HBase cluster.
* <p> * <p>
@ -70,17 +68,9 @@ import com.google.common.base.Objects;
* </pre> * </pre>
*/ */
@InterfaceAudience.Public @InterfaceAudience.Public
public class ClusterStatus extends VersionedWritable { public class ClusterStatus {
/**
* Version for object serialization. Incremented for changes in serialized // TODO: remove this in 3.0
* representation.
* <dl>
* <dt>0</dt> <dd>Initial version</dd>
* <dt>1</dt> <dd>Added cluster ID</dd>
* <dt>2</dt> <dd>Added Map of ServerName to ServerLoad</dd>
* <dt>3</dt> <dd>Added master and backupMasters</dd>
* </dl>
*/
private static final byte VERSION = 2; private static final byte VERSION = 2;
private String hbaseVersion; private String hbaseVersion;
@ -209,8 +199,7 @@ public class ClusterStatus extends VersionedWritable {
} }
ClusterStatus other = (ClusterStatus) o; ClusterStatus other = (ClusterStatus) o;
//TODO Override the equals() methods in ServerLoad. //TODO Override the equals() methods in ServerLoad.
return (getVersion() == other.getVersion()) && return Objects.equal(getHBaseVersion(), other.getHBaseVersion()) &&
Objects.equal(getHBaseVersion(), other.getHBaseVersion()) &&
Objects.equal(this.liveServers, other.liveServers) && Objects.equal(this.liveServers, other.liveServers) &&
getDeadServerNames().containsAll(other.getDeadServerNames()) && getDeadServerNames().containsAll(other.getDeadServerNames()) &&
Arrays.equals(getMasterCoprocessors(), other.getMasterCoprocessors()) && Arrays.equals(getMasterCoprocessors(), other.getMasterCoprocessors()) &&
@ -222,11 +211,16 @@ public class ClusterStatus extends VersionedWritable {
* @see java.lang.Object#hashCode() * @see java.lang.Object#hashCode()
*/ */
public int hashCode() { public int hashCode() {
return VERSION + Objects.hashCode(hbaseVersion, liveServers, deadServers, return Objects.hashCode(hbaseVersion, liveServers, deadServers,
master, backupMasters); master, backupMasters);
} }
/** @return the object version number */ /**
*
* @return the object version number
* @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0
*/
@Deprecated
public byte getVersion() { public byte getVersion() {
return VERSION; return VERSION;
} }
@ -369,6 +363,7 @@ public class ClusterStatus extends VersionedWritable {
/** /**
* Builder for construct a ClusterStatus. * Builder for construct a ClusterStatus.
*/ */
@InterfaceAudience.Private
public static class Builder { public static class Builder {
private String hbaseVersion = null; private String hbaseVersion = null;
private Map<ServerName, ServerLoad> liveServers = null; private Map<ServerName, ServerLoad> liveServers = null;