diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java index bb302dbc85..20706c6954 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/client/ColumnFamilyDescriptorBuilder.java @@ -1091,12 +1091,13 @@ public class ColumnFamilyDescriptorBuilder { s.append(HConstants.METADATA).append(" => "); s.append('{'); boolean printComma = false; - for (Bytes k : values.keySet()) { + for (Map.Entry entry : values.entrySet()) { + Bytes k = entry.getKey(); if (RESERVED_KEYWORDS.contains(k)) { continue; } String key = Bytes.toString(k.get()); - String value = Bytes.toStringBinary(values.get(k).get()); + String value = Bytes.toStringBinary(entry.getValue().get()); if (printComma) { s.append(", "); } diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java index d414f7036b..a41fdff3e5 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java @@ -101,7 +101,7 @@ public abstract class AbstractRpcClient implements RpcC private static final ScheduledExecutorService IDLE_CONN_SWEEPER = Executors .newScheduledThreadPool(1, Threads.newDaemonThreadFactory("Idle-Rpc-Conn-Sweeper")); - protected final static Map> TOKEN_HANDLERS = new HashMap<>(); + final static Map> TOKEN_HANDLERS = new HashMap<>(); static { TOKEN_HANDLERS.put(Kind.HBASE_AUTH_TOKEN, new AuthenticationTokenSelector()); diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java index 5f8924f0c1..c0a79624bf 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java @@ -3205,7 +3205,6 @@ public final class ProtobufUtil { for (ServerName serverName : status.getServers()) { LiveServerInfo.Builder lsi = LiveServerInfo.newBuilder().setServer(ProtobufUtil.toServerName(serverName)); - status.getLoad(serverName); lsi.setServerLoad(status.getLoad(serverName).obtainServerLoadPB()); builder.addLiveServers(lsi.build()); } diff --git hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java index 2131db359f..40c6b55e53 100644 --- hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java +++ hbase-client/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java @@ -210,7 +210,7 @@ public class PoolMap implements Map { } } } - return null; + return entries; } protected interface Pool {