You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ra...@apache.org on 2010/03/08 23:25:09 UTC

svn commit: r920548 [3/5] - in /hadoop/hbase/trunk: ./ core/src/main/java/org/apache/hadoop/hbase/client/ core/src/main/java/org/apache/hadoop/hbase/filter/ core/src/main/java/org/apache/hadoop/hbase/ipc/ core/src/main/java/org/apache/hadoop/hbase/mast...

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPC.java Mon Mar  8 22:25:06 2010
@@ -1,4 +1,6 @@
 /**
+ * Copyright 2010 The Apache Software Foundation
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +20,18 @@
 
 package org.apache.hadoop.hbase.ipc;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configurable;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.client.RetriesExhaustedException;
+import org.apache.hadoop.hbase.io.HbaseObjectWritable;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.ipc.VersionedProtocol;
+import org.apache.hadoop.net.NetUtils;
+import org.apache.hadoop.security.UserGroupInformation;
+
+import javax.net.SocketFactory;
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
@@ -29,26 +43,9 @@
 import java.net.ConnectException;
 import java.net.InetSocketAddress;
 import java.net.SocketTimeoutException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.net.SocketFactory;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configurable;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.client.RetriesExhaustedException;
-import org.apache.hadoop.hbase.io.HbaseObjectWritable;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.ipc.VersionedProtocol;
-import org.apache.hadoop.net.NetUtils;
-import org.apache.hadoop.security.UserGroupInformation;
-
 /** A simple RPC mechanism.
  *
  * This is a local hbase copy of the hadoop RPC so we can do things like
@@ -99,8 +96,8 @@
     }
 
     /**
-     * @param method
-     * @param parameters
+     * @param method method to call
+     * @param parameters parameters of call
      */
     public Invocation(Method method, Object[] parameters) {
       this.methodName = method.getName();
@@ -174,6 +171,7 @@
      * if no cached client exists.
      * 
      * @param conf Configuration
+     * @param factory socket factory
      * @return an IPC client
      */
     protected synchronized HBaseClient getClient(Configuration conf,
@@ -208,6 +206,7 @@
     /**
      * Stop a RPC client connection 
      * A RPC client is closed only when its reference count becomes zero.
+     * @param client client to stop
      */
     protected void stopClient(HBaseClient client) {
       synchronized (this) {
@@ -231,10 +230,10 @@
     private boolean isClosed = false;
 
     /**
-     * @param address
-     * @param ticket
-     * @param conf
-     * @param factory
+     * @param address address for invoker
+     * @param ticket ticket
+     * @param conf configuration
+     * @param factory socket factory
      */
     public Invoker(InetSocketAddress address, UserGroupInformation ticket, 
                    Configuration conf, SocketFactory factory) {
@@ -317,14 +316,14 @@
   }
   
   /**
-   * @param protocol
-   * @param clientVersion
-   * @param addr
-   * @param conf
-   * @param maxAttempts
-   * @param timeout
+   * @param protocol protocol interface
+   * @param clientVersion which client version we expect
+   * @param addr address of remote service
+   * @param conf configuration
+   * @param maxAttempts max attempts
+   * @param timeout timeout in milliseconds
    * @return proxy
-   * @throws IOException
+   * @throws IOException e
    */
   @SuppressWarnings("unchecked")
   public static VersionedProtocol waitForProxy(Class protocol,
@@ -371,13 +370,13 @@
    * Construct a client-side proxy object that implements the named protocol,
    * talking to a server at the named address.
    *
-   * @param protocol
-   * @param clientVersion
-   * @param addr
-   * @param conf
-   * @param factory
+   * @param protocol interface
+   * @param clientVersion version we are expecting
+   * @param addr remote address
+   * @param conf configuration
+   * @param factory socket factory
    * @return proxy
-   * @throws IOException
+   * @throws IOException e
    */
   public static VersionedProtocol getProxy(Class<?> protocol,
       long clientVersion, InetSocketAddress addr, Configuration conf,
@@ -389,14 +388,14 @@
    * Construct a client-side proxy object that implements the named protocol,
    * talking to a server at the named address.
    *
-   * @param protocol
-   * @param clientVersion
-   * @param addr
-   * @param ticket
-   * @param conf
-   * @param factory
+   * @param protocol interface
+   * @param clientVersion version we are expecting
+   * @param addr remote address
+   * @param ticket ticket
+   * @param conf configuration
+   * @param factory socket factory
    * @return proxy
-   * @throws IOException
+   * @throws IOException e
    */
   public static VersionedProtocol getProxy(Class<?> protocol,
       long clientVersion, InetSocketAddress addr, UserGroupInformation ticket,
@@ -418,12 +417,12 @@
   /**
    * Construct a client-side proxy object with the default SocketFactory
    * 
-   * @param protocol
-   * @param clientVersion
-   * @param addr
-   * @param conf
+   * @param protocol interface
+   * @param clientVersion version we are expecting
+   * @param addr remote address
+   * @param conf configuration
    * @return a proxy instance
-   * @throws IOException
+   * @throws IOException e
    */
   public static VersionedProtocol getProxy(Class<?> protocol,
       long clientVersion, InetSocketAddress addr, Configuration conf)
@@ -446,12 +445,12 @@
   /**
    * Expert: Make multiple, parallel calls to a set of servers.
    *
-   * @param method
-   * @param params
-   * @param addrs
-   * @param conf
+   * @param method method to invoke
+   * @param params array of parameters
+   * @param addrs array of addresses
+   * @param conf configuration
    * @return values
-   * @throws IOException
+   * @throws IOException e
    */
   public static Object[] call(Method method, Object[][] params,
                               InetSocketAddress[] addrs, Configuration conf)
@@ -484,12 +483,12 @@
    * Construct a server for a protocol implementation instance listening on a
    * port and address.
    *
-   * @param instance
-   * @param bindAddress
-   * @param port
-   * @param conf
+   * @param instance instance
+   * @param bindAddress bind address
+   * @param port port to bind to
+   * @param conf configuration
    * @return Server
-   * @throws IOException
+   * @throws IOException e
    */
   public static Server getServer(final Object instance, final String bindAddress, final int port, Configuration conf) 
     throws IOException {
@@ -500,14 +499,14 @@
    * Construct a server for a protocol implementation instance listening on a
    * port and address.
    *
-   * @param instance
-   * @param bindAddress
-   * @param port
-   * @param numHandlers
-   * @param verbose
-   * @param conf
+   * @param instance instance
+   * @param bindAddress bind address
+   * @param port port to bind to
+   * @param numHandlers number of handlers to start
+   * @param verbose verbose flag
+   * @param conf configuration
    * @return Server
-   * @throws IOException
+   * @throws IOException e
    */
   public static Server getServer(final Object instance, final String bindAddress, final int port,
                                  final int numHandlers,
@@ -528,7 +527,7 @@
      * @param conf the configuration to use
      * @param bindAddress the address to bind on to listen for connection
      * @param port the port to listen for connections on
-     * @throws IOException
+     * @throws IOException e
      */
     public Server(Object instance, Configuration conf, String bindAddress, int port) 
       throws IOException {
@@ -550,7 +549,7 @@
      * @param port the port to listen for connections on
      * @param numHandlers the number of method handler threads to run
      * @param verbose whether each call should be logged
-     * @throws IOException
+     * @throws IOException e
      */
     public Server(Object instance, Configuration conf, String bindAddress,  int port,
                   int numHandlers, boolean verbose) throws IOException {

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCErrorHandler.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCErrorHandler.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCErrorHandler.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCErrorHandler.java Mon Mar  8 22:25:06 2010
@@ -1,4 +1,6 @@
 /**
+ * Copyright 2010 The Apache Software Foundation
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCProtocolVersion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCProtocolVersion.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCProtocolVersion.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCProtocolVersion.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRPCStatistics.java Mon Mar  8 22:25:06 2010
@@ -1,4 +1,6 @@
 /**
+ * Copyright 2010 The Apache Software Foundation
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,14 +17,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.hadoop.hbase.ipc;
 
-import javax.management.ObjectName;
+package org.apache.hadoop.hbase.ipc;
 
 import org.apache.hadoop.metrics.util.MBeanUtil;
 import org.apache.hadoop.metrics.util.MetricsDynamicMBeanBase;
 import org.apache.hadoop.metrics.util.MetricsRegistry;
 
+import javax.management.ObjectName;
+
 /**
  * Exports HBase RPC statistics recorded in {@link HBaseRpcMetrics} as an MBean
  * for JMX monitoring.
@@ -30,7 +33,8 @@
 public class HBaseRPCStatistics extends MetricsDynamicMBeanBase {
   private final ObjectName mbeanName;
 
-  public HBaseRPCStatistics(MetricsRegistry registry, 
+  @SuppressWarnings({"UnusedDeclaration"})
+  public HBaseRPCStatistics(MetricsRegistry registry,
       String hostName, String port) {
 	  super(registry, "HBaseRPCStatistics");
 

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseRpcMetrics.java Mon Mar  8 22:25:06 2010
@@ -1,4 +1,6 @@
 /**
+ * Copyright 2010 The Apache Software Foundation
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,6 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.hadoop.hbase.ipc;
 
 import org.apache.commons.logging.Log;
@@ -23,8 +26,8 @@
 import org.apache.hadoop.metrics.MetricsRecord;
 import org.apache.hadoop.metrics.MetricsUtil;
 import org.apache.hadoop.metrics.Updater;
-import org.apache.hadoop.metrics.util.MetricsTimeVaryingRate;
 import org.apache.hadoop.metrics.util.MetricsRegistry;
+import org.apache.hadoop.metrics.util.MetricsTimeVaryingRate;
 
 /**
  * 
@@ -63,7 +66,7 @@
    *  - they can be set directly by calling their set/inc methods
    *  -they can also be read directly - e.g. JMX does this.
    */
-  public MetricsRegistry registry = new MetricsRegistry();
+  public final MetricsRegistry registry = new MetricsRegistry();
 
   public MetricsTimeVaryingRate rpcQueueTime = new MetricsTimeVaryingRate("RpcQueueTime", registry);
   public MetricsTimeVaryingRate rpcProcessingTime = new MetricsTimeVaryingRate("RpcProcessingTime", registry);
@@ -75,8 +78,7 @@
     return (MetricsTimeVaryingRate) registry.get(key);
   }
   private MetricsTimeVaryingRate create(String key) {
-    MetricsTimeVaryingRate newMetric = new MetricsTimeVaryingRate(key, this.registry);
-    return newMetric;
+    return new MetricsTimeVaryingRate(key, this.registry);
   }
 
   public synchronized void inc(String name, int amt) {
@@ -89,14 +91,14 @@
 
   /**
    * Push the metrics to the monitoring subsystem on doUpdate() call.
-   * @param context
+   * @param context ctx
    */
   public void doUpdates(MetricsContext context) {
     rpcQueueTime.pushMetric(metricsRecord);
     rpcProcessingTime.pushMetric(metricsRecord);
 
     synchronized (registry) {
-      // Iterate through the registry to propogate the different rpc metrics.
+      // Iterate through the registry to propagate the different rpc metrics.
 
       for (String metricName : registry.getKeyList() ) {
         MetricsTimeVaryingRate value = (MetricsTimeVaryingRate) registry.get(metricName);

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HBaseServer.java Mon Mar  8 22:25:06 2010
@@ -1,4 +1,6 @@
 /**
+ * Copyright 2010 The Apache Software Foundation
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,6 +20,16 @@
 
 package org.apache.hadoop.hbase.ipc;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.ObjectWritable;
+import org.apache.hadoop.io.Writable;
+import org.apache.hadoop.io.WritableUtils;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.StringUtils;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
@@ -33,11 +45,11 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.CancelledKeyException;
 import java.nio.channels.ClosedChannelException;
+import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.WritableByteChannel;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -48,16 +60,6 @@
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.io.ObjectWritable;
-import org.apache.hadoop.io.Writable;
-import org.apache.hadoop.io.WritableUtils;
-import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.hadoop.util.ReflectionUtils;
-import org.apache.hadoop.util.StringUtils;
-
 /** An abstract IPC service.  IPC calls take a single {@link Writable} as a
  * parameter, and return a {@link Writable} as their value.  A service runs on
  * a port and is defined by a parameter class and a value class.
@@ -143,6 +145,7 @@
   
   protected Configuration conf;
 
+  @SuppressWarnings({"FieldCanBeLocal"})
   private int maxQueueSize;
   protected int socketSendBufferSize;
   protected final boolean tcpNoDelay;   // if T then disable Nagle's Algorithm
@@ -151,7 +154,7 @@
   volatile protected boolean running = true;         // true while server runs
   protected BlockingQueue<Call> callQueue; // queued calls
 
-  protected List<Connection> connectionList = 
+  protected final List<Connection> connectionList =
     Collections.synchronizedList(new LinkedList<Connection>());
   //maintain a list
   //of client connections
@@ -254,6 +257,7 @@
      * that will be cleanedup per run. The criteria for cleanup is the time
      * for which the connection was idle. If 'force' is true then all 
      * connections will be looked at for the cleanup.
+     * @param force all connections will be looked at for cleanup
      */
     private void cleanupConnections(boolean force) {
       if (force || numConnections > thresholdIdleConnections) {
@@ -288,6 +292,7 @@
             closeConnection(c);
             numNuked++;
             end--;
+            //noinspection UnusedAssignment
             c = null;
             if (!force && numNuked == maxConnectionsToNuke) break;
           }
@@ -317,7 +322,7 @@
                 else if (key.isReadable())
                   doRead(key);
               }
-            } catch (IOException e) {
+            } catch (IOException ignored) {
             }
             key = null;
           }
@@ -336,7 +341,7 @@
             LOG.warn("Out of Memory in server select", e);
             closeCurrentConnection(key);
             cleanupConnections(true);
-            try { Thread.sleep(60000); } catch (Exception ie) {}
+            try { Thread.sleep(60000); } catch (Exception ignored) {}
       }
         } catch (InterruptedException e) {
           if (running) {                          // unexpected -- log it
@@ -354,7 +359,7 @@
         try {
           acceptChannel.close();
           selector.close();
-        } catch (IOException e) { }
+        } catch (IOException ignored) { }
 
         selector= null;
         acceptChannel= null;
@@ -373,7 +378,6 @@
           if (LOG.isDebugEnabled())
             LOG.debug(getName() + ": disconnecting client " + c.getHostAddress());
           closeConnection(c);
-          c = null;
         }
       }
     }
@@ -383,7 +387,7 @@
     }
     
     void doAccept(SelectionKey key) throws IOException, OutOfMemoryError {
-      Connection c = null;
+      Connection c;
       ServerSocketChannel server = (ServerSocketChannel) key.channel();
       // accept up to 10 connections
       for (int i=0; i<10; i++) {
@@ -429,7 +433,7 @@
                     c.getHostAddress() + ". Number of active connections: "+
                     numConnections);
         closeConnection(c);
-        c = null;
+        // c = null;
       }
       else {
         c.setLastContact(System.currentTimeMillis());
@@ -528,7 +532,7 @@
             // some thread(s) a chance to finish
             //
             LOG.warn("Out of Memory in server select", e);
-            try { Thread.sleep(60000); } catch (Exception ie) {}
+            try { Thread.sleep(60000); } catch (Exception ignored) {}
       }
         } catch (Exception e) {
           LOG.warn("Exception in Responder " + 
@@ -568,9 +572,8 @@
     // for a long time.
     //
     private void doPurge(Call call, long now) {
-      LinkedList<Call> responseQueue = call.connection.responseQueue;
-      synchronized (responseQueue) {
-        Iterator<Call> iter = responseQueue.listIterator(0);
+      synchronized (call.connection.responseQueue) {
+        Iterator<Call> iter = call.connection.responseQueue.listIterator(0);
         while (iter.hasNext()) {
           Call nextCall = iter.next();
           if (now > nextCall.timestamp + PURGE_INTERVAL) {
@@ -584,13 +587,15 @@
     // Processes one response. Returns true if there are no more pending
     // data for this channel.
     //
-    private boolean processResponse(LinkedList<Call> responseQueue,
+    @SuppressWarnings({"ConstantConditions"})
+    private boolean processResponse(final LinkedList<Call> responseQueue,
                                     boolean inHandler) throws IOException {
       boolean error = true;
       boolean done = false;       // there is more data for this channel.
-      int numElements = 0;
+      int numElements;
       Call call = null;
       try {
+        //noinspection SynchronizationOnLocalVariableOrMethodParameter
         synchronized (responseQueue) {
           //
           // If there are no items for this channel, then we are done
@@ -618,6 +623,7 @@
           }
           if (!call.response.hasRemaining()) {
             call.connection.decRpcCount();
+            //noinspection RedundantIfStatement
             if (numElements == 1) {    // last call fully processes.
               done = true;             // no more data for this channel.
             } else {
@@ -706,7 +712,7 @@
     protected SocketChannel channel;
     private ByteBuffer data;
     private ByteBuffer dataLengthBuffer;
-    protected LinkedList<Call> responseQueue;
+    protected final LinkedList<Call> responseQueue;
     private volatile int rpcCount = 0; // number of outstanding rpcs
     private long lastContact;
     private int dataLength;
@@ -774,9 +780,7 @@
     }
     
     protected boolean timedOut(long currentTime) {
-      if (isIdle() && currentTime -  lastContact > maxIdleTime)
-        return true;
-      return false;
+      return isIdle() && currentTime - lastContact > maxIdleTime;
     }
 
     public int readAndProcess() throws IOException, InterruptedException {
@@ -784,7 +788,7 @@
         /* Read at most one RPC. If the header is not read completely yet
          * then iterate until we read first RPC or until there is no data left.
          */    
-        int count = -1;
+        int count;
         if (dataLengthBuffer.remaining() > 0) {
           count = channelRead(channel, dataLengthBuffer);       
           if (count < 0 || dataLengthBuffer.remaining() > 0) 
@@ -875,11 +879,11 @@
       dataLengthBuffer = null;
       if (!channel.isOpen())
         return;
-      try {socket.shutdownOutput();} catch(Exception e) {} // FindBugs DE_MIGHT_IGNORE
+      try {socket.shutdownOutput();} catch(Exception ignored) {} // FindBugs DE_MIGHT_IGNORE
       if (channel.isOpen()) {
-        try {channel.close();} catch(Exception e) {}
+        try {channel.close();} catch(Exception ignored) {}
       }
-      try {socket.close();} catch(Exception e) {}
+      try {socket.close();} catch(Exception ignored) {}
     }
   }
 
@@ -973,7 +977,7 @@
   {
     this(bindAddress, port, paramClass, handlerCount,  conf, Integer.toString(port));
   }
-  /** Constructs a server listening on the named port and address.  Parameters passed must
+  /* Constructs a server listening on the named port and address.  Parameters passed must
    * be of the named class.  The <code>handlerCount</handlerCount> determines
    * the number of handler threads that will be used to process calls.
    * 
@@ -1015,7 +1019,7 @@
   }
   
   /** Sets the socket buffer size used for responding to RPCs.
-   * @param size
+   * @param size send size
    */
   public void setSocketSendBufSize(int size) { this.socketSendBufferSize = size; }
 
@@ -1054,7 +1058,7 @@
   /** Wait for the server to be stopped.
    * Does not wait for all subthreads to finish.
    *  See {@link #stop()}.
-   * @throws InterruptedException
+   * @throws InterruptedException e
    */
   public synchronized void join() throws InterruptedException {
     while (running) {
@@ -1071,10 +1075,10 @@
   }
   
   /** Called for each call. 
-   * @param param 
-   * @param receiveTime 
+   * @param param writable parameter
+   * @param receiveTime time
    * @return Writable 
-   * @throws IOException
+   * @throws IOException e
    */
   public abstract Writable call(Writable param, long receiveTime)
                                                 throws IOException;
@@ -1118,6 +1122,10 @@
    * as a result of multiple write operations required to write a large 
    * buffer.  
    *
+   * @param channel writable byte channel to write to
+   * @param buffer buffer to write
+   * @return number of bytes written
+   * @throws java.io.IOException e
    * @see WritableByteChannel#write(ByteBuffer)
    */
   protected static int channelWrite(WritableByteChannel channel, 
@@ -1132,6 +1140,10 @@
    * This is to avoid jdk from creating many direct buffers as the size of 
    * ByteBuffer increases. There should not be any performance degredation.
    * 
+   * @param channel writable byte channel to write on
+   * @param buffer buffer to write
+   * @return number of bytes written
+   * @throws java.io.IOException e
    * @see ReadableByteChannel#read(ByteBuffer)
    */
   protected static int channelRead(ReadableByteChannel channel, 
@@ -1145,6 +1157,11 @@
    * and {@link #channelWrite(WritableByteChannel, ByteBuffer)}. Only
    * one of readCh or writeCh should be non-null.
    * 
+   * @param readCh read channel
+   * @param writeCh write channel
+   * @param buf buffer to read or write into/out of
+   * @return bytes written
+   * @throws java.io.IOException e
    * @see #channelRead(ReadableByteChannel, ByteBuffer)
    * @see #channelWrite(WritableByteChannel, ByteBuffer)
    */

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2007 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,14 +19,14 @@
  */
 package org.apache.hadoop.hbase.ipc;
 
-import java.io.IOException;
-
 import org.apache.hadoop.hbase.ClusterStatus;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.io.Writable;
 
+import java.io.IOException;
+
 /**
  * Clients interact with the HMasterInterface to gain access to meta-level
  * HBase functionality, like finding an HRegionServer and creating/destroying
@@ -46,32 +46,32 @@
   /**
    * Creates a new table
    * @param desc table descriptor
-   * @throws IOException
+   * @throws IOException e
    */
   public void createTable(HTableDescriptor desc) throws IOException;
 
   /**
    * Deletes a table
-   * @param tableName
-   * @throws IOException
+   * @param tableName table to delete
+   * @throws IOException e
    */
   public void deleteTable(final byte [] tableName) throws IOException;
   
   /**
    * Adds a column to the specified table
-   * @param tableName
+   * @param tableName table to modify
    * @param column column descriptor
-   * @throws IOException
+   * @throws IOException e
    */
   public void addColumn(final byte [] tableName, HColumnDescriptor column)
   throws IOException;
 
   /**
    * Modifies an existing column on the specified table
-   * @param tableName
+   * @param tableName table name
    * @param columnName name of the column to edit
    * @param descriptor new column descriptor
-   * @throws IOException
+   * @throws IOException e
    */
   public void modifyColumn(final byte [] tableName, final byte [] columnName, 
     HColumnDescriptor descriptor) 
@@ -79,48 +79,49 @@
 
 
   /**
-   * Deletes a column from the specified table
-   * @param tableName
-   * @param columnName
-   * @throws IOException
+   * Deletes a column from the specified table. Table must be disabled.
+   * @param tableName table to alter
+   * @param columnName column family to remove
+   * @throws IOException e
    */
   public void deleteColumn(final byte [] tableName, final byte [] columnName)
   throws IOException;
   
   /**
    * Puts the table on-line (only needed if table has been previously taken offline)
-   * @param tableName
-   * @throws IOException
+   * @param tableName table to enable
+   * @throws IOException e
    */
   public void enableTable(final byte [] tableName) throws IOException;
   
   /**
    * Take table offline
    * 
-   * @param tableName
-   * @throws IOException
+   * @param tableName table to take offline
+   * @throws IOException e
    */
   public void disableTable(final byte [] tableName) throws IOException;
 
   /**
    * Modify a table's metadata
    * 
-   * @param tableName
-   * @param op
-   * @param args
-   * @throws IOException
+   * @param tableName table to modify
+   * @param op the operation to do
+   * @param args arguments for operation
+   * @throws IOException e
    */
   public void modifyTable(byte[] tableName, HConstants.Modify op, Writable[] args)
     throws IOException;
 
   /**
    * Shutdown an HBase cluster.
-   * @throws IOException
+   * @throws IOException e
    */
   public void shutdown() throws IOException;
 
   /**
    * Return cluster status.
+   * @return status object
    */
   public ClusterStatus getClusterStatus();
 }

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HMasterRegionInterface.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HMasterRegionInterface.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HMasterRegionInterface.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HMasterRegionInterface.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2007 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,12 +19,12 @@
  */
 package org.apache.hadoop.hbase.ipc;
 
-import java.io.IOException;
-
-import org.apache.hadoop.io.MapWritable;
-import org.apache.hadoop.hbase.HServerInfo;
 import org.apache.hadoop.hbase.HMsg;
 import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HServerInfo;
+import org.apache.hadoop.io.MapWritable;
+
+import java.io.IOException;
 
 /**
  * HRegionServers interact with the HMasterRegionInterface to report on local 
@@ -39,8 +39,8 @@
 
   /**
    * Called when a region server first starts
-   * @param info
-   * @throws IOException
+   * @param info server info
+   * @throws IOException e
    * @return Configuration for the regionserver to use: e.g. filesystem,
    * hbase rootdir, etc.
    */
@@ -56,7 +56,7 @@
    * reporting server's most loaded regions. These are candidates for being
    * rebalanced.
    * @return instructions from the master to the region server
-   * @throws IOException
+   * @throws IOException e
    */
   public HMsg[] regionServerReport(HServerInfo info, HMsg msgs[], 
     HRegionInfo mostLoadedRegions[])

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2009 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,26 +19,25 @@
  */
 package org.apache.hadoop.hbase.ipc;
 
-import java.io.IOException;
-
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HServerInfo;
 import org.apache.hadoop.hbase.NotServingRegionException;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.MultiPut;
+import org.apache.hadoop.hbase.client.MultiPutResponse;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.client.MultiPutResponse;
-import org.apache.hadoop.hbase.client.MultiPut;
 import org.apache.hadoop.hbase.regionserver.HRegion;
 
+import java.io.IOException;
+
 /**
  * Clients interact with HRegionServers using a handle to the HRegionInterface.
  * 
  * <p>NOTE: if you change the interface, you must change the RPC version
  * number in HBaseRPCProtocolVersion
- * 
  */
 public interface HRegionInterface extends HBaseRPCProtocolVersion {
   /** 
@@ -46,7 +45,7 @@
    * 
    * @param regionName name of the region
    * @return HRegionInfo object for region
-   * @throws NotServingRegionException
+   * @throws NotServingRegionException e
    */
   public HRegionInfo getRegionInfo(final byte [] regionName)
   throws NotServingRegionException;
@@ -60,7 +59,7 @@
    * @param row row key
    * @param family Column family to look for row in.
    * @return map of values
-   * @throws IOException
+   * @throws IOException e
    */
   public Result getClosestRowBefore(final byte [] regionName,
     final byte [] row, final byte [] family)
@@ -77,7 +76,7 @@
    * @param regionName name of region to get from
    * @param get Get operation
    * @return Result
-   * @throws IOException
+   * @throws IOException e
    */
   public Result get(byte [] regionName, Get get) throws IOException;
 
@@ -86,15 +85,15 @@
    * @param regionName name of region to get from
    * @param get Get operation describing cell to test
    * @return true if exists
-   * @throws IOException
+   * @throws IOException e
    */
   public boolean exists(byte [] regionName, Get get) throws IOException;
 
   /**
    * Put data into the specified region 
-   * @param regionName
+   * @param regionName region name
    * @param put the data to be put
-   * @throws IOException
+   * @throws IOException e
    */
   public void put(final byte [] regionName, final Put put)
   throws IOException;
@@ -102,11 +101,11 @@
   /**
    * Put an array of puts into the specified region
    * 
-   * @param regionName
-   * @param puts
+   * @param regionName region name
+   * @param puts array of puts to execute
    * @return The number of processed put's.  Returns -1 if all Puts
    * processed successfully.
-   * @throws IOException
+   * @throws IOException e
    */
   public int put(final byte[] regionName, final Put [] puts)
   throws IOException;
@@ -115,9 +114,9 @@
    * Deletes all the KeyValues that match those found in the Delete object, 
    * if their ts <= to the Delete. In case of a delete with a specific ts it
    * only deletes that specific KeyValue.
-   * @param regionName
-   * @param delete
-   * @throws IOException
+   * @param regionName region name
+   * @param delete delete object
+   * @throws IOException e
    */
   public void delete(final byte[] regionName, final Delete delete)
   throws IOException;
@@ -125,26 +124,27 @@
   /**
    * Put an array of deletes into the specified region
    * 
-   * @param regionName
-   * @param deletes
+   * @param regionName region name
+   * @param deletes delete array to execute
    * @return The number of processed deletes.  Returns -1 if all Deletes
    * processed successfully.
-   * @throws IOException
+   * @throws IOException e
    */
   public int delete(final byte[] regionName, final Delete [] deletes)
   throws IOException;
 
   /**
    * Atomically checks if a row/family/qualifier value match the expectedValue.
-   * If it does, it adds the put.
+   * If it does, it adds the put. If passed expected value is null, then the
+   * check is for non-existance of the row/column.
    * 
-   * @param regionName
-   * @param row
-   * @param family
-   * @param qualifier
+   * @param regionName region name
+   * @param row row to check
+   * @param family column family
+   * @param qualifier column qualifier
    * @param value the expected value
-   * @param put
-   * @throws IOException
+   * @param put data to put if check succeeds
+   * @throws IOException e
    * @return true if the new put was execute, false otherwise
    */
   public boolean checkAndPut(final byte[] regionName, final byte [] row, 
@@ -154,16 +154,17 @@
   
   /**
    * Atomically increments a column value. If the column value isn't long-like,
-   * this could throw an exception.
+   * this could throw an exception. If passed expected value is null, then the
+   * check is for non-existance of the row/column.
    * 
-   * @param regionName
-   * @param row
-   * @param family
-   * @param qualifier
-   * @param amount
+   * @param regionName region name
+   * @param row row to check
+   * @param family column family
+   * @param qualifier column qualifier
+   * @param amount long amount to increment
    * @param writeToWAL whether to write the increment to the WAL
    * @return new incremented column value
-   * @throws IOException
+   * @throws IOException e
    */
   public long incrementColumnValue(byte [] regionName, byte [] row, 
       byte [] family, byte [] qualifier, long amount, boolean writeToWAL)
@@ -180,7 +181,7 @@
    * @param regionName name of region to scan
    * @param scan configured scan object
    * @return scannerId scanner identifier used in other calls
-   * @throws IOException
+   * @throws IOException e
    */
   public long openScanner(final byte [] regionName, final Scan scan)
   throws IOException;
@@ -189,7 +190,7 @@
    * Get the next set of values
    * @param scannerId clientId passed to openScanner
    * @return map of values; returns null if no results.
-   * @throws IOException
+   * @throws IOException e
    */
   public Result next(long scannerId) throws IOException;
   
@@ -200,7 +201,7 @@
    * @return Array of Results (map of values); array is empty if done with this
    * region and null if we are NOT to go to the next region (happens when a
    * filter rules that the scan is done).
-   * @throws IOException
+   * @throws IOException e
    */
   public Result [] next(long scannerId, int numberOfRows) throws IOException;
   
@@ -208,7 +209,7 @@
    * Close a scanner
    * 
    * @param scannerId the scanner id returned by openScanner
-   * @throws IOException
+   * @throws IOException e
    */
   public void close(long scannerId) throws IOException;
 
@@ -218,7 +219,7 @@
    * @param regionName name of region
    * @param row row to lock
    * @return lockId lock identifier
-   * @throws IOException
+   * @throws IOException e
    */
   public long lockRow(final byte [] regionName, final byte [] row)
   throws IOException;
@@ -226,9 +227,9 @@
   /**
    * Releases a remote row lock.
    *
-   * @param regionName
+   * @param regionName region name
    * @param lockId the lock id returned by lockRow
-   * @throws IOException
+   * @throws IOException e
    */
   public void unlockRow(final byte [] regionName, final long lockId)
   throws IOException;
@@ -237,14 +238,14 @@
   /**
    * Method used when a master is taking the place of another failed one.
    * @return All regions assigned on this region server
-   * @throws IOException
+   * @throws IOException e
    */
   public HRegionInfo[] getRegionsAssignment() throws IOException;
   
   /**
    * Method used when a master is taking the place of another failed one.
    * @return The HSI
-   * @throws IOException
+   * @throws IOException e
    */
   public HServerInfo getHServerInfo() throws IOException;
 
@@ -254,7 +255,7 @@
    *
    * @param puts the request
    * @return the reply
-   * @throws IOException
+   * @throws IOException e
    */
   public MultiPutResponse multiPut(MultiPut puts) throws IOException;
 

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/AddColumn.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/AddColumn.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/AddColumn.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/AddColumn.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,12 +19,12 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
 
+import java.io.IOException;
+
 /** Instantiated to add a column family to a table */
 class AddColumn extends ColumnOperation {
   private final HColumnDescriptor newColumn;

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/BaseScanner.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,13 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.fs.FileStatus;
@@ -52,6 +45,13 @@
 import org.apache.hadoop.io.BooleanWritable;
 import org.apache.hadoop.ipc.RemoteException;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 
 /**
  * Base HRegion scanner class. Holds utilty common to <code>ROOT</code> and

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ChangeTableState.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ChangeTableState.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ChangeTableState.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ChangeTableState.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,11 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.TreeMap;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.HRegionInfo;
@@ -32,6 +27,11 @@
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
 import org.apache.hadoop.hbase.util.Writables;
 
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.TreeMap;
+
 /**
  * Instantiated to enable or disable a table
  */

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ColumnOperation.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ColumnOperation.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ColumnOperation.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ColumnOperation.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,8 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.HRegionInfo;
@@ -29,6 +27,8 @@
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
 import org.apache.hadoop.hbase.util.Writables;
 
+import java.io.IOException;
+
 abstract class ColumnOperation extends TableOperation {
   private final Log LOG = LogFactory.getLog(this.getClass());
   

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/DeleteColumn.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/DeleteColumn.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/DeleteColumn.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/DeleteColumn.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,13 +19,13 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
 import org.apache.hadoop.hbase.regionserver.Store;
 
+import java.io.IOException;
+
 /** Instantiated to remove a column family from a table */
 class DeleteColumn extends ColumnOperation {
   private final byte [] columnName;

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2009 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,25 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-import java.io.File;
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.lang.reflect.Constructor;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.DelayQueue;
-import java.util.concurrent.PriorityBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -58,9 +39,9 @@
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.LocalHBaseCluster;
 import org.apache.hadoop.hbase.MasterNotRunningException;
+import org.apache.hadoop.hbase.MiniZooKeeperCluster;
 import org.apache.hadoop.hbase.RemoteExceptionHandler;
 import org.apache.hadoop.hbase.TableExistsException;
-import org.apache.hadoop.hbase.MiniZooKeeperCluster;
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.Result;
@@ -95,6 +76,25 @@
 import org.apache.zookeeper.Watcher.Event.EventType;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
 
+import java.io.File;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.lang.reflect.Constructor;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.DelayQueue;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * HMaster is the "master server" for HBase. An HBase cluster has one active
  * master.  If many masters are started, all compete.  Whichever wins goes on to

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/InvalidColumnNameException.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/InvalidColumnNameException.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/InvalidColumnNameException.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/InvalidColumnNameException.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2007 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/MetaRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/MetaRegion.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/MetaRegion.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/MetaRegion.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/MetaScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/MetaScanner.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/MetaScanner.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/MetaScanner.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,14 +19,14 @@
  */
 package org.apache.hadoop.hbase.master;
 
+import org.apache.hadoop.hbase.RemoteExceptionHandler;
+
 import java.io.IOException;
-import java.util.List;
 import java.util.ArrayList;
-import java.util.concurrent.TimeUnit;
+import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
-
-import org.apache.hadoop.hbase.RemoteExceptionHandler;
+import java.util.concurrent.TimeUnit;
 
 /**
  * MetaScanner <code>META</code> table.

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ModifyColumn.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ModifyColumn.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ModifyColumn.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ModifyColumn.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,11 +19,12 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
 import org.apache.hadoop.hbase.HColumnDescriptor;
+import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.HRegionInfo;
+
+import java.io.IOException;
 
 /** Instantiated to modify an existing column family on a table */
 class ModifyColumn extends ColumnOperation {

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ModifyTableMeta.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ModifyTableMeta.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ModifyTableMeta.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ModifyTableMeta.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,8 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.HRegionInfo;
@@ -31,6 +29,8 @@
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Writables;
 
+import java.io.IOException;
+
 /** Instantiated to modify table descriptor metadata */
 class ModifyTableMeta extends TableOperation {
 

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/NotAllMetaRegionsOnlineException.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/NotAllMetaRegionsOnlineException.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/NotAllMetaRegionsOnlineException.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/NotAllMetaRegionsOnlineException.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/OldLogsCleaner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/OldLogsCleaner.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/OldLogsCleaner.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/OldLogsCleaner.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2009 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,18 +19,18 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import org.apache.hadoop.hbase.Chore;
-import org.apache.hadoop.hbase.RemoteExceptionHandler;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileStatus;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.Chore;
+import org.apache.hadoop.hbase.RemoteExceptionHandler;
 
+import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.regex.Pattern;
-import java.io.IOException;
 
 /**
  * This Chore, everytime it runs, will clear the logs in the old logs folder

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,10 +19,10 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-
-import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.regionserver.HRegion;
+
+import java.io.IOException;
 
 /**
  * ProcessRegionClose is the way we do post-processing on a closed region. We

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,8 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HServerAddress;
 import org.apache.hadoop.hbase.HServerInfo;
@@ -28,6 +26,8 @@
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
 import org.apache.hadoop.hbase.util.Bytes;
 
+import java.io.IOException;
+
 /** 
  * ProcessRegionOpen is instantiated when a region server reports that it is
  * serving a region. This applies to all meta and user regions except the 

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionStatusChange.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionStatusChange.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionStatusChange.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessRegionStatusChange.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -23,17 +23,18 @@
 
 /**
  * Abstract class that performs common operations for 
- * @see #ProcessRegionClose and @see #ProcessRegionOpen
+ * @see ProcessRegionClose and @see ProcessRegionOpen
  */
 abstract class ProcessRegionStatusChange extends RegionServerOperation {
   protected final boolean isMetaTable;
   protected final HRegionInfo regionInfo;
+  @SuppressWarnings({"FieldCanBeLocal"})
   private volatile MetaRegion metaRegion = null;
   protected volatile byte[] metaRegionName = null;
 
   /**
-   * @param master
-   * @param regionInfo
+   * @param master the master
+   * @param regionInfo region info
    */
   public ProcessRegionStatusChange(HMaster master, HRegionInfo regionInfo) {
     super(master);

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2009 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,12 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HServerAddress;
@@ -33,10 +27,15 @@
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
-import org.apache.hadoop.hbase.regionserver.wal.HLog;
 import org.apache.hadoop.hbase.regionserver.HRegion;
+import org.apache.hadoop.hbase.regionserver.wal.HLog;
 import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.FSUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /** 
  * Instantiated when a server's lease has expired, meaning it has crashed.

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionManager.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,23 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -57,6 +40,23 @@
 import org.apache.hadoop.hbase.util.Threads;
 import org.apache.hadoop.hbase.util.Writables;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 /**
  * Class to manage assigning regions to servers, state of root and meta, etc.
  */ 

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionServerOperation.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionServerOperation.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionServerOperation.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RegionServerOperation.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,14 +19,14 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.util.concurrent.Delayed;
-import java.util.concurrent.TimeUnit;
-import java.io.IOException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.HConstants;
 
+import java.io.IOException;
+import java.util.concurrent.Delayed;
+import java.util.concurrent.TimeUnit;
+
 abstract class RegionServerOperation implements Delayed, HConstants {
   protected static final Log LOG = 
     LogFactory.getLog(RegionServerOperation.class.getName());

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RetryableMetaOperation.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RetryableMetaOperation.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RetryableMetaOperation.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RetryableMetaOperation.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -20,20 +20,20 @@
 
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.ipc.RemoteException;
 import org.apache.hadoop.hbase.RemoteExceptionHandler;
-import org.apache.hadoop.hbase.TableNotFoundException;
 import org.apache.hadoop.hbase.TableNotDisabledException;
+import org.apache.hadoop.hbase.TableNotFoundException;
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Sleeper;
+import org.apache.hadoop.ipc.RemoteException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Callable;
 
 /**
  * Uses Callable pattern so that operations against meta regions do not need

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RootScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RootScanner.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RootScanner.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/RootScanner.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,11 +19,11 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.RemoteExceptionHandler;
 
+import java.io.IOException;
+
 /** Scanner for the <code>ROOT</code> HRegion. */
 class RootScanner extends BaseScanner {
   /**

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,18 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -52,6 +40,18 @@
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.EventType;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * The ServerManager class manages info about region servers - HServerInfo, 
  * load numbers, dying servers, etc.

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/TableDelete.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/TableDelete.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/TableDelete.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/TableDelete.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,8 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.fs.Path;
@@ -31,6 +29,8 @@
 import org.apache.hadoop.hbase.regionserver.HRegion;
 import org.apache.hadoop.hbase.util.Bytes;
 
+import java.io.IOException;
+
 /** 
  * Instantiated to delete a table. Table must be offline.
  */

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/TableOperation.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/TableOperation.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/TableOperation.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/TableOperation.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,12 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
-
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HServerInfo;
@@ -36,6 +30,12 @@
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
 import org.apache.hadoop.hbase.util.Bytes;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
 /**
  * Abstract base class for operations that need to examine all HRegionInfo 
  * objects in a table. (For a table, operate on each of its rows

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ZKMasterAddressWatcher.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ZKMasterAddressWatcher.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ZKMasterAddressWatcher.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/master/ZKMasterAddressWatcher.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2009 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,8 +19,6 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.HServerAddress;
@@ -29,6 +27,8 @@
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.EventType;
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
 
 /**
  * ZooKeeper watcher for the master address.  Also watches the cluster state

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -29,7 +29,7 @@
 public interface ChangedReadersObserver {
   /**
    * Notify observers.
-   * @throws IOException
+   * @throws IOException e
    */
   void updateReaders() throws IOException;
 }
\ No newline at end of file

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/ColumnCount.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/ColumnCount.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/ColumnCount.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/ColumnCount.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2009 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2008 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,13 +19,6 @@
  */
 package org.apache.hadoop.hbase.regionserver;
 
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
@@ -37,6 +30,13 @@
 import org.apache.hadoop.hbase.util.Writables;
 import org.apache.hadoop.util.StringUtils;
 
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
 /** 
  * Compact region on request and then run split if appropriate
  */

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/DeleteCompare.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/DeleteCompare.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/DeleteCompare.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/DeleteCompare.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
-/*
- * Copyright 2009 The Apache Software Foundation
+/**
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/DeleteTracker.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/DeleteTracker.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/DeleteTracker.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/DeleteTracker.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
-/*
- * Copyright 2009 The Apache Software Foundation
+/**
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file

Modified: hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java?rev=920548&r1=920547&r2=920548&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java (original)
+++ hadoop/hbase/trunk/core/src/main/java/org/apache/hadoop/hbase/regionserver/FlushRequester.java Mon Mar  8 22:25:06 2010
@@ -1,5 +1,5 @@
 /**
- * Copyright 2007 The Apache Software Foundation
+ * Copyright 2010 The Apache Software Foundation
  *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file