svn commit: r1381467 - in /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client: HBaseAdmin.java HConnection.java HConnectionManager.java

[st...@apache.org]

Author: stack
Date: Thu Sep  6 05:01:01 2012
New Revision: 1381467

URL: http://svn.apache.org/viewvc?rev=1381467&view=rev
Log:
HBASE-6495 HBaseAdmin shouldn't expect HConnection to be an HConnectionImplementation

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1381467&r1=1381466&r2=1381467&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Thu Sep  6 05:01:01 2012
@@ -119,7 +119,7 @@ public class HBaseAdmin implements Abort
 
   // We use the implementation class rather then the interface because we
   //  need the package protected functions to get the connection to master
-  private HConnectionManager.HConnectionImplementation connection;
+  private HConnection connection;
 
   private volatile Configuration conf;
   private final long pause;
@@ -154,10 +154,7 @@ public class HBaseAdmin implements Abort
   public HBaseAdmin(HConnection connection)
       throws MasterNotRunningException, ZooKeeperConnectionException {
     this.conf = connection.getConfiguration();
-
-    // We want the real class, without showing it our public interface,
-    //  hence the cast.
-    this.connection = (HConnectionManager.HConnectionImplementation)connection;
+    this.connection = connection;
 
     this.pause = this.conf.getLong("hbase.client.pause", 1000);
     this.numRetries = this.conf.getInt("hbase.client.retries.number", 10);

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnection.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnection.java?rev=1381467&r1=1381466&r2=1381467&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnection.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnection.java Thu Sep  6 05:01:01 2012
@@ -387,5 +387,22 @@ public interface HConnection extends Abo
    * @param sn A server name as hostname:port
    */
   public void clearCaches(final String sn);
+
+  /**
+   * This function allows HBaseAdminProtocol and potentially others to get a shared MasterMonitor
+   * connection.
+   * @return The shared instance. Never returns null.
+   * @throws MasterNotRunningException
+   */
+  public MasterMonitorKeepAliveConnection getKeepAliveMasterMonitor()
+      throws MasterNotRunningException;
+
+  /**
+   * This function allows HBaseAdmin and potentially others to get a shared MasterAdminProtocol
+   * connection.
+   * @return The shared instance. Never returns null.
+   * @throws MasterNotRunningException
+   */
+  public MasterAdminKeepAliveConnection getKeepAliveMasterAdmin() throws MasterNotRunningException;
 }
 

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1381467&r1=1381466&r2=1381467&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Thu Sep  6 05:01:01 2012
@@ -1617,26 +1617,16 @@ public class HConnectionManager {
       return getKeepAliveMasterMonitor();
     }
 
-    /**
-     * This function allows HBaseAdmin and potentially others
-     * to get a shared MasterAdminProtocol connection.
-     *
-     * @return The shared instance. Never returns null.
-     * @throws MasterNotRunningException
-     */
-    MasterAdminKeepAliveConnection getKeepAliveMasterAdmin() throws MasterNotRunningException {
+    @Override
+    public MasterAdminKeepAliveConnection getKeepAliveMasterAdmin()
+        throws MasterNotRunningException {
       return (MasterAdminKeepAliveConnection)
         getKeepAliveMasterProtocol(masterAdminProtocol, MasterAdminKeepAliveConnection.class);
     }
 
-    /**
-     * This function allows HBaseAdminProtocol and potentially others
-     * to get a shared MasterMonitor connection.
-     *
-     * @return The shared instance. Never returns null.
-     * @throws MasterNotRunningException
-     */
-    MasterMonitorKeepAliveConnection getKeepAliveMasterMonitor() throws MasterNotRunningException {
+    @Override
+    public MasterMonitorKeepAliveConnection getKeepAliveMasterMonitor()
+        throws MasterNotRunningException {
       return (MasterMonitorKeepAliveConnection)
         getKeepAliveMasterProtocol(masterMonitorProtocol, MasterMonitorKeepAliveConnection.class);
     }