hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r693597 [2/3] - in /hadoop/hbase/trunk: ./ src/java/org/apache/hadoop/hbase/ src/java/org/apache/hadoop/hbase/client/ src/java/org/apache/hadoop/hbase/client/transactional/ src/java/org/apache/hadoop/hbase/filter/ src/java/org/apache/hadoop...
Date Tue, 09 Sep 2008 20:36:53 GMT
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HMasterInterface.java Tue Sep  9 13:36:49 2008
@@ -110,6 +110,7 @@
    * 
    * @param tableName
    * @param desc
+   * @throws IOException
    */
   public void modifyTableMeta(byte[] tableName, HTableDescriptor desc)
     throws IOException;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HRegionInterface.java Tue Sep  9 13:36:49 2008
@@ -84,6 +84,8 @@
    * 
    * @param regionName region name
    * @param row row key
+   * @param columns columns to get
+   * @param ts time stamp
    * @param lockId lock id
    * @return map of values
    * @throws IOException
@@ -142,6 +144,7 @@
    * @param family The column family to match
    * @param timestamp Timestamp to match
    * @param lockId lock id
+   * @throws IOException
    */
   public void deleteFamily(byte [] regionName, byte [] row, byte [] family, 
     long timestamp, long lockId)
@@ -202,6 +205,7 @@
   /**
    * Releases a remote row lock.
    *
+   * @param regionName
    * @param lockId the lock id returned by lockRow
    * @throws IOException
    */

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HbaseRPC.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HbaseRPC.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HbaseRPC.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HbaseRPC.java Tue Sep  9 13:36:49 2008
@@ -88,25 +88,32 @@
   /** A method invocation, including the method name and its parameters.*/
   private static class Invocation implements Writable, Configurable {
     private String methodName;
+    @SuppressWarnings("unchecked")
     private Class[] parameterClasses;
     private Object[] parameters;
     private Configuration conf;
 
+    /** default constructor */
     public Invocation() {}
 
+    /**
+     * @param method
+     * @param parameters
+     */
     public Invocation(Method method, Object[] parameters) {
       this.methodName = method.getName();
       this.parameterClasses = method.getParameterTypes();
       this.parameters = parameters;
     }
 
-    /** The name of the method invoked. */
+    /** @return The name of the method invoked. */
     public String getMethodName() { return methodName; }
 
-    /** The parameter classes. */
+    /** @return The parameter classes. */
+    @SuppressWarnings("unchecked")
     public Class[] getParameterClasses() { return parameterClasses; }
 
-    /** The parameter instances. */
+    /** @return The parameter instances. */
     public Object[] getParameters() { return parameters; }
 
     public void readFields(DataInput in) throws IOException {
@@ -129,6 +136,7 @@
       }
     }
 
+    @Override
     public String toString() {
       StringBuffer buffer = new StringBuffer();
       buffer.append(methodName);
@@ -217,6 +225,12 @@
     private Client client;
     private boolean isClosed = false;
 
+    /**
+     * @param address
+     * @param ticket
+     * @param conf
+     * @param factory
+     */
     public Invoker(InetSocketAddress address, UserGroupInformation ticket, 
                    Configuration conf, SocketFactory factory) {
       this.address = address;
@@ -224,7 +238,8 @@
       this.client = CLIENTS.getClient(conf, factory);
     }
 
-    public Object invoke(Object proxy, Method method, Object[] args)
+    public Object invoke(@SuppressWarnings("unused") Object proxy,
+        Method method, Object[] args)
       throws Throwable {
       long startTime = System.currentTimeMillis();
       ObjectWritable value = (ObjectWritable)
@@ -246,6 +261,7 @@
   /**
    * A version mismatch for the RPC protocol.
    */
+  @SuppressWarnings("serial")
   public static class VersionMismatch extends IOException {
     private String interfaceName;
     private long clientVersion;
@@ -276,20 +292,30 @@
     }
     
     /**
-     * Get the client's preferred version
+     * @return the client's preferred version
      */
     public long getClientVersion() {
       return clientVersion;
     }
     
     /**
-     * Get the server's agreed to version.
+     * @return the server's agreed to version.
      */
     public long getServerVersion() {
       return serverVersion;
     }
   }
   
+  /**
+   * @param protocol
+   * @param clientVersion
+   * @param addr
+   * @param conf
+   * @param maxAttempts
+   * @return proxy
+   * @throws IOException
+   */
+  @SuppressWarnings("unchecked")
   public static VersionedProtocol waitForProxy(Class protocol,
                                                long clientVersion,
                                                InetSocketAddress addr,
@@ -319,16 +345,38 @@
       }
     }
   }
-  /** Construct a client-side proxy object that implements the named protocol,
-   * talking to a server at the named address. */
+
+  /**
+   * 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
+   * @return proxy
+   * @throws IOException
+   */
   public static VersionedProtocol getProxy(Class<?> protocol,
       long clientVersion, InetSocketAddress addr, Configuration conf,
       SocketFactory factory) throws IOException {
     return getProxy(protocol, clientVersion, addr, null, conf, factory);
   }
   
-  /** Construct a client-side proxy object that implements the named protocol,
-   * talking to a server at the named address. */
+  /**
+   * 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
+   * @return proxy
+   * @throws IOException
+   */
   public static VersionedProtocol getProxy(Class<?> protocol,
       long clientVersion, InetSocketAddress addr, UserGroupInformation ticket,
       Configuration conf, SocketFactory factory) throws IOException {    
@@ -375,7 +423,16 @@
     }
   }
 
-  /** Expert: Make multiple, parallel calls to a set of servers. */
+  /**
+   * Expert: Make multiple, parallel calls to a set of servers.
+   *
+   * @param method
+   * @param params
+   * @param addrs
+   * @param conf
+   * @return values
+   * @throws IOException
+   */
   public static Object[] call(Method method, Object[][] params,
                               InetSocketAddress[] addrs, Configuration conf)
     throws IOException {
@@ -403,15 +460,35 @@
     }
   }
 
-  /** Construct a server for a protocol implementation instance listening on a
-   * port and address. */
+  /**
+   * Construct a server for a protocol implementation instance listening on a
+   * port and address.
+   *
+   * @param instance
+   * @param bindAddress
+   * @param port
+   * @param conf
+   * @return Server
+   * @throws IOException
+   */
   public static Server getServer(final Object instance, final String bindAddress, final int port, Configuration conf) 
     throws IOException {
     return getServer(instance, bindAddress, port, 1, false, conf);
   }
 
-  /** Construct a server for a protocol implementation instance listening on a
-   * port and address. */
+  /**
+   * 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
+   * @return Server
+   * @throws IOException
+   */
   public static Server getServer(final Object instance, final String bindAddress, final int port,
                                  final int numHandlers,
                                  final boolean verbose, Configuration conf) 
@@ -425,11 +502,13 @@
     private Class<?> implementation;
     private boolean verbose;
 
-    /** Construct an RPC server.
+    /**
+     * Construct an RPC server.
      * @param instance the instance whose methods will be called
      * @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
      */
     public Server(Object instance, Configuration conf, String bindAddress, int port) 
       throws IOException {
@@ -451,6 +530,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
      */
     public Server(Object instance, Configuration conf, String bindAddress,  int port,
                   int numHandlers, boolean verbose) throws IOException {
@@ -460,6 +540,7 @@
       this.verbose = verbose;
     }
 
+    @Override
     public Writable call(Writable param, long receivedTime) throws IOException {
       try {
         Invocation call = (Invocation)param;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/TransactionalRegionInterface.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/TransactionalRegionInterface.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/TransactionalRegionInterface.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/TransactionalRegionInterface.java Tue Sep  9 13:36:49 2008
@@ -25,6 +25,7 @@
    * 
    * @param transactionId
    * @param regionName name of region
+   * @throws IOException
    */
   public void beginTransaction(long transactionId, final byte[] regionName)
       throws IOException;
@@ -32,7 +33,8 @@
   /**
    * Retrieve a single value from the specified region for the specified row and
    * column keys
-   * 
+   *
+   * @param transactionId
    * @param regionName name of region
    * @param row row key
    * @param column column key
@@ -45,6 +47,7 @@
   /**
    * Get the specified number of versions of the specified row and column
    * 
+   * @param transactionId
    * @param regionName region name
    * @param row row key
    * @param column column key
@@ -60,6 +63,7 @@
    * Get the specified number of versions of the specified row and column with
    * the specified timestamp.
    * 
+   * @param transactionId
    * @param regionName region name
    * @param row row key
    * @param column column key
@@ -75,8 +79,10 @@
   /**
    * Get all the data for the specified row at a given timestamp
    * 
+   * @param transactionId
    * @param regionName region name
    * @param row row key
+   * @param ts timestamp
    * @return map of values
    * @throws IOException
    */
@@ -86,8 +92,11 @@
   /**
    * Get selected columns for the specified row at a given timestamp.
    * 
+   * @param transactionId
    * @param regionName region name
    * @param row row key
+   * @param columns colums to get
+   * @param ts timestamp
    * @return map of values
    * @throws IOException
    */
@@ -98,8 +107,10 @@
   /**
    * Get selected columns for the specified row at the latest timestamp.
    * 
+   * @param transactionId
    * @param regionName region name
    * @param row row key
+   * @param columns columns to get
    * @return map of values
    * @throws IOException
    */
@@ -110,6 +121,7 @@
    * Delete all cells that match the passed row and whose timestamp is equal-to
    * or older than the passed timestamp.
    * 
+   * @param transactionId
    * @param regionName region name
    * @param row row key
    * @param timestamp Delete all entries that have this timestamp or older
@@ -142,6 +154,7 @@
   /**
    * Applies a batch of updates via one RPC
    * 
+   * @param transactionId
    * @param regionName name of the region to update
    * @param b BatchUpdate
    * @throws IOException
@@ -151,25 +164,31 @@
 
   /**
    * Ask if we can commit the given transaction.
-   * 
+   *
+   * @param regionName
    * @param transactionId
    * @return true if we can commit
+   * @throws IOException
    */
   public boolean commitRequest(final byte[] regionName, long transactionId)
       throws IOException;
 
   /**
    * Commit the transaction.
-   * 
+   *
+   * @param regionName
    * @param transactionId
+   * @throws IOException
    */
   public void commit(final byte[] regionName, long transactionId)
       throws IOException;
 
   /**
    * Abort the transaction.
-   * 
+   *
+   * @param regionName
    * @param transactionId
+   * @throws IOException
    */
   public void abort(final byte[] regionName, long transactionId)
       throws IOException;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/GroupingTableMap.java Tue Sep  9 13:36:49 2008
@@ -67,7 +67,6 @@
     job.set(GROUP_COLUMNS, groupColumns);
   }
 
-  /** {@inheritDoc} */
   @Override
   public void configure(JobConf job) {
     super.configure(job);

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IdentityTableReduce.java Tue Sep  9 13:36:49 2008
@@ -32,6 +32,7 @@
  * Write to table each key, record pair
  */
 public class IdentityTableReduce extends TableReduce<ImmutableBytesWritable, BatchUpdate> {
+  @SuppressWarnings("unused")
   private static final Log LOG =
     LogFactory.getLog(IdentityTableReduce.class.getName());
   

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexOutputFormat.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexOutputFormat.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexOutputFormat.java Tue Sep  9 13:36:49 2008
@@ -45,7 +45,6 @@
     FileOutputFormat<ImmutableBytesWritable, LuceneDocumentWrapper> {
   static final Log LOG = LogFactory.getLog(IndexOutputFormat.class);
 
-  /** {@inheritDoc} */
   @Override
   public RecordWriter<ImmutableBytesWritable, LuceneDocumentWrapper>
   getRecordWriter(final FileSystem fs, JobConf job, String name,

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/IndexTableReduce.java Tue Sep  9 13:36:49 2008
@@ -23,7 +23,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HConstants;      //TODO: remove
 import org.apache.hadoop.hbase.io.Cell;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.io.RowResult;
@@ -47,6 +47,7 @@
 
   private IndexConfiguration indexConf;
 
+  @Override
   public void configure(JobConf job) {
     super.configure(job);
     indexConf = new IndexConfiguration();
@@ -59,13 +60,14 @@
     }
   }
 
+  @Override
   public void close() throws IOException {
     super.close();
   }
 
   public void reduce(ImmutableBytesWritable key, Iterator<RowResult> values,
       OutputCollector<ImmutableBytesWritable, LuceneDocumentWrapper> output,
-      Reporter reporter)
+      @SuppressWarnings("unused") Reporter reporter)
   throws IOException {
     if (!values.hasNext()) {
       return;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/LuceneDocumentWrapper.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/LuceneDocumentWrapper.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/LuceneDocumentWrapper.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/LuceneDocumentWrapper.java Tue Sep  9 13:36:49 2008
@@ -21,7 +21,7 @@
 
 import java.io.DataInput;
 import java.io.DataOutput;
-import java.io.IOException;
+import java.io.IOException;                             //TODO: remove
 
 import org.apache.hadoop.io.Writable;
 import org.apache.lucene.document.Document;
@@ -33,19 +33,25 @@
 class LuceneDocumentWrapper implements Writable {
   private Document doc;
 
+  /**
+   * @param doc
+   */
   public LuceneDocumentWrapper(Document doc) {
     this.doc = doc;
   }
 
+  /**
+   * @return the document
+   */
   public Document get() {
     return doc;
   }
 
-  public void readFields(DataInput in) throws IOException {
+  public void readFields(@SuppressWarnings("unused") DataInput in) {
     // intentionally left blank
   }
 
-  public void write(DataOutput out) throws IOException {
+  public void write(@SuppressWarnings("unused") DataOutput out) {
     // intentionally left blank
   }
 }

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/RowCounter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/RowCounter.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/RowCounter.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/RowCounter.java Tue Sep  9 13:36:49 2008
@@ -74,6 +74,11 @@
     output.collect(row, EMPTY_RESULT_VALUE);
   }
 
+  /**
+   * @param args
+   * @return the JobConf
+   * @throws IOException
+   */
   @SuppressWarnings({ "unused", "deprecation" })
   public JobConf createSubmittableJob(String[] args) throws IOException {
     JobConf c = new JobConf(getConf(), RowCounter.class);
@@ -120,6 +125,10 @@
     this.conf = c;
   }
 
+  /**
+   * @param args
+   * @throws Exception
+   */
   public static void main(String[] args) throws Exception {
     HBaseConfiguration c = new HBaseConfiguration();
     int errCode = ToolRunner.run(c, new RowCounter(), args);

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableInputFormat.java Tue Sep  9 13:36:49 2008
@@ -46,7 +46,6 @@
    */
   public static final String COLUMN_LIST = "hbase.mapred.tablecolumns";
 
-  /** {@inheritDoc} */
   public void configure(JobConf job) {
     Path[] tableNames = FileInputFormat.getInputPaths(job);
     String colArg = job.get(COLUMN_LIST);
@@ -63,7 +62,7 @@
     }
   }
 
-  /** {@inheritDoc} */
+  @SuppressWarnings("deprecation")
   public void validateInput(JobConf job) throws IOException {
     // expecting exactly one path
     Path [] tableNames = FileInputFormat.getInputPaths(job);

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableInputFormatBase.java Tue Sep  9 13:36:49 2008
@@ -96,6 +96,7 @@
     /**
      * Restart from survivable exceptions by creating a new scanner.
      *
+     * @param firstRow
      * @throws IOException
      */
     public void restart(byte[] firstRow) throws IOException {
@@ -163,8 +164,7 @@
       this.trrRowFilter = rowFilter;
     }
 
-    /** {@inheritDoc} */
-    public void close() throws IOException {
+    public void close() {
       this.scanner.close();
     }
 
@@ -186,14 +186,12 @@
       return new RowResult();
     }
 
-    /** {@inheritDoc} */
     public long getPos() {
       // This should be the ordinal tuple in the range;
       // not clear how to calculate...
       return 0;
     }
 
-    /** {@inheritDoc} */
     public float getProgress() {
       // Depends on the total number of tuples and getPos
       return 0;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableMap.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableMap.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableMap.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableMap.java Tue Sep  9 13:36:49 2008
@@ -49,6 +49,8 @@
    * @param table table name
    * @param columns columns to scan
    * @param mapper mapper class
+   * @param outputKeyClass
+   * @param outputValueClass
    * @param job job configuration
    */
   public static void initJob(String table, String columns,

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java Tue Sep  9 13:36:49 2008
@@ -63,19 +63,16 @@
       m_table = table;
     }
 
-    /** {@inheritDoc} */
     public void close(@SuppressWarnings("unused") Reporter reporter) {
       // Nothing to do.
     }
 
-    /** {@inheritDoc} */
     public void write(@SuppressWarnings("unused") ImmutableBytesWritable key,
         BatchUpdate value) throws IOException {
       m_table.commit(value);
     }
   }
   
-  /** {@inheritDoc} */
   @Override
   @SuppressWarnings("unchecked")
   public RecordWriter getRecordWriter(
@@ -97,7 +94,6 @@
     return new TableRecordWriter(table);
   }
 
-  /** {@inheritDoc} */
   @Override
   @SuppressWarnings("unused")
   public void checkOutputSpecs(FileSystem ignored, JobConf job)

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableReduce.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableReduce.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableReduce.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableReduce.java Tue Sep  9 13:36:49 2008
@@ -34,6 +34,9 @@
 
 /**
  * Write a table, sorting by the input key
+ *
+ * @param <K> key class
+ * @param <V> value class
  */
 @SuppressWarnings("unchecked")
 public abstract class TableReduce<K extends WritableComparable, V extends Writable>

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableSplit.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableSplit.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableSplit.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/mapred/TableSplit.java Tue Sep  9 13:36:49 2008
@@ -68,33 +68,28 @@
     return m_endRow;
   }
 
-  /** {@inheritDoc} */
   public long getLength() {
     // Not clear how to obtain this... seems to be used only for sorting splits
     return 0;
   }
 
-  /** {@inheritDoc} */
   public String[] getLocations() {
     // Return a random node from the cluster for now
     return new String[] { };
   }
 
-  /** {@inheritDoc} */
   public void readFields(DataInput in) throws IOException {
     this.m_tableName = Bytes.readByteArray(in);
     this.m_startRow = Bytes.readByteArray(in);
     this.m_endRow = Bytes.readByteArray(in);
   }
 
-  /** {@inheritDoc} */
   public void write(DataOutput out) throws IOException {
     Bytes.writeByteArray(out, this.m_tableName);
     Bytes.writeByteArray(out, this.m_startRow);
     Bytes.writeByteArray(out, this.m_endRow);
   }
 
-  /** {@inheritDoc} */
   @Override
   public String toString() {
     return Bytes.toString(m_tableName) +"," + Bytes.toString(m_startRow) +

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/DeleteColumn.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/DeleteColumn.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/DeleteColumn.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/DeleteColumn.java Tue Sep  9 13:36:49 2008
@@ -22,9 +22,9 @@
 import java.io.IOException;
 
 import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FileSystem;                 //TODO: remove
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.regionserver.HStoreFile;
+import org.apache.hadoop.hbase.regionserver.HStoreFile; //TODO: remove
 import org.apache.hadoop.hbase.util.FSUtils;
 import org.apache.hadoop.hbase.ipc.HRegionInterface;
 

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/HMaster.java Tue Sep  9 13:36:49 2008
@@ -80,7 +80,6 @@
   
   static final Log LOG = LogFactory.getLog(HMaster.class.getName());
 
-  /** {@inheritDoc} */
   public long getProtocolVersion(String protocol,
       @SuppressWarnings("unused") long clientVersion)
   throws IOException {
@@ -525,7 +524,6 @@
    * HMasterRegionInterface
    */
 
-  /** {@inheritDoc} */
   @SuppressWarnings("unused")
   public MapWritable regionServerStartup(HServerInfo serverInfo)
   throws IOException {
@@ -560,7 +558,6 @@
     return mw;
   }
 
-  /** {@inheritDoc} */
   public HMsg[] regionServerReport(HServerInfo serverInfo, HMsg msgs[], 
     HRegionInfo[] mostLoadedRegions)
   throws IOException {
@@ -572,18 +569,15 @@
    * HMasterInterface
    */
 
-  /** {@inheritDoc} */
   public boolean isMasterRunning() {
     return !closed.get();
   }
 
-  /** {@inheritDoc} */
   public void shutdown() {
     LOG.info("Cluster shutdown requested. Starting to quiesce servers");
     this.shutdownRequested = true;
   }
 
-  /** {@inheritDoc} */
   public void createTable(HTableDescriptor desc)
   throws IOException {    
     if (!isMasterRunning()) {
@@ -640,7 +634,6 @@
     regionManager.createRegion(newRegion, srvr, metaRegionName);
   }
 
-  /** {@inheritDoc} */
   public void deleteTable(final byte [] tableName) throws IOException {
     if (Bytes.equals(tableName, ROOT_TABLE_NAME)) {
       throw new IOException("Can't delete root table");
@@ -649,26 +642,22 @@
     LOG.info("deleted table: " + Bytes.toString(tableName));
   }
 
-  /** {@inheritDoc} */
   public void addColumn(byte [] tableName, HColumnDescriptor column)
   throws IOException {    
     new AddColumn(this, tableName, column).process();
   }
 
-  /** {@inheritDoc} */
   public void modifyColumn(byte [] tableName, byte [] columnName, 
     HColumnDescriptor descriptor)
   throws IOException {
     new ModifyColumn(this, tableName, columnName, descriptor).process();
   }
 
-  /** {@inheritDoc} */
   public void deleteColumn(final byte [] tableName, final byte [] c)
   throws IOException {
     new DeleteColumn(this, tableName, HStoreKey.getFamily(c)).process();
   }
 
-  /** {@inheritDoc} */
   public void enableTable(final byte [] tableName) throws IOException {
     if (Bytes.equals(tableName, ROOT_TABLE_NAME)) {
       throw new IOException("Can't enable root table");
@@ -676,7 +665,6 @@
     new ChangeTableState(this, tableName, true).process();
   }
 
-  /** {@inheritDoc} */
   public void disableTable(final byte [] tableName) throws IOException {
     if (Bytes.equals(tableName, ROOT_TABLE_NAME)) {
       throw new IOException("Can't disable root table");
@@ -684,14 +672,12 @@
     new ChangeTableState(this, tableName, false).process();
   }
 
-  /** {@inheritDoc} */
   public void modifyTableMeta(final byte[] tableName, HTableDescriptor desc)
     throws IOException
   {
     new ModifyTableMeta(this, tableName, desc).process();
   }
 
-  /** {@inheritDoc} */
   public HServerAddress findRootRegion() {
     return regionManager.getRootRegionLocation();
   }

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/MetaRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/MetaRegion.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/MetaRegion.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/MetaRegion.java Tue Sep  9 13:36:49 2008
@@ -49,7 +49,6 @@
     this.startKey = startKey;
   }
   
-  /** {@inheritDoc} */
   @Override
   public String toString() {
     return "{regionname: " + Bytes.toString(this.regionName) +
@@ -72,13 +71,11 @@
     return startKey;
   }
 
-  /** {@inheritDoc} */
   @Override
   public boolean equals(Object o) {
     return o instanceof MetaRegion && this.compareTo((MetaRegion)o) == 0;
   }
 
-  /** {@inheritDoc} */
   @Override
   public int hashCode() {
     int result = this.regionName.hashCode();
@@ -88,7 +85,6 @@
 
   // Comparable
 
-  /** {@inheritDoc} */
   public int compareTo(MetaRegion other) {
     int result = Bytes.compareTo(this.regionName, other.getRegionName());
     if(result == 0) {

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/MetaScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/MetaScanner.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/MetaScanner.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/MetaScanner.java Tue Sep  9 13:36:49 2008
@@ -45,7 +45,12 @@
   private final List<MetaRegion> metaRegionsToRescan =
     new ArrayList<MetaRegion>();
     
-  /** Constructor */
+  /**
+   * Constructor
+   * 
+   * @param master
+   * @param regionManager
+   */
   public MetaScanner(HMaster master, RegionManager regionManager) {
     super(master, regionManager, false, master.metaRescanInterval, master.closed);
   }

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ModifyColumn.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ModifyColumn.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ModifyColumn.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ModifyColumn.java Tue Sep  9 13:36:49 2008
@@ -19,7 +19,7 @@
  */
 package org.apache.hadoop.hbase.master;
 
-import java.util.Map;
+import java.util.Map;                                   //TODO: remove
 import java.io.IOException;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.ipc.HRegionInterface;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java Tue Sep  9 13:36:49 2008
@@ -48,7 +48,6 @@
    this.offlineRegion = offlineRegion;
   }
 
-  /** {@inheritDoc} */
   @Override
   public String toString() {
     return "ProcessRegionClose of " + this.regionInfo.getRegionNameAsString() +

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionOpen.java Tue Sep  9 13:36:49 2008
@@ -52,7 +52,6 @@
     this.startCode = Bytes.toBytes(info.getStartCode());
   }
 
-  /** {@inheritDoc} */
   @Override
   public String toString() {
     return "PendingOpenOperation from " + serverAddress.toString();

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java Tue Sep  9 13:36:49 2008
@@ -20,7 +20,7 @@
 package org.apache.hadoop.hbase.master;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.io.UnsupportedEncodingException;    //TODO: remove
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -81,7 +81,6 @@
     this.oldLogDir = new Path(master.rootdir, dirName.toString());
   }
 
-  /** {@inheritDoc} */
   @Override
   public String toString() {
     return "ProcessServerShutdown of " + this.deadServer.toString();
@@ -191,7 +190,6 @@
       super(m, master);
     }
 
-    /** {@inheritDoc} */
     public Boolean call() throws IOException {
       if (LOG.isDebugEnabled()) {
         LOG.debug("process server shutdown scanning root region on " +
@@ -211,7 +209,6 @@
       super(m, master);
     }
     
-    /** {@inheritDoc} */
     public Boolean call() throws IOException {
       if (LOG.isDebugEnabled()) {
         LOG.debug("process server shutdown scanning " + m.getRegionName() +

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionServerOperation.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionServerOperation.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionServerOperation.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionServerOperation.java Tue Sep  9 13:36:49 2008
@@ -43,13 +43,11 @@
     this.expire = System.currentTimeMillis() + this.master.leaseTimeout / 2;
   }
   
-  /** {@inheritDoc} */
   public long getDelay(TimeUnit unit) {
     return unit.convert(this.expire - System.currentTimeMillis(),
       TimeUnit.MILLISECONDS);
   }
   
-  /** {@inheritDoc} */
   public int compareTo(Delayed o) {
     return Long.valueOf(getDelay(TimeUnit.MILLISECONDS)
         - o.getDelay(TimeUnit.MILLISECONDS)).intValue();

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RootScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RootScanner.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RootScanner.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RootScanner.java Tue Sep  9 13:36:49 2008
@@ -26,7 +26,12 @@
 
 /** Scanner for the <code>ROOT</code> HRegion. */
 class RootScanner extends BaseScanner {
-  /** Constructor */
+  /**
+   * Constructor
+   * 
+   * @param master
+   * @param regionManager
+   */
   public RootScanner(HMaster master, RegionManager regionManager) {
     super(master, regionManager, true, master.metaRescanInterval, master.closed);
   }

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java Tue Sep  9 13:36:49 2008
@@ -461,7 +461,8 @@
     }
   }
   
-  private void processRegionClose(HServerInfo serverInfo, HRegionInfo region) {
+  private void processRegionClose(
+      @SuppressWarnings("unused") HServerInfo serverInfo, HRegionInfo region) {
     if (region.isRootRegion()) {
       // Root region
       if (region.isOffline()) {
@@ -665,7 +666,6 @@
       this.server = server;
     }
 
-    /** {@inheritDoc} */
     public void leaseExpired() {
       LOG.info(server + " lease expired");
       // Remove the server from the known servers list and update load info

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableOperation.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableOperation.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableOperation.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/TableOperation.java Tue Sep  9 13:36:49 2008
@@ -72,7 +72,6 @@
       super(m, master);
     }
 
-    /** {@inheritDoc} */
     public Boolean call() throws IOException {
       boolean tableExists = false;
 

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/BeforeThisStoreKey.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/BeforeThisStoreKey.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/BeforeThisStoreKey.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/BeforeThisStoreKey.java Tue Sep  9 13:36:49 2008
@@ -57,62 +57,77 @@
     return false;
   }
 
+  @Override
   public byte[] getColumn() {
     return this.beforeThisKey.getColumn();
   }
 
+  @Override
   public byte[] getRow() {
     return this.beforeThisKey.getRow();
   }
 
+  @Override
   public long getSize() {
     return this.beforeThisKey.getSize();
   }
 
+  @Override
   public long getTimestamp() {
     return this.beforeThisKey.getTimestamp();
   }
 
+  @Override
   public int hashCode() {
     return this.beforeThisKey.hashCode();
   }
 
+  @Override
   public boolean matchesRowCol(HStoreKey other) {
     return this.beforeThisKey.matchesRowCol(other);
   }
 
+  @Override
   public boolean matchesRowFamily(HStoreKey that) {
     return this.beforeThisKey.matchesRowFamily(that);
   }
 
+  @Override
   public boolean matchesWithoutColumn(HStoreKey other) {
     return this.beforeThisKey.matchesWithoutColumn(other);
   }
 
+  @Override
   public void readFields(DataInput in) throws IOException {
     this.beforeThisKey.readFields(in);
   }
 
+  @Override
   public void set(HStoreKey k) {
     this.beforeThisKey.set(k);
   }
 
+  @Override
   public void setColumn(byte[] c) {
     this.beforeThisKey.setColumn(c);
   }
 
+  @Override
   public void setRow(byte[] newrow) {
     this.beforeThisKey.setRow(newrow);
   }
 
+  @Override
   public void setVersion(long timestamp) {
     this.beforeThisKey.setVersion(timestamp);
   }
 
+  @Override
   public String toString() {
     return this.beforeThisKey.toString();
   }
 
+  @Override
   public void write(DataOutput out) throws IOException {
     this.beforeThisKey.write(out);
   }

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/ChangedReadersObserver.java Tue Sep  9 13:36:49 2008
@@ -29,6 +29,7 @@
 public interface ChangedReadersObserver {
   /**
    * Notify observers.
+   * @throws IOException
    */
   void updateReaders() throws IOException;
 }
\ No newline at end of file

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java Tue Sep  9 13:36:49 2008
@@ -67,7 +67,6 @@
       20 * 1000);
   }
   
-  /** {@inheritDoc} */
   @Override
   public void run() {
     while (!server.isStopRequested()) {

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Flusher.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Flusher.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Flusher.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Flusher.java Tue Sep  9 13:36:49 2008
@@ -77,7 +77,6 @@
         globalMemcacheLimit / 2);        
   }
   
-  /** {@inheritDoc} */
   @Override
   public void run() {
     while (!server.isStopRequested()) {
@@ -109,7 +108,6 @@
     LOG.info(getName() + " exiting");
   }
   
-  /** {@inheritDoc} */
   public void request(HRegion r) {
     addRegion(r, System.currentTimeMillis());
   }
@@ -233,7 +231,8 @@
    * @param r Region to add.
    * @param now The 'now' to use.  Set last flush time to this value.
    */
-  private void addRegion(final HRegion r, final long now) {
+  private void addRegion(final HRegion r,
+      @SuppressWarnings("unused") final long now) {
     synchronized (regionsInQueue) {
       if (!regionsInQueue.contains(r)) {
         regionsInQueue.add(r);

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HAbstractScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HAbstractScanner.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HAbstractScanner.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HAbstractScanner.java Tue Sep  9 13:36:49 2008
@@ -172,17 +172,14 @@
     return false;
   }
 
-  /** {@inheritDoc} */
   public boolean isWildcardScanner() {
     return this.wildcardMatch;
   }
   
-  /** {@inheritDoc} */
   public boolean isMultipleMatchScanner() {
     return this.multipleMatchers;
   }
 
-  /** {@inheritDoc} */
   public abstract boolean next(HStoreKey key, SortedMap<byte [], Cell> results)
   throws IOException;
   

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLog.java Tue Sep  9 13:36:49 2008
@@ -205,6 +205,9 @@
     }
   }
   
+  /**
+   * @return log sequence number
+   */
   public long getSequenceNumber() {
     return logSeqNum;
   }
@@ -565,6 +568,10 @@
     this.cacheFlushLock.unlock();
   }
 
+  /**
+   * @param column
+   * @return true if the column is a meta column
+   */
   public static boolean isMetaColumn(byte [] column) {
     return Bytes.equals(METACOLUMN, column);
   }

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLogEdit.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLogEdit.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLogEdit.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLogEdit.java Tue Sep  9 13:36:49 2008
@@ -64,8 +64,16 @@
     return (value == null)? false: deleteBytes.compareTo(value) == 0;
   }
   
+  /** If transactional log entry, these are the op codes */
   public enum TransactionalOperation {
-    START, WRITE, COMMIT, ABORT
+    /** start transaction */
+    START,
+    /** Equivalent to append in non-transactional environment */
+    WRITE,
+    /** Transaction commit entry */
+    COMMIT,
+    /** Abort transaction entry */
+    ABORT
   }
 
   private byte [] column;
@@ -139,7 +147,8 @@
   public long getTimestamp() {
     return this.timestamp;
   }
-  
+
+  /** @return true if entry is a transactional entry */
   public boolean isTransactionEntry() {
     return isTransactionEntry;
   }
@@ -188,7 +197,6 @@
   
   // Writable
 
-  /** {@inheritDoc} */
   public void write(DataOutput out) throws IOException {
     Bytes.writeByteArray(out, this.column);
     if (this.val == null) {
@@ -205,7 +213,6 @@
     }
   }
   
-  /** {@inheritDoc} */
   public void readFields(DataInput in) throws IOException {
     this.column = Bytes.readByteArray(in);
     this.val = new byte[in.readInt()];

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLogKey.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLogKey.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLogKey.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HLogKey.java Tue Sep  9 13:36:49 2008
@@ -66,42 +66,37 @@
   // A bunch of accessors
   //////////////////////////////////////////////////////////////////////////////
 
+  /** @return region name */
   public byte [] getRegionName() {
     return regionName;
   }
   
+  /** @return table name */
   public byte [] getTablename() {
     return tablename;
   }
   
+  /** @return row key */
   public byte [] getRow() {
     return row;
   }
   
+  /** @return log sequence number */
   public long getLogSeqNum() {
     return logSeqNum;
   }
   
-  /**
-   * {@inheritDoc}
-   */
   @Override
   public String toString() {
     return Bytes.toString(tablename) + "/" + Bytes.toString(regionName) + "/" +
       Bytes.toString(row) + "/" + logSeqNum;
   }
   
-  /**
-   * {@inheritDoc}
-   */
   @Override
   public boolean equals(Object obj) {
     return compareTo(obj) == 0;
   }
   
-  /**
-   * {@inheritDoc}
-   */
   @Override
   public int hashCode() {
     int result = this.regionName.hashCode();
@@ -114,9 +109,6 @@
   // Comparable
   //
 
-  /**
-   * {@inheritDoc}
-   */
   public int compareTo(Object o) {
     HLogKey other = (HLogKey) o;
     int result = Bytes.compareTo(this.regionName, other.regionName);
@@ -141,9 +133,6 @@
   // Writable
   //
 
-  /**
-   * {@inheritDoc}
-   */
   public void write(DataOutput out) throws IOException {
     Bytes.writeByteArray(out, this.regionName);
     Bytes.writeByteArray(out, this.tablename);
@@ -151,9 +140,6 @@
     out.writeLong(logSeqNum);
   }
   
-  /**
-   * {@inheritDoc}
-   */
   public void readFields(DataInput in) throws IOException {
     this.regionName = Bytes.readByteArray(in);
     this.tablename = Bytes.readByteArray(in);

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java Tue Sep  9 13:36:49 2008
@@ -1891,19 +1891,16 @@
     }
   }
   
-  /** {@inheritDoc} */
   @Override
   public boolean equals(Object o) {
     return this.hashCode() == ((HRegion)o).hashCode();
   }
   
-  /** {@inheritDoc} */
   @Override
   public int hashCode() {
     return this.regionInfo.getRegionName().hashCode();
   }
   
-  /** {@inheritDoc} */
   @Override
   public String toString() {
     return this.regionInfo.getRegionNameAsString();
@@ -1979,7 +1976,6 @@
       activeScannerCount.incrementAndGet();
     }
 
-    /** {@inheritDoc} */
     @SuppressWarnings("null")
     public boolean next(HStoreKey key, SortedMap<byte [], Cell> results)
     throws IOException {
@@ -2097,9 +2093,6 @@
       }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public void close() {
       try {
         for(int i = 0; i < scanners.length; i++) {
@@ -2123,12 +2116,10 @@
       }
     }
 
-    /** {@inheritDoc} */
     public boolean isWildcardScanner() {
       throw new UnsupportedOperationException("Unimplemented on HScanner");
     }
 
-    /** {@inheritDoc} */
     public boolean isMultipleMatchScanner() {
       throw new UnsupportedOperationException("Unimplemented on HScanner");
     }  

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Sep  9 13:36:49 2008
@@ -179,7 +179,6 @@
       this.instance = instance;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void run() {
       LOG.info("Starting shutdown thread.");
@@ -798,7 +797,6 @@
       }
     }
     
-    /** {@inheritDoc} */
     public void run() {
       try {
         while(!stopRequested.get()) {
@@ -1002,14 +1000,12 @@
   // HRegionInterface
   //
 
-  /** {@inheritDoc} */
   public HRegionInfo getRegionInfo(final byte [] regionName)
   throws NotServingRegionException {
     requestCount.incrementAndGet();
     return getRegion(regionName).getRegionInfo();
   }
 
-  /** {@inheritDoc} */
   public Cell[] get(final byte [] regionName, final byte [] row,
     final byte [] column, final long timestamp, final int numVersions) 
   throws IOException {
@@ -1023,7 +1019,6 @@
     }
   }
 
-  /** {@inheritDoc} */
   public RowResult getRow(final byte [] regionName, final byte [] row, 
     final byte [][] columns, final long ts, final long lockId)
   throws IOException {
@@ -1050,7 +1045,6 @@
     }
   }
 
-  /** {@inheritDoc} */
   public RowResult getClosestRowBefore(final byte [] regionName, 
     final byte [] row)
   throws IOException {
@@ -1068,7 +1062,6 @@
     }
   }
 
-  /** {@inheritDoc} */
   public RowResult next(final long scannerId) throws IOException {
     checkOpen();
     requestCount.incrementAndGet();
@@ -1103,7 +1096,6 @@
     }
   }
 
-  /** {@inheritDoc} */
   public void batchUpdate(final byte [] regionName, BatchUpdate b, long lockId)
   throws IOException {
     if (b.getRow() == null)
@@ -1155,7 +1147,6 @@
   // remote scanner interface
   //
 
-  /** {@inheritDoc} */
   public long openScanner(byte [] regionName, byte [][] cols, byte [] firstRow,
     final long timestamp, final RowFilterInterface filter)
   throws IOException {
@@ -1200,7 +1191,6 @@
     return scannerId;
   }
   
-  /** {@inheritDoc} */
   public void close(final long scannerId) throws IOException {
     checkOpen();
     requestCount.incrementAndGet();
@@ -1235,7 +1225,6 @@
       this.scannerName = n;
     }
     
-    /** {@inheritDoc} */
     public void leaseExpired() {
       LOG.info("Scanner " + this.scannerName + " lease expired");
       InternalScanner s = null;
@@ -1256,7 +1245,6 @@
   // Methods that do the actual work for the remote API
   //
   
-  /** {@inheritDoc} */
   public void deleteAll(final byte [] regionName, final byte [] row,
       final byte [] column, final long timestamp, final long lockId) 
   throws IOException {
@@ -1264,7 +1252,6 @@
     region.deleteAll(row, column, timestamp, getLockFromId(lockId));
   }
 
-  /** {@inheritDoc} */
   public void deleteAll(final byte [] regionName, final byte [] row,
       final long timestamp, final long lockId) 
   throws IOException {
@@ -1272,7 +1259,6 @@
     region.deleteAll(row, timestamp, getLockFromId(lockId));
   }
 
-  /** {@inheritDoc} */
   public void deleteFamily(byte [] regionName, byte [] row, byte [] family, 
     long timestamp, final long lockId)
   throws IOException{
@@ -1280,7 +1266,6 @@
         getLockFromId(lockId));
   }
 
-  /** {@inheritDoc} */
   public long lockRow(byte [] regionName, byte [] row)
   throws IOException {
     checkOpen();
@@ -1346,7 +1331,6 @@
     return rl;
   }
 
-  /** {@inheritDoc} */
   public void unlockRow(byte [] regionName, long lockId)
   throws IOException {
     checkOpen();
@@ -1397,7 +1381,6 @@
       this.region = region;
     }
 
-    /** {@inheritDoc} */
     public void leaseExpired() {
       LOG.info("Row Lock " + this.lockName + " lease expired");
       Integer r = null;
@@ -1617,7 +1600,6 @@
     return regionsToCheck;
   }
 
-  /** {@inheritDoc} */
   public long getProtocolVersion(final String protocol, 
       @SuppressWarnings("unused") final long clientVersion)
   throws IOException {  

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStore.java Tue Sep  9 13:36:49 2008
@@ -1913,7 +1913,6 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public String toString() {
     return this.storeNameStr;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java Tue Sep  9 13:36:49 2008
@@ -448,7 +448,6 @@
     return (isReference())? l / 2: l;
   }
 
-  /** {@inheritDoc} */
   @Override
   public String toString() {
     return encodedRegionName + "/" + Bytes.toString(colFamily) + "/" + fileId +
@@ -549,7 +548,6 @@
       return this.encodedRegionName;
     }
    
-    /** {@inheritDoc} */
     @Override
     public String toString() {
       return encodedRegionName + "/" + fileid + "/" + region;
@@ -557,7 +555,6 @@
 
     // Make it serializable.
 
-    /** {@inheritDoc} */
     public void write(DataOutput out) throws IOException {
       // Write out the encoded region name as a String.  Doing it as a String
       // keeps a Reference's serialziation backword compatible with
@@ -571,7 +568,6 @@
       midkey.write(out);
     }
 
-    /** {@inheritDoc} */
     public void readFields(DataInput in) throws IOException {
       this.encodedRegionName = Integer.parseInt(in.readUTF());
       fileid = in.readLong();
@@ -671,6 +667,7 @@
        * @param fs
        * @param dirName
        * @param compression
+       * @param hri
        * @throws IOException
        */
       public HbaseWriter(Configuration conf, FileSystem fs, String dirName,
@@ -733,7 +730,6 @@
         return filter;
       }
       
-      /** {@inheritDoc} */
       @Override
       public Writable get(WritableComparable key, Writable val)
       throws IOException {
@@ -752,7 +748,6 @@
         return null;
       }
 
-      /** {@inheritDoc} */
       @Override
       public WritableComparable getClosest(WritableComparable key,
           Writable val) throws IOException {
@@ -836,7 +831,6 @@
         }
       }
 
-      /** {@inheritDoc} */
       @Override
       public void append(WritableComparable key, Writable val)
       throws IOException {
@@ -846,7 +840,6 @@
         super.append(key, val);
       }
 
-      /** {@inheritDoc} */
       @Override
       public synchronized void close() throws IOException {
         super.close();
@@ -923,7 +916,6 @@
       }
     }
 
-    /** {@inheritDoc} */
     @Override
     public synchronized void finalKey(WritableComparable key)
     throws IOException {
@@ -943,7 +935,6 @@
       }
     }
 
-    /** {@inheritDoc} */
     @Override
     public synchronized Writable get(WritableComparable key, Writable val)
         throws IOException {
@@ -951,7 +942,6 @@
       return super.get(key, val);
     }
 
-    /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override
     public synchronized WritableComparable getClosest(WritableComparable key,
@@ -983,7 +973,6 @@
       return closest;
     }
 
-    /** {@inheritDoc} */
     @SuppressWarnings("unused")
     @Override
     public synchronized WritableComparable midKey() throws IOException {
@@ -991,7 +980,6 @@
       return null;
     }
 
-    /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
     @Override
     public synchronized boolean next(WritableComparable key, Writable val)
@@ -1017,7 +1005,6 @@
       return result;
     }
 
-    /** {@inheritDoc} */
     @Override
     public synchronized void reset() throws IOException {
       if (top) {
@@ -1028,7 +1015,6 @@
       super.reset();
     }
 
-    /** {@inheritDoc} */
     @Override
     public synchronized boolean seek(WritableComparable key)
     throws IOException {

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreScanner.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreScanner.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HStoreScanner.java Tue Sep  9 13:36:49 2008
@@ -104,7 +104,6 @@
     return multipleMatchers;
   }
 
-  /** {@inheritDoc} */
   public boolean next(HStoreKey key, SortedMap<byte [], Cell> results)
     throws IOException {
 
@@ -261,7 +260,6 @@
     }
   }
 
-  /** {@inheritDoc} */
   public void close() {
     for(int i = 0; i < scanners.length; i++) {
       if(scanners[i] != null) {

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/LogRoller.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/LogRoller.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/LogRoller.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/LogRoller.java Tue Sep  9 13:36:49 2008
@@ -48,7 +48,6 @@
     lastLogRollTime = System.currentTimeMillis();
   }
 
-  /** {@inheritDoc} */
   @Override
   public void run() {
     while (!server.isStopRequested()) {
@@ -93,7 +92,6 @@
     LOG.info("LogRoller exiting.");
   }
 
-  /** {@inheritDoc} */
   public void logRollRequested() {
     synchronized (rollLog) {
       rollLog.set(true);

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Memcache.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Memcache.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Memcache.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/Memcache.java Tue Sep  9 13:36:49 2008
@@ -742,7 +742,6 @@
       }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean next(HStoreKey key, SortedMap<byte [], Cell> results)
     throws IOException {
@@ -806,7 +805,6 @@
       return results.size() > 0;
     }
 
-    /** {@inheritDoc} */
     public void close() {
       if (!scannerClosed) {
         scannerClosed = true;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/NoSuchColumnFamilyException.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/NoSuchColumnFamilyException.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/NoSuchColumnFamilyException.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/NoSuchColumnFamilyException.java Tue Sep  9 13:36:49 2008
@@ -24,11 +24,16 @@
 /**
  * Thrown if request for nonexistent column family.
  */
+@SuppressWarnings("serial")
 public class NoSuchColumnFamilyException extends DoNotRetryIOException {
+  /** default constructor */
   public NoSuchColumnFamilyException() {
     super();
   }
 
+  /**
+   * @param message
+   */
   public NoSuchColumnFamilyException(String message) {
     super(message);
   }

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreFileScanner.java Tue Sep  9 13:36:49 2008
@@ -368,7 +368,6 @@
 
   // Implementation of ChangedReadersObserver
   
-  /** {@inheritDoc} */
   public void updateReaders() throws IOException {
     this.lock.writeLock().lock();
     try {

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/CleanOldTransactionsChore.java Tue Sep  9 13:36:49 2008
@@ -35,6 +35,10 @@
 
   private final TransactionalRegionServer regionServer;
 
+  /**
+   * @param regionServer
+   * @param stopRequest
+   */
   public CleanOldTransactionsChore(
       final TransactionalRegionServer regionServer,
       final AtomicBoolean stopRequest) {

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionState.java Tue Sep  9 13:36:49 2008
@@ -69,6 +69,9 @@
   private Integer sequenceNumber;
   boolean hasScan = false;
 
+  //TODO: Why don't these methods and the class itself use default access?
+  //      They are only referenced from within this package.
+  
   public TransactionState(final long transactionId,
       final long rLogStartSequenceId) {
     this.transactionId = transactionId;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalHLogManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalHLogManager.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalHLogManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalHLogManager.java Tue Sep  9 13:36:49 2008
@@ -62,6 +62,9 @@
   private final HRegionInfo regionInfo;
   private final HBaseConfiguration conf;
 
+  /**
+   * @param region
+   */
   public TransactionalHLogManager(final TransactionalRegion region) {
     this.hlog = region.getLog();
     this.fileSystem = region.getFilesystem();
@@ -78,6 +81,10 @@
     this.conf = conf;
   }
 
+  /**
+   * @param transactionId
+   * @throws IOException
+   */
   public void writeStartToLog(final long transactionId) throws IOException {
     HLogEdit logEdit;
     logEdit = new HLogEdit(transactionId, HLogEdit.TransactionalOperation.START);
@@ -85,6 +92,11 @@
     hlog.append(regionInfo, logEdit);
   }
 
+  /**
+   * @param transactionId
+   * @param update
+   * @throws IOException
+   */
   public void writeUpdateToLog(final long transactionId,
       final BatchUpdate update) throws IOException {
 
@@ -98,6 +110,10 @@
     }
   }
 
+  /**
+   * @param transactionId
+   * @throws IOException
+   */
   public void writeCommitToLog(final long transactionId) throws IOException {
     HLogEdit logEdit;
     logEdit = new HLogEdit(transactionId,
@@ -106,6 +122,10 @@
     hlog.append(regionInfo, logEdit);
   }
 
+  /**
+   * @param transactionId
+   * @throws IOException
+   */
   public void writeAbortToLog(final long transactionId) throws IOException {
     HLogEdit logEdit;
     logEdit = new HLogEdit(transactionId, HLogEdit.TransactionalOperation.ABORT);
@@ -113,6 +133,14 @@
     hlog.append(regionInfo, logEdit);
   }
 
+  /**
+   * @param reconstructionLog
+   * @param maxSeqID
+   * @param reporter
+   * @return map of batch updates
+   * @throws UnsupportedEncodingException
+   * @throws IOException
+   */
   public Map<Long, List<BatchUpdate>> getCommitsFromLog(
       final Path reconstructionLog, final long maxSeqID,
       final Progressable reporter) throws UnsupportedEncodingException,

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegion.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegion.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegion.java Tue Sep  9 13:36:49 2008
@@ -103,6 +103,14 @@
   private TransactionalHLogManager logManager;
   private final int oldTransactionFlushTrigger;
 
+  /**
+   * @param basedir
+   * @param log
+   * @param fs
+   * @param conf
+   * @param regionInfo
+   * @param flushListener
+   */
   public TransactionalRegion(final Path basedir, final HLog log,
       final FileSystem fs, final HBaseConfiguration conf,
       final HRegionInfo regionInfo, final FlushRequester flushListener) {
@@ -160,6 +168,10 @@
     return minPendingStartSequenceId;
   }
 
+  /**
+   * @param transactionId
+   * @throws IOException
+   */
   public void beginTransaction(final long transactionId) throws IOException {
     String key = String.valueOf(transactionId);
     if (transactionsById.get(key) != null) {
@@ -332,6 +344,7 @@
   /**
    * Add a write to the transaction. Does not get applied until commit process.
    * 
+   * @param transactionId
    * @param b
    * @throws IOException
    */
@@ -346,7 +359,9 @@
    * Add a delete to the transaction. Does not get applied until commit process.
    * FIXME, not sure about this approach
    * 
-   * @param b
+   * @param transactionId
+   * @param row
+   * @param timestamp
    * @throws IOException
    */
   public void deleteAll(final long transactionId, final byte[] row,
@@ -370,6 +385,11 @@
 
   }
 
+  /**
+   * @param transactionId
+   * @return true if commit is successful
+   * @throws IOException
+   */
   public boolean commitRequest(final long transactionId) throws IOException {
     synchronized (commitCheckLock) {
       TransactionState state = getTransactionState(transactionId);
@@ -419,7 +439,6 @@
    * Commit the transaction.
    * 
    * @param transactionId
-   * @return
    * @throws IOException
    */
   public void commit(final long transactionId) throws IOException {
@@ -446,7 +465,6 @@
    * Commit the transaction.
    * 
    * @param transactionId
-   * @return
    * @throws IOException
    */
   public void abort(final long transactionId) throws IOException {
@@ -594,7 +612,6 @@
       this.transactionName = n;
     }
 
-    /** {@inheritDoc} */
     public void leaseExpired() {
       LOG.info("Transaction " + this.transactionName + " lease expired");
       TransactionState s = null;
@@ -627,6 +644,10 @@
     private long transactionId;
     private InternalScanner scanner;
 
+    /**
+     * @param transactionId
+     * @param scanner
+     */
     public ScannerWrapper(final long transactionId,
         final InternalScanner scanner) {
       this.transactionId = transactionId;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionServer.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/transactional/TransactionalRegionServer.java Tue Sep  9 13:36:49 2008
@@ -60,12 +60,21 @@
 
   private final CleanOldTransactionsChore cleanOldTransactionsThread;
 
+  /**
+   * @param conf
+   * @throws IOException
+   */
   public TransactionalRegionServer(final HBaseConfiguration conf)
       throws IOException {
     this(new HServerAddress(conf.get(REGIONSERVER_ADDRESS,
         DEFAULT_REGIONSERVER_ADDRESS)), conf);
   }
 
+  /**
+   * @param address
+   * @param conf
+   * @throws IOException
+   */
   public TransactionalRegionServer(final HServerAddress address,
       final HBaseConfiguration conf) throws IOException {
     super(address, conf);
@@ -73,7 +82,6 @@
         super.stopRequested);
   }
 
-  /** {@inheritDoc} */
   @Override
   public long getProtocolVersion(final String protocol, final long clientVersion)
       throws IOException {
@@ -241,7 +249,6 @@
 
   }
 
-  /** {@inheritDoc} */
   public void deleteAll(final long transactionId, final byte[] regionName,
       final byte[] row, final long timestamp) throws IOException {
     checkOpen();

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/rest/Dispatcher.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/rest/Dispatcher.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/rest/Dispatcher.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/rest/Dispatcher.java Tue Sep  9 13:36:49 2008
@@ -57,8 +57,10 @@
  * </ul>
  * @see <a href="http://wiki.apache.org/lucene-hadoop/Hbase/HbaseRest">Hbase REST Specification</a>
  */
+@SuppressWarnings("serial")
 public class Dispatcher extends javax.servlet.http.HttpServlet
 implements javax.servlet.Servlet {
+  @SuppressWarnings("unused")
   private static final Log LOG = LogFactory.getLog(Dispatcher.class.getName());
   private MetaHandler metaHandler;
   private TableHandler tableHandler;
@@ -75,6 +77,7 @@
     super();
   }
 
+  @Override
   public void init() throws ServletException {
     super.init();
     
@@ -92,6 +95,7 @@
     }
   }
 
+  @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
   throws IOException, ServletException {
     String [] pathSegments = getPathSegments(request);
@@ -112,6 +116,7 @@
     }
   }
 
+  @Override
   protected void doPost(HttpServletRequest request, HttpServletResponse response)
   throws IOException, ServletException {
     String [] pathSegments = getPathSegments(request);
@@ -145,6 +150,7 @@
   }
   
 
+  @Override
   protected void doPut(HttpServletRequest request, HttpServletResponse response)
   throws ServletException, IOException {
     String [] pathSegments = getPathSegments(request);
@@ -158,6 +164,7 @@
     }
   }
 
+  @Override
   protected void doDelete(HttpServletRequest request,
       HttpServletResponse response)
   throws IOException, ServletException {

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Bytes.java Tue Sep  9 13:36:49 2008
@@ -12,6 +12,11 @@
 import org.apache.hadoop.io.WritableComparator;
 import org.apache.hadoop.io.WritableUtils;
 
+/**
+ * Utility class that handles byte arrays, conversions to/from other types,
+ * comparisons, hash code generation, manufacturing keys for HashMaps or
+ * HashSets, etc.
+ */
 public class Bytes {
   /**
    * Size of long in bytes

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/JenkinsHash.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/JenkinsHash.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/JenkinsHash.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/JenkinsHash.java Tue Sep  9 13:36:49 2008
@@ -43,7 +43,7 @@
   private static long BYTE_MASK = 0x00000000000000ffL;
 
   private static long rot(long val, int pos) {
-    return ((long)(Integer.rotateLeft(
+    return ((Integer.rotateLeft(
         (int)(val & INT_MASK), pos)) & INT_MASK);
   }
 
@@ -93,6 +93,7 @@
    * <p>Use for hash table lookup, or anything where one collision in 2^^32 is
    * acceptable.  Do NOT use for cryptographic purposes.
   */
+  @SuppressWarnings("fallthrough")
   public static int hash(byte[] key, int nbytes, int initval) {
     int length = nbytes;
     long a, b, c;       // We use longs because we don't have unsigned ints

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Merge.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Merge.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Merge.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Merge.java Tue Sep  9 13:36:49 2008
@@ -70,7 +70,6 @@
     this.mergeInfo = null;
   }
 
-  /** {@inheritDoc} */
   public int run(String[] args) throws Exception {
     if (parseArgs(args) != 0) {
       return -1;
@@ -164,7 +163,6 @@
       this.region2 = region2;
     }
     
-    /** {@inheritDoc} */
     public boolean processRow(HRegionInfo info) {
       if (meta1 == null && HRegion.rowIsInRange(info, region1)) {
         meta1 = info;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/MetaUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/MetaUtils.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/MetaUtils.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/MetaUtils.java Tue Sep  9 13:36:49 2008
@@ -20,7 +20,7 @@
 
 package org.apache.hadoop.hbase.util;
 
-import java.io.FileNotFoundException;
+import java.io.FileNotFoundException;           //TODO: remove
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Migrate.java Tue Sep  9 13:36:49 2008
@@ -151,7 +151,6 @@
     }
   }
   
-  /** {@inheritDoc} */
   public int run(String[] args) {
     if (parseArgs(args) != 0) {
       return -1;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/SoftSortedMap.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/SoftSortedMap.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/SoftSortedMap.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/SoftSortedMap.java Tue Sep  9 13:36:49 2008
@@ -37,6 +37,9 @@
 /**
  * A SortedMap implementation that uses SoftReferences internally to make it
  * play well with the GC when in a low-memory situation.
+ * 
+ * @param <K> key class
+ * @param <V> value class
  */
 public class SoftSortedMap<K,V> implements SortedMap<K,V> {
   private static final Log LOG = LogFactory.getLog(SoftSortedMap.class);  
@@ -174,6 +177,7 @@
   /**
    * Check the reference queue and delete anything that has since gone away
    */ 
+  @SuppressWarnings("unchecked")
   private void checkReferences() {
     SoftValue<K,V> sv;
     Object obj;
@@ -200,8 +204,8 @@
     
     public K2 getKey() {return key;}
     public V2 getValue() {return get();}
-    
-    public V2 setValue(V2 value) {
+
+    public V2 setValue(@SuppressWarnings("unused") V2 value) {
       throw new RuntimeException("Not implemented");
     }
   }

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/VersionInfo.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/VersionInfo.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/VersionInfo.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/VersionInfo.java Tue Sep  9 13:36:49 2008
@@ -75,11 +75,15 @@
   
   /**
    * Get the subversion URL for the root hbase directory.
+   * @return the url
    */
   public static String getUrl() {
     return version != null ? version.url() : "Unknown";
   }
   
+  /**
+   * @param args
+   */
   public static void main(String[] args) {
     System.out.println("HBase " + getVersion());
     System.out.println("Subversion " + getUrl() + " -r " + getRevision());

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/ipc/HBaseClient.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/ipc/HBaseClient.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/ipc/HBaseClient.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/ipc/HBaseClient.java Tue Sep  9 13:36:49 2008
@@ -26,10 +26,19 @@
  * in {@link org.apache.hadoop.hbase.ipc.HbaseRPC}
  */
 public class HBaseClient extends Client {
+  /**
+   * @param valueClass
+   * @param conf
+   * @param factory
+   */
   public HBaseClient(Class valueClass, Configuration conf, SocketFactory factory) {
     super(valueClass, conf, factory);
   }
 
+  /**
+   * @param valueClass
+   * @param conf
+   */
   public HBaseClient(Class<?> valueClass, Configuration conf) {
     super(valueClass, conf);
   }

Modified: hadoop/hbase/trunk/src/java/org/onelab/filter/BloomFilter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/onelab/filter/BloomFilter.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/onelab/filter/BloomFilter.java (original)
+++ hadoop/hbase/trunk/src/java/org/onelab/filter/BloomFilter.java Tue Sep  9 13:36:49 2008
@@ -104,7 +104,6 @@
     bits = new BitSet(this.vectorSize);
   }//end constructor
 
-  /** {@inheritDoc} */
   @Override
   public void add(Key key) {
     if(key == null) {
@@ -119,7 +118,6 @@
     }
   }//end add()
 
-  /** {@inheritDoc} */
   @Override
   public void and(Filter filter){
     if(filter == null
@@ -132,7 +130,6 @@
     this.bits.and(((BloomFilter) filter).bits);
   }//end and()
 
-  /** {@inheritDoc} */
   @Override
   public boolean membershipTest(Key key){
     if(key == null) {
@@ -149,13 +146,11 @@
     return true;
   }//end memberhsipTest()
 
-  /** {@inheritDoc} */
   @Override
   public void not(){
     bits.flip(0, vectorSize - 1);
   }//end not()
 
-  /** {@inheritDoc} */
   @Override
   public void or(Filter filter){
     if(filter == null
@@ -167,7 +162,6 @@
     bits.or(((BloomFilter) filter).bits);
   }//end or()
 
-  /** {@inheritDoc} */
   @Override
   public void xor(Filter filter){
     if(filter == null
@@ -179,13 +173,11 @@
     bits.xor(((BloomFilter) filter).bits);
   }//and xor()
 
-  /** {@inheritDoc} */
   @Override
   public String toString(){
     return bits.toString();
   }//end toString()
 
-  /** {@inheritDoc} */
   @Override
   public Object clone(){
     BloomFilter bf = new BloomFilter(vectorSize, nbHash);
@@ -202,7 +194,6 @@
 
   // Writable
 
-  /** {@inheritDoc} */
   @Override
   public void write(DataOutput out) throws IOException {
     super.write(out);
@@ -222,7 +213,6 @@
     out.write(bytes);
   }
 
-  /** {@inheritDoc} */
   @Override
   public void readFields(DataInput in) throws IOException {
     super.readFields(in);

Modified: hadoop/hbase/trunk/src/java/org/onelab/filter/CountingBloomFilter.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/onelab/filter/CountingBloomFilter.java?rev=693597&r1=693596&r2=693597&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/onelab/filter/CountingBloomFilter.java (original)
+++ hadoop/hbase/trunk/src/java/org/onelab/filter/CountingBloomFilter.java Tue Sep  9 13:36:49 2008
@@ -50,7 +50,7 @@
 import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.Arrays;                        //TODO: remove
 
 /**
  * Implements a <i>counting Bloom filter</i>, as defined by Fan et al. in a ToN
@@ -94,7 +94,6 @@
   }
 
 
-  /** {@inheritDoc} */
   @Override
   public void add(Key key) {
     if(key == null) {
@@ -153,7 +152,6 @@
     }
   }//end delete
 
-  /** {@inheritDoc} */
   @Override
   public void and(Filter filter){
     if(filter == null
@@ -170,7 +168,6 @@
     }
   }//end and()
 
-  /** {@inheritDoc} */
   @Override
   public boolean membershipTest(Key key){
     if(key == null) {
@@ -195,14 +192,12 @@
     return true;
   }//end membershipTest()
 
-  /** {@inheritDoc} */
   @Override
   public void not(){
     throw new UnsupportedOperationException("not() is undefined for "
         + this.getClass().getName());
   }//end not()
 
-  /** {@inheritDoc} */
   @Override
   public void or(Filter filter){
     if(filter == null
@@ -220,7 +215,6 @@
     }
   }//end or()
 
-  /** {@inheritDoc} */
   @Override
   @SuppressWarnings("unused")
   public void xor(Filter filter){
@@ -228,7 +222,6 @@
         + this.getClass().getName());
   }//end xor()
 
-  /** {@inheritDoc} */
   @Override
   public String toString(){
     StringBuilder res = new StringBuilder();
@@ -250,7 +243,6 @@
     return res.toString();
   }//end toString()
 
-  /** {@inheritDoc} */
   @Override
   public Object clone(){
     CountingBloomFilter cbf = new CountingBloomFilter(vectorSize, nbHash);
@@ -260,7 +252,6 @@
 
   // Writable
 
-  /** {@inheritDoc} */
   @Override
   public void write(DataOutput out) throws IOException {
     super.write(out);
@@ -270,7 +261,6 @@
     }
   }
 
-  /** {@inheritDoc} */
   @Override
   public void readFields(DataInput in) throws IOException {
     super.readFields(in);



Mime
View raw message