You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/01/27 23:02:50 UTC
[1/2] hbase git commit: HBASE-12932 [0.98] Change the interface
annotation of HConnection from Public/Stable to Public/Evolving
Repository: hbase
Updated Branches:
refs/heads/0.98 9115f303c -> e45bc3efb
HBASE-12932 [0.98] Change the interface annotation of HConnection from Public/Stable to Public/Evolving
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2712fde5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2712fde5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2712fde5
Branch: refs/heads/0.98
Commit: 2712fde545f8e96b7a263fd2f6d71d6f6a01aca0
Parents: 9115f30
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Jan 27 14:00:25 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Jan 27 14:00:25 2015 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/client/HConnection.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2712fde5/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
index e39ee51..65571e4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
@@ -59,7 +59,7 @@ import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MasterService;
* @see HConnectionManager
*/
@InterfaceAudience.Public
-@InterfaceStability.Stable
+@InterfaceStability.Evolving
public interface HConnection extends Abortable, Closeable {
/**
* Key for configuration in Configuration whose value is the class we implement making a
[2/2] hbase git commit: HBASE-12933 [0.98] Fold StatisticsHConnection
into HConnection
Posted by ap...@apache.org.
HBASE-12933 [0.98] Fold StatisticsHConnection into HConnection
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e45bc3ef
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e45bc3ef
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e45bc3ef
Branch: refs/heads/0.98
Commit: e45bc3efb0dc3c4985c7fb55a14aeb916ceb760b
Parents: 2712fde
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Jan 27 14:00:47 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Jan 27 14:00:47 2015 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/client/AsyncProcess.java | 10 +++-------
.../org/apache/hadoop/hbase/client/ClientScanner.java | 4 +---
.../apache/hadoop/hbase/client/ClientSmallScanner.java | 5 ++---
.../java/org/apache/hadoop/hbase/client/HBaseAdmin.java | 3 +--
.../java/org/apache/hadoop/hbase/client/HConnection.java | 11 +++++++++++
.../apache/hadoop/hbase/client/HConnectionManager.java | 2 +-
.../main/java/org/apache/hadoop/hbase/client/HTable.java | 3 +--
.../apache/hadoop/hbase/client/HTableMultiplexer.java | 3 +--
.../apache/hadoop/hbase/client/TestClientPushback.java | 2 +-
9 files changed, 22 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e45bc3ef/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
index bd15837..d68668b 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java
@@ -626,8 +626,7 @@ class AsyncProcess<CResult> {
final HConnectionManager.ServerErrorTracker errorsByServer,
final Batch.Callback<CResult> batchCallback) {
// no stats to manage, just do the standard action
- if (!(AsyncProcess.this.hConnection instanceof StatisticsHConnection) ||
- ((StatisticsHConnection)AsyncProcess.this.hConnection).getStatisticsTracker() == null) {
+ if (AsyncProcess.this.hConnection.getStatisticsTracker() == null) {
List<Runnable> toReturn = new ArrayList<Runnable>(1);
toReturn.add(Trace.wrap("AsyncProcess.sendMultiAction",
getNewSingleServerRunnable(initialActions, loc, multiAction, numAttempt,
@@ -674,12 +673,9 @@ class AsyncProcess<CResult> {
* specified server and region
*/
private Long getBackoff(HRegionLocation location) {
- Preconditions.checkState(AsyncProcess.this.hConnection instanceof StatisticsHConnection,
- "AsyncProcess connection should be a StatisticsHConnection");
- ServerStatisticTracker tracker = ((StatisticsHConnection)AsyncProcess.this.hConnection)
- .getStatisticsTracker();
+ ServerStatisticTracker tracker = AsyncProcess.this.hConnection.getStatisticsTracker();
ServerStatistics stats = tracker.getStats(location.getServerName());
- return ((StatisticsHConnection)AsyncProcess.this.hConnection).getBackoffPolicy()
+ return AsyncProcess.this.hConnection.getBackoffPolicy()
.getBackoffTime(location.getServerName(), location.getRegionInfo().getRegionName(),
stats);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e45bc3ef/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
index 7821f46..d77f2df 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
@@ -108,9 +108,7 @@ public class ClientScanner extends AbstractClientScanner {
public ClientScanner(final Configuration conf, final Scan scan, final TableName tableName,
HConnection connection) throws IOException {
this(conf, scan, tableName, connection,
- RpcRetryingCallerFactory.instantiate(conf,
- connection instanceof StatisticsHConnection ?
- ((StatisticsHConnection)connection).getStatisticsTracker() : null),
+ RpcRetryingCallerFactory.instantiate(conf, connection.getStatisticsTracker()),
RpcControllerFactory.instantiate(conf));
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e45bc3ef/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java
index ad9380f..1055052 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java
@@ -84,9 +84,8 @@ public class ClientSmallScanner extends ClientScanner {
public ClientSmallScanner(final Configuration conf, final Scan scan,
final TableName tableName, HConnection connection) throws IOException {
this(conf, scan, tableName, connection, RpcRetryingCallerFactory.instantiate(conf,
- connection instanceof StatisticsHConnection ?
- ((StatisticsHConnection)connection).getStatisticsTracker() : null),
- RpcControllerFactory.instantiate(conf));
+ connection.getStatisticsTracker()),
+ RpcControllerFactory.instantiate(conf));
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/e45bc3ef/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
index e3af5e0..8be31c9 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
@@ -215,8 +215,7 @@ public class HBaseAdmin implements Abortable, Closeable {
this.retryLongerMultiplier = this.conf.getInt(
"hbase.client.retries.longer.multiplier", 10);
this.rpcCallerFactory = RpcRetryingCallerFactory.instantiate(this.conf,
- connection instanceof StatisticsHConnection ?
- ((StatisticsHConnection)connection).getStatisticsTracker() : null);
+ connection.getStatisticsTracker());
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/e45bc3ef/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
index 65571e4..3aabc26 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
@@ -34,6 +34,7 @@ import org.apache.hadoop.hbase.MasterNotRunningException;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.ZooKeeperConnectionException;
import org.apache.hadoop.hbase.catalog.CatalogTracker;
+import org.apache.hadoop.hbase.client.backoff.ClientBackoffPolicy;
import org.apache.hadoop.hbase.client.coprocessor.Batch;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.AdminService;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ClientService;
@@ -520,4 +521,14 @@ public interface HConnection extends Abortable, Closeable {
* @return Nonce generator for this HConnection; may be null if disabled in configuration.
*/
public NonceGenerator getNonceGenerator();
+
+ /**
+ * @return the current statistics tracker associated with this connection
+ */
+ ServerStatisticTracker getStatisticsTracker();
+
+ /**
+ * @return the configured client backoff policy
+ */
+ ClientBackoffPolicy getBackoffPolicy();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e45bc3ef/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
index b06dc6f..e66175b 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
@@ -594,7 +594,7 @@ public class HConnectionManager {
@edu.umd.cs.findbugs.annotations.SuppressWarnings(
value="AT_OPERATION_SEQUENCE_ON_CONCURRENT_ABSTRACTION",
justification="Access to the conncurrent hash map is under a lock so should be fine.")
- public static class HConnectionImplementation implements StatisticsHConnection, Closeable {
+ public static class HConnectionImplementation implements HConnection, Closeable {
static final Log LOG = LogFactory.getLog(HConnectionImplementation.class);
private final long pause;
private final int numTries;
http://git-wip-us.apache.org/repos/asf/hbase/blob/e45bc3ef/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
index c429ba3..83c2071 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
@@ -380,8 +380,7 @@ public class HTable implements HTableInterface {
if (this.rpcCallerFactory == null) {
this.rpcCallerFactory = RpcRetryingCallerFactory.instantiate(configuration,
- this.connection instanceof StatisticsHConnection ?
- ((StatisticsHConnection)this.connection).getStatisticsTracker() : null);
+ this.connection.getStatisticsTracker());
}
if (this.rpcControllerFactory == null) {
this.rpcControllerFactory = RpcControllerFactory.instantiate(configuration);
http://git-wip-us.apache.org/repos/asf/hbase/blob/e45bc3ef/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java
index 7f5a4ca..d7b73c3 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableMultiplexer.java
@@ -414,8 +414,7 @@ public class HTableMultiplexer {
this.multiplexer = multiplexer;
this.queue = new LinkedBlockingQueue<PutStatus>(perRegionServerBufferQueueSize);
RpcRetryingCallerFactory rpcCallerFactory = RpcRetryingCallerFactory.instantiate(conf,
- conn instanceof StatisticsHConnection ?
- ((StatisticsHConnection)conn).getStatisticsTracker() : null);
+ conn.getStatisticsTracker());
RpcControllerFactory rpcControllerFactory = RpcControllerFactory.instantiate(conf);
this.ap = new AsyncProcess<Object>(conn, null, pool, this, conf, rpcCallerFactory,
rpcControllerFactory);
http://git-wip-us.apache.org/repos/asf/hbase/blob/e45bc3ef/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientPushback.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientPushback.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientPushback.java
index 4d4e5dc..266adfe 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientPushback.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientPushback.java
@@ -92,7 +92,7 @@ public class TestClientPushback {
TableName tablename = TableName.valueOf(tableName);
// Cast also verifies HConnectionManager is creating connection instances
// of the correct type
- StatisticsHConnection conn = (StatisticsHConnection)HConnectionManager.createConnection(conf);
+ HConnection conn = HConnectionManager.createConnection(conf);
HTable table = (HTable) conn.getTable(tablename);
HRegionServer rs = UTIL.getHBaseCluster().getRegionServer(0);