diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java index 1e79186..90af1f4 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/QuotaRetriever.java @@ -20,24 +20,22 @@ package org.apache.hadoop.hbase.quotas; import java.io.Closeable; import java.io.IOException; +import java.util.ArrayDeque; import java.util.Iterator; -import java.util.LinkedList; import java.util.Objects; import java.util.Queue; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.TableName; -import org.apache.yetus.audience.InterfaceAudience; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; -import org.apache.hadoop.hbase.shaded.protobuf.generated.QuotaProtos.Quotas; -import org.apache.hadoop.util.StringUtils; +import org.apache.yetus.audience.InterfaceAudience; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Scanner to iterate over the quota settings. @@ -46,7 +44,7 @@ import org.apache.hadoop.util.StringUtils; public class QuotaRetriever implements Closeable, Iterable { private static final Logger LOG = LoggerFactory.getLogger(QuotaRetriever.class); - private final Queue cache = new LinkedList<>(); + private final Queue cache = new ArrayDeque<>(); private ResultScanner scanner; /** * Connection to use. @@ -74,7 +72,7 @@ public class QuotaRetriever implements Closeable, Iterable { this.connection = Objects.requireNonNull(conn); this.table = this.connection.getTable(QuotaTableUtil.QUOTA_TABLE_NAME); try { - scanner = table.getScanner(scan); + this.scanner = table.getScanner(scan); } catch (IOException e) { try { close(); @@ -124,7 +122,7 @@ public class QuotaRetriever implements Closeable, Iterable { try { cache = QuotaRetriever.this.next(); } catch (IOException e) { - LOG.warn(StringUtils.stringifyException(e)); + LOG.warn("Could not retrieve next quota", e); } } @@ -139,7 +137,7 @@ public class QuotaRetriever implements Closeable, Iterable { try { cache = QuotaRetriever.this.next(); } catch (IOException e) { - LOG.warn(StringUtils.stringifyException(e)); + LOG.warn("Could not retrieve next quota", e); } return result; }