hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject svn commit: r1377176 [4/7] - in /hadoop/common/branches/branch-2/hadoop-common-project: hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/ hadoop-common/src/main/java/org/apache/hadoop/conf/ hadoop-common/src/main/java/org/apache/...
Date Sat, 25 Aug 2012 01:24:05 GMT
Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibCompressor.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibCompressor.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibCompressor.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibCompressor.java Sat Aug 25 01:23:52 2012
@@ -259,6 +259,7 @@ public class ZlibCompressor implements C
     }
   }
 
+  @Override
   public synchronized void setInput(byte[] b, int off, int len) {
     if (b== null) {
       throw new NullPointerException();
@@ -287,6 +288,7 @@ public class ZlibCompressor implements C
     uncompressedDirectBufLen = uncompressedDirectBuf.position();
   }
 
+  @Override
   public synchronized void setDictionary(byte[] b, int off, int len) {
     if (stream == 0 || b == null) {
       throw new NullPointerException();
@@ -297,6 +299,7 @@ public class ZlibCompressor implements C
     setDictionary(stream, b, off, len);
   }
 
+  @Override
   public synchronized boolean needsInput() {
     // Consume remaining compressed data?
     if (compressedDirectBuf.remaining() > 0) {
@@ -325,16 +328,19 @@ public class ZlibCompressor implements C
     return false;
   }
   
+  @Override
   public synchronized void finish() {
     finish = true;
   }
   
+  @Override
   public synchronized boolean finished() {
     // Check if 'zlib' says its 'finished' and
     // all compressed data has been consumed
     return (finished && compressedDirectBuf.remaining() == 0);
   }
 
+  @Override
   public synchronized int compress(byte[] b, int off, int len) 
     throws IOException {
     if (b == null) {
@@ -385,6 +391,7 @@ public class ZlibCompressor implements C
    *
    * @return the total (non-negative) number of compressed bytes output so far
    */
+  @Override
   public synchronized long getBytesWritten() {
     checkStream();
     return getBytesWritten(stream);
@@ -395,11 +402,13 @@ public class ZlibCompressor implements C
    *
    * @return the total (non-negative) number of uncompressed bytes input so far
    */
+  @Override
   public synchronized long getBytesRead() {
     checkStream();
     return getBytesRead(stream);
   }
 
+  @Override
   public synchronized void reset() {
     checkStream();
     reset(stream);
@@ -413,6 +422,7 @@ public class ZlibCompressor implements C
     userBufOff = userBufLen = 0;
   }
   
+  @Override
   public synchronized void end() {
     if (stream != 0) {
       end(stream);

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/zlib/ZlibDecompressor.java Sat Aug 25 01:23:52 2012
@@ -118,6 +118,7 @@ public class ZlibDecompressor implements
     this(CompressionHeader.DEFAULT_HEADER, DEFAULT_DIRECT_BUFFER_SIZE);
   }
 
+  @Override
   public synchronized void setInput(byte[] b, int off, int len) {
     if (b == null) {
       throw new NullPointerException();
@@ -154,6 +155,7 @@ public class ZlibDecompressor implements
     userBufLen -= compressedDirectBufLen;
   }
 
+  @Override
   public synchronized void setDictionary(byte[] b, int off, int len) {
     if (stream == 0 || b == null) {
       throw new NullPointerException();
@@ -165,6 +167,7 @@ public class ZlibDecompressor implements
     needDict = false;
   }
 
+  @Override
   public synchronized boolean needsInput() {
     // Consume remaining compressed data?
     if (uncompressedDirectBuf.remaining() > 0) {
@@ -184,16 +187,19 @@ public class ZlibDecompressor implements
     return false;
   }
 
+  @Override
   public synchronized boolean needsDictionary() {
     return needDict;
   }
 
+  @Override
   public synchronized boolean finished() {
     // Check if 'zlib' says it's 'finished' and
     // all compressed data has been consumed
     return (finished && uncompressedDirectBuf.remaining() == 0);
   }
 
+  @Override
   public synchronized int decompress(byte[] b, int off, int len) 
     throws IOException {
     if (b == null) {
@@ -255,6 +261,7 @@ public class ZlibDecompressor implements
    *
    * @return the total (non-negative) number of unprocessed bytes in input
    */
+  @Override
   public synchronized int getRemaining() {
     checkStream();
     return userBufLen + getRemaining(stream);  // userBuf + compressedDirectBuf
@@ -263,6 +270,7 @@ public class ZlibDecompressor implements
   /**
    * Resets everything including the input buffers (user and direct).</p>
    */
+  @Override
   public synchronized void reset() {
     checkStream();
     reset(stream);
@@ -274,6 +282,7 @@ public class ZlibDecompressor implements
     userBufOff = userBufLen = 0;
   }
 
+  @Override
   public synchronized void end() {
     if (stream != 0) {
       end(stream);
@@ -281,6 +290,7 @@ public class ZlibDecompressor implements
     }
   }
 
+  @Override
   protected void finalize() {
     end();
   }

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/BCFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/BCFile.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/BCFile.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/BCFile.java Sat Aug 25 01:23:52 2012
@@ -300,6 +300,7 @@ final class BCFile {
      * Close the BCFile Writer. Attempting to use the Writer after calling
      * <code>close</code> is not allowed and may lead to undetermined results.
      */
+    @Override
     public void close() throws IOException {
       if (closed == true) {
         return;
@@ -447,6 +448,7 @@ final class BCFile {
         this.compressAlgo = compressAlgo;
       }
 
+      @Override
       public void register(long raw, long begin, long end) {
         metaIndex.addEntry(new MetaIndexEntry(name, compressAlgo,
             new BlockRegion(begin, end - begin, raw)));
@@ -463,6 +465,7 @@ final class BCFile {
         // do nothing
       }
 
+      @Override
       public void register(long raw, long begin, long end) {
         dataIndex.addBlockRegion(new BlockRegion(begin, end - begin, raw));
       }
@@ -671,6 +674,7 @@ final class BCFile {
     /**
      * Finishing reading the BCFile. Release all resources.
      */
+    @Override
     public void close() {
       // nothing to be done now
     }

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/CompareUtils.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/CompareUtils.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/CompareUtils.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/CompareUtils.java Sat Aug 25 01:23:52 2012
@@ -68,6 +68,7 @@ class CompareUtils {
       magnitude = m;
     }
 
+    @Override
     public long magnitude() {
       return magnitude;
     }

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/file/tfile/TFile.java Sat Aug 25 01:23:52 2012
@@ -297,6 +297,7 @@ public class TFile {
      * 
      * The underlying FSDataOutputStream is not closed.
      */
+    @Override
     public void close() throws IOException {
       if ((state == State.CLOSED)) {
         return;
@@ -820,6 +821,7 @@ public class TFile {
      * Close the reader. The state of the Reader object is undefined after
      * close. Calling close() for multiple times has no effect.
      */
+    @Override
     public void close() throws IOException {
       readerBCF.close();
     }
@@ -1573,6 +1575,7 @@ public class TFile {
        * scanner after calling close is not defined. The entry returned by the
        * previous entry() call will be invalid.
        */
+      @Override
       public void close() throws IOException {
         parkCursorAtEnd();
       }

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIO.java Sat Aug 25 01:23:52 2012
@@ -202,6 +202,7 @@ public class NativeIO {
       this.mode = mode;
     }
 
+    @Override
     public String toString() {
       return "Stat(owner='" + owner + "', group='" + group + "'" +
         ", mode=" + mode + ")";

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIOException.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIOException.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIOException.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/nativeio/NativeIOException.java Sat Aug 25 01:23:52 2012
@@ -38,6 +38,7 @@ public class NativeIOException extends I
     return errno;
   }
 
+  @Override
   public String toString() {
     return errno.toString() + ": " + super.getMessage();
   }

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java Sat Aug 25 01:23:52 2012
@@ -150,6 +150,7 @@ public class RetryPolicies {
   }
   
   static class TryOnceThenFail implements RetryPolicy {
+    @Override
     public RetryAction shouldRetry(Exception e, int retries, int failovers,
         boolean isMethodIdempotent) throws Exception {
       return RetryAction.FAIL;
@@ -157,6 +158,7 @@ public class RetryPolicies {
   }
   
   static class RetryForever implements RetryPolicy {
+    @Override
     public RetryAction shouldRetry(Exception e, int retries, int failovers,
         boolean isMethodIdempotent) throws Exception {
       return RetryAction.RETRY;
@@ -430,6 +432,7 @@ public class RetryPolicies {
       this.exceptionToPolicyMap = exceptionToPolicyMap;
     }
 
+    @Override
     public RetryAction shouldRetry(Exception e, int retries, int failovers,
         boolean isMethodIdempotent) throws Exception {
       RetryPolicy policy = exceptionToPolicyMap.get(e.getClass());
@@ -457,6 +460,7 @@ public class RetryPolicies {
       }
     }
 
+    @Override
     public RetryAction shouldRetry(Exception e, int retries, int failovers,
         boolean isMethodIdempotent) throws Exception {
       RetryPolicy policy = null;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/DeserializerComparator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/DeserializerComparator.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/DeserializerComparator.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/DeserializerComparator.java Sat Aug 25 01:23:52 2012
@@ -56,6 +56,7 @@ public abstract class DeserializerCompar
     this.deserializer.open(buffer);
   }
 
+  @Override
   public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
     try {
       

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerialization.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerialization.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerialization.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerialization.java Sat Aug 25 01:23:52 2012
@@ -24,11 +24,8 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
-import java.util.Map;
-
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.io.RawComparator;
 
 /**
  * <p>
@@ -45,6 +42,7 @@ public class JavaSerialization implement
 
     private ObjectInputStream ois;
 
+    @Override
     public void open(InputStream in) throws IOException {
       ois = new ObjectInputStream(in) {
         @Override protected void readStreamHeader() {
@@ -53,6 +51,7 @@ public class JavaSerialization implement
       };
     }
     
+    @Override
     @SuppressWarnings("unchecked")
     public T deserialize(T object) throws IOException {
       try {
@@ -63,6 +62,7 @@ public class JavaSerialization implement
       }
     }
 
+    @Override
     public void close() throws IOException {
       ois.close();
     }
@@ -74,6 +74,7 @@ public class JavaSerialization implement
 
     private ObjectOutputStream oos;
 
+    @Override
     public void open(OutputStream out) throws IOException {
       oos = new ObjectOutputStream(out) {
         @Override protected void writeStreamHeader() {
@@ -82,27 +83,32 @@ public class JavaSerialization implement
       };
     }
 
+    @Override
     public void serialize(Serializable object) throws IOException {
       oos.reset(); // clear (class) back-references
       oos.writeObject(object);
     }
 
+    @Override
     public void close() throws IOException {
       oos.close();
     }
 
   }
 
+  @Override
   @InterfaceAudience.Private
   public boolean accept(Class<?> c) {
     return Serializable.class.isAssignableFrom(c);
   }
 
+  @Override
   @InterfaceAudience.Private
   public Deserializer<Serializable> getDeserializer(Class<Serializable> c) {
     return new JavaSerializationDeserializer<Serializable>();
   }
 
+  @Override
   @InterfaceAudience.Private
   public Serializer<Serializable> getSerializer(Class<Serializable> c) {
     return new JavaSerializationSerializer();

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerializationComparator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerializationComparator.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerializationComparator.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/JavaSerializationComparator.java Sat Aug 25 01:23:52 2012
@@ -44,6 +44,7 @@ public class JavaSerializationComparator
     super(new JavaSerialization.JavaSerializationDeserializer<T>());
   }
 
+  @Override
   @InterfaceAudience.Private
   public int compare(T o1, T o2) {
     return o1.compareTo(o2);

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/WritableSerialization.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/WritableSerialization.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/WritableSerialization.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/WritableSerialization.java Sat Aug 25 01:23:52 2012
@@ -23,8 +23,6 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Map;
-
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroSerialization.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroSerialization.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroSerialization.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/serializer/avro/AvroSerialization.java Sat Aug 25 01:23:52 2012
@@ -47,11 +47,13 @@ public abstract class AvroSerialization<
   @InterfaceAudience.Private
   public static final String AVRO_SCHEMA_KEY = "Avro-Schema";
 
+  @Override
   @InterfaceAudience.Private
   public Deserializer<T> getDeserializer(Class<T> c) {
     return new AvroDeserializer(c);
   }
 
+  @Override
   @InterfaceAudience.Private
   public Serializer<T> getSerializer(Class<T> c) {
     return new AvroSerializer(c);

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java Sat Aug 25 01:23:52 2012
@@ -364,6 +364,7 @@ public class Client {
        * until a byte is read.
        * @throws IOException for any IO problem other than socket timeout
        */
+      @Override
       public int read() throws IOException {
         do {
           try {
@@ -380,6 +381,7 @@ public class Client {
        * 
        * @return the total number of bytes read; -1 if the connection is closed.
        */
+      @Override
       public int read(byte[] buf, int off, int len) throws IOException {
         do {
           try {
@@ -510,6 +512,7 @@ public class Client {
         final Random rand, final UserGroupInformation ugi) throws IOException,
         InterruptedException {
       ugi.doAs(new PrivilegedExceptionAction<Object>() {
+        @Override
         public Object run() throws IOException, InterruptedException {
           final short MAX_BACKOFF = 5000;
           closeConnection();
@@ -803,6 +806,7 @@ public class Client {
       }
     }
 
+    @Override
     public void run() {
       if (LOG.isDebugEnabled())
         LOG.debug(getName() + ": starting, having connections " 

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtobufRpcEngine.java Sat Aug 25 01:23:52 2012
@@ -240,6 +240,7 @@ public class ProtobufRpcEngine implement
       return returnMessage;
     }
 
+    @Override
     public void close() throws IOException {
       if (!isClosed) {
         isClosed = true;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolProxy.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolProxy.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolProxy.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolProxy.java Sat Aug 25 01:23:52 2012
@@ -19,7 +19,6 @@
 package org.apache.hadoop.ipc;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.HashSet;
 

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolSignature.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolSignature.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolSignature.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/ProtocolSignature.java Sat Aug 25 01:23:52 2012
@@ -36,7 +36,8 @@ public class ProtocolSignature implement
     WritableFactories.setFactory
       (ProtocolSignature.class,
        new WritableFactory() {
-         public Writable newInstance() { return new ProtocolSignature(); }
+         @Override
+        public Writable newInstance() { return new ProtocolSignature(); }
        });
   }
 

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java Sat Aug 25 01:23:52 2012
@@ -479,6 +479,7 @@ public abstract class Server {
         this.readSelector = Selector.open();
       }
       
+      @Override
       public void run() {
         LOG.info("Starting " + getName());
         try {

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/WritableRpcEngine.java Sat Aug 25 01:23:52 2012
@@ -142,6 +142,7 @@ public class WritableRpcEngine implement
       return rpcVersion;
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public void readFields(DataInput in) throws IOException {
       rpcVersion = in.readLong();
@@ -159,6 +160,7 @@ public class WritableRpcEngine implement
       }
     }
 
+    @Override
     @SuppressWarnings("deprecation")
     public void write(DataOutput out) throws IOException {
       out.writeLong(rpcVersion);
@@ -173,6 +175,7 @@ public class WritableRpcEngine implement
       }
     }
 
+    @Override
     public String toString() {
       StringBuilder buffer = new StringBuilder();
       buffer.append(methodName);
@@ -189,10 +192,12 @@ public class WritableRpcEngine implement
       return buffer.toString();
     }
 
+    @Override
     public void setConf(Configuration conf) {
       this.conf = conf;
     }
 
+    @Override
     public Configuration getConf() {
       return this.conf;
     }
@@ -215,6 +220,7 @@ public class WritableRpcEngine implement
       this.client = CLIENTS.getClient(conf, factory);
     }
 
+    @Override
     public Object invoke(Object proxy, Method method, Object[] args)
       throws Throwable {
       long startTime = 0;
@@ -232,6 +238,7 @@ public class WritableRpcEngine implement
     }
     
     /* close the IPC client that's responsible for this invoker's RPCs */ 
+    @Override
     synchronized public void close() {
       if (!isClosed) {
         isClosed = true;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java Sat Aug 25 01:23:52 2012
@@ -88,6 +88,7 @@ public class LogLevel {
   public static class Servlet extends HttpServlet {
     private static final long serialVersionUID = 1L;
 
+    @Override
     public void doGet(HttpServletRequest request, HttpServletResponse response
         ) throws ServletException, IOException {
 

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/ganglia/GangliaContext.java Sat Aug 25 01:23:52 2012
@@ -35,7 +35,6 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.metrics.ContextFactory;
-import org.apache.hadoop.metrics.MetricsException;
 import org.apache.hadoop.metrics.spi.AbstractMetricsContext;
 import org.apache.hadoop.metrics.spi.OutputRecord;
 import org.apache.hadoop.metrics.spi.Util;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/CompositeContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/CompositeContext.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/CompositeContext.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/CompositeContext.java Sat Aug 25 01:23:52 2012
@@ -30,7 +30,6 @@ import org.apache.hadoop.classification.
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.metrics.ContextFactory;
 import org.apache.hadoop.metrics.MetricsContext;
-import org.apache.hadoop.metrics.MetricsException;
 import org.apache.hadoop.metrics.MetricsRecord;
 import org.apache.hadoop.metrics.MetricsUtil;
 import org.apache.hadoop.metrics.Updater;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/NullContextWithUpdateThread.java Sat Aug 25 01:23:52 2012
@@ -21,7 +21,6 @@ package org.apache.hadoop.metrics.spi;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.metrics.ContextFactory;
-import org.apache.hadoop.metrics.MetricsException;
 
 /**
  * A null context which has a thread calling 

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/OutputRecord.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/OutputRecord.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/OutputRecord.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/OutputRecord.java Sat Aug 25 01:23:52 2012
@@ -21,11 +21,7 @@
 package org.apache.hadoop.metrics.spi;
 
 import java.util.Collections;
-import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
-import java.util.Map.Entry;
-
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.metrics.spi.AbstractMetricsContext.MetricMap;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/Util.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/Util.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/Util.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/spi/Util.java Sat Aug 25 01:23:52 2012
@@ -22,7 +22,6 @@
 package org.apache.hadoop.metrics.spi;
 
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.List;
 

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsIntValue.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsIntValue.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsIntValue.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsIntValue.java Sat Aug 25 01:23:52 2012
@@ -19,8 +19,6 @@ package org.apache.hadoop.metrics.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.metrics.MetricsRecord;
-import org.apache.hadoop.util.StringUtils;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java Sat Aug 25 01:23:52 2012
@@ -19,8 +19,6 @@ package org.apache.hadoop.metrics.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.metrics.MetricsRecord;
-import org.apache.hadoop.util.StringUtils;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java Sat Aug 25 01:23:52 2012
@@ -20,8 +20,6 @@ package org.apache.hadoop.metrics.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.metrics.MetricsRecord;
-import org.apache.hadoop.util.StringUtils;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java Sat Aug 25 01:23:52 2012
@@ -19,8 +19,6 @@ package org.apache.hadoop.metrics.util;
 
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.metrics.MetricsRecord;
-import org.apache.hadoop.util.StringUtils;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsConfig.java Sat Aug 25 01:23:52 2012
@@ -24,7 +24,6 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import static java.security.AccessController.*;
 import java.security.PrivilegedAction;
-import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/FileSink.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/FileSink.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/FileSink.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/sink/FileSink.java Sat Aug 25 01:23:52 2012
@@ -18,7 +18,6 @@
 
 package org.apache.hadoop.metrics2.sink;
 
-import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.PrintWriter;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetrics.java Sat Aug 25 01:23:52 2012
@@ -23,7 +23,6 @@ import java.lang.management.MemoryMXBean
 import java.lang.management.MemoryUsage;
 import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
-import static java.lang.Thread.State.*;
 import java.lang.management.GarbageCollectorMXBean;
 import java.util.Map;
 import java.util.List;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/AbstractDNSToSwitchMapping.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/AbstractDNSToSwitchMapping.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/AbstractDNSToSwitchMapping.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/AbstractDNSToSwitchMapping.java Sat Aug 25 01:23:52 2012
@@ -24,7 +24,6 @@ import org.apache.hadoop.conf.Configurab
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/DNS.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/DNS.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/DNS.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/DNS.java Sat Aug 25 01:23:52 2012
@@ -30,7 +30,6 @@ import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.LinkedHashSet;
-import java.util.Set;
 import java.util.Vector;
 
 import javax.naming.NamingException;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java Sat Aug 25 01:23:52 2012
@@ -621,6 +621,7 @@ public class NetworkTopology {
   }
     
   /** convert a network tree to a string */
+  @Override
   public String toString() {
     // print the number of racks
     StringBuilder tree = new StringBuilder();

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/ScriptBasedMapping.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/ScriptBasedMapping.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/ScriptBasedMapping.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/ScriptBasedMapping.java Sat Aug 25 01:23:52 2012
@@ -26,7 +26,6 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.util.Shell.ShellCommandExecutor;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.conf.Configurable;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketIOWithTimeout.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketIOWithTimeout.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketIOWithTimeout.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketIOWithTimeout.java Sat Aug 25 01:23:52 2012
@@ -33,7 +33,6 @@ import java.util.LinkedList;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.util.StringUtils;
 import org.apache.hadoop.util.Time;
 
 /**

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketInputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketInputStream.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketInputStream.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketInputStream.java Sat Aug 25 01:23:52 2012
@@ -50,6 +50,7 @@ class SocketInputStream extends InputStr
       this.channel = channel;
     }
     
+    @Override
     int performIO(ByteBuffer buf) throws IOException {
       return channel.read(buf);
     }
@@ -123,10 +124,12 @@ class SocketInputStream extends InputStr
     return ret;
   }
 
+  @Override
   public int read(byte[] b, int off, int len) throws IOException {
     return read(ByteBuffer.wrap(b, off, len));
   }
 
+  @Override
   public synchronized void close() throws IOException {
     /* close the channel since Socket.getInputStream().close()
      * closes the socket.
@@ -146,10 +149,12 @@ class SocketInputStream extends InputStr
   
   //ReadableByteChannel interface
     
+  @Override
   public boolean isOpen() {
     return reader.isOpen();
   }
     
+  @Override
   public int read(ByteBuffer dst) throws IOException {
     return reader.doIO(dst, SelectionKey.OP_READ);
   }

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketOutputStream.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketOutputStream.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketOutputStream.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocketOutputStream.java Sat Aug 25 01:23:52 2012
@@ -58,6 +58,7 @@ public class SocketOutputStream extends 
       this.channel = channel;
     }
     
+    @Override
     int performIO(ByteBuffer buf) throws IOException {
       return channel.write(buf);
     }
@@ -98,6 +99,7 @@ public class SocketOutputStream extends 
     this(socket.getChannel(), timeout);
   }
   
+  @Override
   public void write(int b) throws IOException {
     /* If we need to, we can optimize this allocation.
      * probably no need to optimize or encourage single byte writes.
@@ -107,6 +109,7 @@ public class SocketOutputStream extends 
     write(buf, 0, 1);
   }
   
+  @Override
   public void write(byte[] b, int off, int len) throws IOException {
     ByteBuffer buf = ByteBuffer.wrap(b, off, len);
     while (buf.hasRemaining()) {
@@ -126,6 +129,7 @@ public class SocketOutputStream extends 
     }
   }
 
+  @Override
   public synchronized void close() throws IOException {
     /* close the channel since Socket.getOuputStream().close() 
      * closes the socket.
@@ -145,10 +149,12 @@ public class SocketOutputStream extends 
 
   //WritableByteChannle interface 
   
+  @Override
   public boolean isOpen() {
     return writer.isOpen();
   }
 
+  @Override
   public int write(ByteBuffer src) throws IOException {
     return writer.doIO(src, SelectionKey.OP_WRITE);
   }

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocksSocketFactory.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocksSocketFactory.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocksSocketFactory.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/SocksSocketFactory.java Sat Aug 25 01:23:52 2012
@@ -59,14 +59,12 @@ public class SocksSocketFactory extends 
     this.proxy = proxy;
   }
 
-  /* @inheritDoc */
   @Override
   public Socket createSocket() throws IOException {
 
     return new Socket(proxy);
   }
 
-  /* @inheritDoc */
   @Override
   public Socket createSocket(InetAddress addr, int port) throws IOException {
 
@@ -75,7 +73,6 @@ public class SocksSocketFactory extends 
     return socket;
   }
 
-  /* @inheritDoc */
   @Override
   public Socket createSocket(InetAddress addr, int port,
       InetAddress localHostAddr, int localPort) throws IOException {
@@ -86,7 +83,6 @@ public class SocksSocketFactory extends 
     return socket;
   }
 
-  /* @inheritDoc */
   @Override
   public Socket createSocket(String host, int port) throws IOException,
       UnknownHostException {
@@ -96,7 +92,6 @@ public class SocksSocketFactory extends 
     return socket;
   }
 
-  /* @inheritDoc */
   @Override
   public Socket createSocket(String host, int port,
       InetAddress localHostAddr, int localPort) throws IOException,
@@ -108,13 +103,11 @@ public class SocksSocketFactory extends 
     return socket;
   }
 
-  /* @inheritDoc */
   @Override
   public int hashCode() {
     return proxy.hashCode();
   }
 
-  /* @inheritDoc */
   @Override
   public boolean equals(Object obj) {
     if (this == obj)
@@ -132,12 +125,12 @@ public class SocksSocketFactory extends 
     return true;
   }
 
-  /* @inheritDoc */
+  @Override
   public Configuration getConf() {
     return this.conf;
   }
 
-  /* @inheritDoc */
+  @Override
   public void setConf(Configuration conf) {
     this.conf = conf;
     String proxyStr = conf.get("hadoop.socks.server");

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/StandardSocketFactory.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/StandardSocketFactory.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/StandardSocketFactory.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/StandardSocketFactory.java Sat Aug 25 01:23:52 2012
@@ -42,7 +42,6 @@ public class StandardSocketFactory exten
   public StandardSocketFactory() {
   }
 
-  /* @inheritDoc */
   @Override
   public Socket createSocket() throws IOException {
     /*
@@ -63,7 +62,6 @@ public class StandardSocketFactory exten
     return SocketChannel.open().socket();
   }
 
-  /* @inheritDoc */
   @Override
   public Socket createSocket(InetAddress addr, int port) throws IOException {
 
@@ -72,7 +70,6 @@ public class StandardSocketFactory exten
     return socket;
   }
 
-  /* @inheritDoc */
   @Override
   public Socket createSocket(InetAddress addr, int port,
       InetAddress localHostAddr, int localPort) throws IOException {
@@ -83,7 +80,6 @@ public class StandardSocketFactory exten
     return socket;
   }
 
-  /* @inheritDoc */
   @Override
   public Socket createSocket(String host, int port) throws IOException,
       UnknownHostException {
@@ -93,7 +89,6 @@ public class StandardSocketFactory exten
     return socket;
   }
 
-  /* @inheritDoc */
   @Override
   public Socket createSocket(String host, int port,
       InetAddress localHostAddr, int localPort) throws IOException,
@@ -105,7 +100,6 @@ public class StandardSocketFactory exten
     return socket;
   }
 
-  /* @inheritDoc */
   @Override
   public boolean equals(Object obj) {
     if (this == obj)
@@ -115,7 +109,6 @@ public class StandardSocketFactory exten
     return obj.getClass().equals(this.getClass());
   }
 
-  /* @inheritDoc */
   @Override
   public int hashCode() {
     return this.getClass().hashCode();

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/TableMapping.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/TableMapping.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/TableMapping.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/TableMapping.java Sat Aug 25 01:23:52 2012
@@ -125,6 +125,7 @@ public class TableMapping extends Cached
       }
     }
   
+    @Override
     public synchronized List<String> resolve(List<String> names) {
       if (!initialized) {
         initialized = true;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordInput.java Sat Aug 25 01:23:52 2012
@@ -41,9 +41,11 @@ public class BinaryRecordInput implement
     private BinaryIndex(int nelems) {
       this.nelems = nelems;
     }
+    @Override
     public boolean done() {
       return (nelems <= 0);
     }
+    @Override
     public void incr() {
       nelems--;
     }
@@ -56,6 +58,7 @@ public class BinaryRecordInput implement
   }
     
   private static ThreadLocal bIn = new ThreadLocal() {
+      @Override
       protected synchronized Object initialValue() {
         return new BinaryRecordInput();
       }
@@ -82,34 +85,42 @@ public class BinaryRecordInput implement
     this.in = din;
   }
     
+  @Override
   public byte readByte(final String tag) throws IOException {
     return in.readByte();
   }
     
+  @Override
   public boolean readBool(final String tag) throws IOException {
     return in.readBoolean();
   }
     
+  @Override
   public int readInt(final String tag) throws IOException {
     return Utils.readVInt(in);
   }
     
+  @Override
   public long readLong(final String tag) throws IOException {
     return Utils.readVLong(in);
   }
     
+  @Override
   public float readFloat(final String tag) throws IOException {
     return in.readFloat();
   }
     
+  @Override
   public double readDouble(final String tag) throws IOException {
     return in.readDouble();
   }
     
+  @Override
   public String readString(final String tag) throws IOException {
     return Utils.fromBinaryString(in);
   }
     
+  @Override
   public Buffer readBuffer(final String tag) throws IOException {
     final int len = Utils.readVInt(in);
     final byte[] barr = new byte[len];
@@ -117,26 +128,32 @@ public class BinaryRecordInput implement
     return new Buffer(barr);
   }
     
+  @Override
   public void startRecord(final String tag) throws IOException {
     // no-op
   }
     
+  @Override
   public void endRecord(final String tag) throws IOException {
     // no-op
   }
     
+  @Override
   public Index startVector(final String tag) throws IOException {
     return new BinaryIndex(readInt(tag));
   }
     
+  @Override
   public void endVector(final String tag) throws IOException {
     // no-op
   }
     
+  @Override
   public Index startMap(final String tag) throws IOException {
     return new BinaryIndex(readInt(tag));
   }
     
+  @Override
   public void endMap(final String tag) throws IOException {
     // no-op
   }

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/BinaryRecordOutput.java Sat Aug 25 01:23:52 2012
@@ -45,6 +45,7 @@ public class BinaryRecordOutput implemen
   }
     
   private static ThreadLocal bOut = new ThreadLocal() {
+      @Override
       protected synchronized Object initialValue() {
         return new BinaryRecordOutput();
       }
@@ -72,34 +73,42 @@ public class BinaryRecordOutput implemen
   }
     
     
+  @Override
   public void writeByte(byte b, String tag) throws IOException {
     out.writeByte(b);
   }
     
+  @Override
   public void writeBool(boolean b, String tag) throws IOException {
     out.writeBoolean(b);
   }
     
+  @Override
   public void writeInt(int i, String tag) throws IOException {
     Utils.writeVInt(out, i);
   }
     
+  @Override
   public void writeLong(long l, String tag) throws IOException {
     Utils.writeVLong(out, l);
   }
     
+  @Override
   public void writeFloat(float f, String tag) throws IOException {
     out.writeFloat(f);
   }
     
+  @Override
   public void writeDouble(double d, String tag) throws IOException {
     out.writeDouble(d);
   }
     
+  @Override
   public void writeString(String s, String tag) throws IOException {
     Utils.toBinaryString(out, s);
   }
     
+  @Override
   public void writeBuffer(Buffer buf, String tag)
     throws IOException {
     byte[] barr = buf.get();
@@ -108,20 +117,26 @@ public class BinaryRecordOutput implemen
     out.write(barr, 0, len);
   }
     
+  @Override
   public void startRecord(Record r, String tag) throws IOException {}
     
+  @Override
   public void endRecord(Record r, String tag) throws IOException {}
     
+  @Override
   public void startVector(ArrayList v, String tag) throws IOException {
     writeInt(v.size(), tag);
   }
     
+  @Override
   public void endVector(ArrayList v, String tag) throws IOException {}
     
+  @Override
   public void startMap(TreeMap v, String tag) throws IOException {
     writeInt(v.size(), tag);
   }
     
+  @Override
   public void endMap(TreeMap v, String tag) throws IOException {}
     
 }

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Buffer.java Sat Aug 25 01:23:52 2012
@@ -187,6 +187,7 @@ public class Buffer implements Comparabl
   }
   
   // inherit javadoc
+  @Override
   public int hashCode() {
     int hash = 1;
     byte[] b = this.get();
@@ -202,6 +203,7 @@ public class Buffer implements Comparabl
    * @return Positive if this is bigger than other, 0 if they are equal, and
    *         negative if this is smaller than other.
    */
+  @Override
   public int compareTo(Object other) {
     Buffer right = ((Buffer) other);
     byte[] lb = this.get();
@@ -217,6 +219,7 @@ public class Buffer implements Comparabl
   }
   
   // inherit javadoc
+  @Override
   public boolean equals(Object other) {
     if (other instanceof Buffer && this != other) {
       return compareTo(other) == 0;
@@ -225,6 +228,7 @@ public class Buffer implements Comparabl
   }
   
   // inheric javadoc
+  @Override
   public String toString() {
     StringBuilder sb = new StringBuilder(2*count);
     for(int idx = 0; idx < count; idx++) {
@@ -245,6 +249,7 @@ public class Buffer implements Comparabl
   }
   
   // inherit javadoc
+  @Override
   public Object clone() throws CloneNotSupportedException {
     Buffer result = (Buffer) super.clone();
     result.copy(this.get(), 0, this.getCount());

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordInput.java Sat Aug 25 01:23:52 2012
@@ -38,6 +38,7 @@ public class CsvRecordInput implements R
   private PushbackReader stream;
     
   private class CsvIndex implements Index {
+    @Override
     public boolean done() {
       char c = '\0';
       try {
@@ -47,6 +48,7 @@ public class CsvRecordInput implements R
       }
       return (c == '}') ? true : false;
     }
+    @Override
     public void incr() {}
   }
     
@@ -85,19 +87,23 @@ public class CsvRecordInput implements R
     }
   }
     
+  @Override
   public byte readByte(String tag) throws IOException {
     return (byte) readLong(tag);
   }
     
+  @Override
   public boolean readBool(String tag) throws IOException {
     String sval = readField(tag);
     return "T".equals(sval) ? true : false;
   }
     
+  @Override
   public int readInt(String tag) throws IOException {
     return (int) readLong(tag);
   }
     
+  @Override
   public long readLong(String tag) throws IOException {
     String sval = readField(tag);
     try {
@@ -108,10 +114,12 @@ public class CsvRecordInput implements R
     }
   }
     
+  @Override
   public float readFloat(String tag) throws IOException {
     return (float) readDouble(tag);
   }
     
+  @Override
   public double readDouble(String tag) throws IOException {
     String sval = readField(tag);
     try {
@@ -122,16 +130,19 @@ public class CsvRecordInput implements R
     }
   }
     
+  @Override
   public String readString(String tag) throws IOException {
     String sval = readField(tag);
     return Utils.fromCSVString(sval);
   }
     
+  @Override
   public Buffer readBuffer(String tag) throws IOException {
     String sval = readField(tag);
     return Utils.fromCSVBuffer(sval);
   }
     
+  @Override
   public void startRecord(String tag) throws IOException {
     if (tag != null && !"".equals(tag)) {
       char c1 = (char) stream.read();
@@ -142,6 +153,7 @@ public class CsvRecordInput implements R
     }
   }
     
+  @Override
   public void endRecord(String tag) throws IOException {
     char c = (char) stream.read();
     if (tag == null || "".equals(tag)) {
@@ -163,6 +175,7 @@ public class CsvRecordInput implements R
     return;
   }
     
+  @Override
   public Index startVector(String tag) throws IOException {
     char c1 = (char) stream.read();
     char c2 = (char) stream.read();
@@ -172,6 +185,7 @@ public class CsvRecordInput implements R
     return new CsvIndex();
   }
     
+  @Override
   public void endVector(String tag) throws IOException {
     char c = (char) stream.read();
     if (c != '}') {
@@ -184,6 +198,7 @@ public class CsvRecordInput implements R
     return;
   }
     
+  @Override
   public Index startMap(String tag) throws IOException {
     char c1 = (char) stream.read();
     char c2 = (char) stream.read();
@@ -193,6 +208,7 @@ public class CsvRecordInput implements R
     return new CsvIndex();
   }
     
+  @Override
   public void endMap(String tag) throws IOException {
     char c = (char) stream.read();
     if (c != '}') {

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/CsvRecordOutput.java Sat Aug 25 01:23:52 2012
@@ -61,10 +61,12 @@ public class CsvRecordOutput implements 
     }
   }
     
+  @Override
   public void writeByte(byte b, String tag) throws IOException {
     writeLong((long)b, tag);
   }
     
+  @Override
   public void writeBool(boolean b, String tag) throws IOException {
     printCommaUnlessFirst();
     String val = b ? "T" : "F";
@@ -72,32 +74,38 @@ public class CsvRecordOutput implements 
     throwExceptionOnError(tag);
   }
     
+  @Override
   public void writeInt(int i, String tag) throws IOException {
     writeLong((long)i, tag);
   }
     
+  @Override
   public void writeLong(long l, String tag) throws IOException {
     printCommaUnlessFirst();
     stream.print(l);
     throwExceptionOnError(tag);
   }
     
+  @Override
   public void writeFloat(float f, String tag) throws IOException {
     writeDouble((double)f, tag);
   }
     
+  @Override
   public void writeDouble(double d, String tag) throws IOException {
     printCommaUnlessFirst();
     stream.print(d);
     throwExceptionOnError(tag);
   }
     
+  @Override
   public void writeString(String s, String tag) throws IOException {
     printCommaUnlessFirst();
     stream.print(Utils.toCSVString(s));
     throwExceptionOnError(tag);
   }
     
+  @Override
   public void writeBuffer(Buffer buf, String tag)
     throws IOException {
     printCommaUnlessFirst();
@@ -105,6 +113,7 @@ public class CsvRecordOutput implements 
     throwExceptionOnError(tag);
   }
     
+  @Override
   public void startRecord(Record r, String tag) throws IOException {
     if (tag != null && !"".equals(tag)) {
       printCommaUnlessFirst();
@@ -113,6 +122,7 @@ public class CsvRecordOutput implements 
     }
   }
     
+  @Override
   public void endRecord(Record r, String tag) throws IOException {
     if (tag == null || "".equals(tag)) {
       stream.print("\n");
@@ -123,23 +133,27 @@ public class CsvRecordOutput implements 
     }
   }
     
+  @Override
   public void startVector(ArrayList v, String tag) throws IOException {
     printCommaUnlessFirst();
     stream.print("v{");
     isFirst = true;
   }
     
+  @Override
   public void endVector(ArrayList v, String tag) throws IOException {
     stream.print("}");
     isFirst = false;
   }
     
+  @Override
   public void startMap(TreeMap v, String tag) throws IOException {
     printCommaUnlessFirst();
     stream.print("m{");
     isFirst = true;
   }
     
+  @Override
   public void endMap(TreeMap v, String tag) throws IOException {
     stream.print("}");
     isFirst = false;

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/Record.java Sat Aug 25 01:23:52 2012
@@ -54,6 +54,7 @@ public abstract class Record implements 
     throws IOException;
   
   // inheric javadoc
+  @Override
   public abstract int compareTo (final Object peer) throws ClassCastException;
   
   /**
@@ -73,18 +74,21 @@ public abstract class Record implements 
   }
   
   // inherit javadoc
+  @Override
   public void write(final DataOutput out) throws java.io.IOException {
     BinaryRecordOutput bout = BinaryRecordOutput.get(out);
     this.serialize(bout);
   }
   
   // inherit javadoc
+  @Override
   public void readFields(final DataInput din) throws java.io.IOException {
     BinaryRecordInput rin = BinaryRecordInput.get(din);
     this.deserialize(rin);
   }
 
   // inherit javadoc
+  @Override
   public String toString() {
     try {
       ByteArrayOutputStream s = new ByteArrayOutputStream();

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/RecordComparator.java Sat Aug 25 01:23:52 2012
@@ -40,6 +40,7 @@ public abstract class RecordComparator e
   }
   
   // inheric JavaDoc
+  @Override
   public abstract int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2);
   
   /**

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordInput.java Sat Aug 25 01:23:52 2012
@@ -63,10 +63,13 @@ public class XmlRecordInput implements R
       valList = vlist;
     }
         
+    @Override
     public void startDocument() throws SAXException {}
         
+    @Override
     public void endDocument() throws SAXException {}
         
+    @Override
     public void startElement(String ns,
                              String sname,
                              String qname,
@@ -88,6 +91,7 @@ public class XmlRecordInput implements R
       }
     }
         
+    @Override
     public void endElement(String ns,
                            String sname,
                            String qname) throws SAXException {
@@ -98,6 +102,7 @@ public class XmlRecordInput implements R
       }
     }
         
+    @Override
     public void characters(char buf[], int offset, int len)
       throws SAXException {
       if (charsValid) {
@@ -109,6 +114,7 @@ public class XmlRecordInput implements R
   }
     
   private class XmlIndex implements Index {
+    @Override
     public boolean done() {
       Value v = valList.get(vIdx);
       if ("/array".equals(v.getType())) {
@@ -119,6 +125,7 @@ public class XmlRecordInput implements R
         return false;
       }
     }
+    @Override
     public void incr() {}
   }
     
@@ -152,6 +159,7 @@ public class XmlRecordInput implements R
     }
   }
     
+  @Override
   public byte readByte(String tag) throws IOException {
     Value v = next();
     if (!"ex:i1".equals(v.getType())) {
@@ -160,6 +168,7 @@ public class XmlRecordInput implements R
     return Byte.parseByte(v.getValue());
   }
     
+  @Override
   public boolean readBool(String tag) throws IOException {
     Value v = next();
     if (!"boolean".equals(v.getType())) {
@@ -168,6 +177,7 @@ public class XmlRecordInput implements R
     return "1".equals(v.getValue());
   }
     
+  @Override
   public int readInt(String tag) throws IOException {
     Value v = next();
     if (!"i4".equals(v.getType()) &&
@@ -177,6 +187,7 @@ public class XmlRecordInput implements R
     return Integer.parseInt(v.getValue());
   }
     
+  @Override
   public long readLong(String tag) throws IOException {
     Value v = next();
     if (!"ex:i8".equals(v.getType())) {
@@ -185,6 +196,7 @@ public class XmlRecordInput implements R
     return Long.parseLong(v.getValue());
   }
     
+  @Override
   public float readFloat(String tag) throws IOException {
     Value v = next();
     if (!"ex:float".equals(v.getType())) {
@@ -193,6 +205,7 @@ public class XmlRecordInput implements R
     return Float.parseFloat(v.getValue());
   }
     
+  @Override
   public double readDouble(String tag) throws IOException {
     Value v = next();
     if (!"double".equals(v.getType())) {
@@ -201,6 +214,7 @@ public class XmlRecordInput implements R
     return Double.parseDouble(v.getValue());
   }
     
+  @Override
   public String readString(String tag) throws IOException {
     Value v = next();
     if (!"string".equals(v.getType())) {
@@ -209,6 +223,7 @@ public class XmlRecordInput implements R
     return Utils.fromXMLString(v.getValue());
   }
     
+  @Override
   public Buffer readBuffer(String tag) throws IOException {
     Value v = next();
     if (!"string".equals(v.getType())) {
@@ -217,6 +232,7 @@ public class XmlRecordInput implements R
     return Utils.fromXMLBuffer(v.getValue());
   }
     
+  @Override
   public void startRecord(String tag) throws IOException {
     Value v = next();
     if (!"struct".equals(v.getType())) {
@@ -224,6 +240,7 @@ public class XmlRecordInput implements R
     }
   }
     
+  @Override
   public void endRecord(String tag) throws IOException {
     Value v = next();
     if (!"/struct".equals(v.getType())) {
@@ -231,6 +248,7 @@ public class XmlRecordInput implements R
     }
   }
     
+  @Override
   public Index startVector(String tag) throws IOException {
     Value v = next();
     if (!"array".equals(v.getType())) {
@@ -239,12 +257,15 @@ public class XmlRecordInput implements R
     return new XmlIndex();
   }
     
+  @Override
   public void endVector(String tag) throws IOException {}
     
+  @Override
   public Index startMap(String tag) throws IOException {
     return startVector(tag);
   }
     
+  @Override
   public void endMap(String tag) throws IOException { endVector(tag); }
 
 }

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/XmlRecordOutput.java Sat Aug 25 01:23:52 2012
@@ -149,6 +149,7 @@ public class XmlRecordOutput implements 
     }
   }
     
+  @Override
   public void writeByte(byte b, String tag) throws IOException {
     printBeginEnvelope(tag);
     stream.print("<ex:i1>");
@@ -157,6 +158,7 @@ public class XmlRecordOutput implements 
     printEndEnvelope(tag);
   }
     
+  @Override
   public void writeBool(boolean b, String tag) throws IOException {
     printBeginEnvelope(tag);
     stream.print("<boolean>");
@@ -165,6 +167,7 @@ public class XmlRecordOutput implements 
     printEndEnvelope(tag);
   }
     
+  @Override
   public void writeInt(int i, String tag) throws IOException {
     printBeginEnvelope(tag);
     stream.print("<i4>");
@@ -173,6 +176,7 @@ public class XmlRecordOutput implements 
     printEndEnvelope(tag);
   }
     
+  @Override
   public void writeLong(long l, String tag) throws IOException {
     printBeginEnvelope(tag);
     stream.print("<ex:i8>");
@@ -181,6 +185,7 @@ public class XmlRecordOutput implements 
     printEndEnvelope(tag);
   }
     
+  @Override
   public void writeFloat(float f, String tag) throws IOException {
     printBeginEnvelope(tag);
     stream.print("<ex:float>");
@@ -189,6 +194,7 @@ public class XmlRecordOutput implements 
     printEndEnvelope(tag);
   }
     
+  @Override
   public void writeDouble(double d, String tag) throws IOException {
     printBeginEnvelope(tag);
     stream.print("<double>");
@@ -197,6 +203,7 @@ public class XmlRecordOutput implements 
     printEndEnvelope(tag);
   }
     
+  @Override
   public void writeString(String s, String tag) throws IOException {
     printBeginEnvelope(tag);
     stream.print("<string>");
@@ -205,6 +212,7 @@ public class XmlRecordOutput implements 
     printEndEnvelope(tag);
   }
     
+  @Override
   public void writeBuffer(Buffer buf, String tag)
     throws IOException {
     printBeginEnvelope(tag);
@@ -214,12 +222,14 @@ public class XmlRecordOutput implements 
     printEndEnvelope(tag);
   }
     
+  @Override
   public void startRecord(Record r, String tag) throws IOException {
     insideRecord(tag);
     stream.print("<struct>\n");
     addIndent();
   }
     
+  @Override
   public void endRecord(Record r, String tag) throws IOException {
     closeIndent();
     putIndent();
@@ -227,12 +237,14 @@ public class XmlRecordOutput implements 
     outsideRecord(tag);
   }
     
+  @Override
   public void startVector(ArrayList v, String tag) throws IOException {
     insideVector(tag);
     stream.print("<array>\n");
     addIndent();
   }
     
+  @Override
   public void endVector(ArrayList v, String tag) throws IOException {
     closeIndent();
     putIndent();
@@ -240,12 +252,14 @@ public class XmlRecordOutput implements 
     outsideVector(tag);
   }
     
+  @Override
   public void startMap(TreeMap v, String tag) throws IOException {
     insideMap(tag);
     stream.print("<array>\n");
     addIndent();
   }
     
+  @Override
   public void endMap(TreeMap v, String tag) throws IOException {
     closeIndent();
     putIndent();

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CGenerator.java Sat Aug 25 01:23:52 2012
@@ -37,6 +37,7 @@ class CGenerator extends CodeGenerator {
    * and spits-out file-level elements (such as include statements etc.)
    * record-level code is generated by JRecord.
    */
+  @Override
   void genCode(String name, ArrayList<JFile> ilist,
                ArrayList<JRecord> rlist, String destDir, ArrayList<String> options)
     throws IOException {

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CodeBuffer.java Sat Aug 25 01:23:52 2012
@@ -98,6 +98,7 @@ public class CodeBuffer {
     sb.append(ch);
   }
   
+  @Override
   public String toString() {
     return sb.toString();
   }

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/Consts.java Sat Aug 25 01:23:52 2012
@@ -18,12 +18,8 @@
 
 package org.apache.hadoop.record.compiler;
 
-import java.io.IOException;
-import java.util.Iterator;
-
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
-import org.apache.hadoop.record.RecordInput;
 
 /**
  * const definitions for Record I/O compiler

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/CppGenerator.java Sat Aug 25 01:23:52 2012
@@ -37,6 +37,7 @@ class CppGenerator extends CodeGenerator
    * and spits-out file-level elements (such as include statements etc.)
    * record-level code is generated by JRecord.
    */
+  @Override
   void genCode(String name, ArrayList<JFile> ilist,
                ArrayList<JRecord> rlist, String destDir, ArrayList<String> options)
     throws IOException {

Modified: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java?rev=1377176&r1=1377175&r2=1377176&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java (original)
+++ hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/record/compiler/JBoolean.java Sat Aug 25 01:23:52 2012
@@ -36,20 +36,24 @@ public class JBoolean extends JType {
       super("boolean", "Bool", "Boolean", "TypeID.RIOType.BOOL");
     }
     
+    @Override
     void genCompareTo(CodeBuffer cb, String fname, String other) {
       cb.append(Consts.RIO_PREFIX + "ret = ("+fname+" == "+other+")? 0 : ("+
           fname+"?1:-1);\n");
     }
     
+    @Override
     String getTypeIDObjectString() {
       return "org.apache.hadoop.record.meta.TypeID.BoolTypeID";
     }
 
+    @Override
     void genHashCode(CodeBuffer cb, String fname) {
       cb.append(Consts.RIO_PREFIX + "ret = ("+fname+")?0:1;\n");
     }
     
     // In Binary format, boolean is written as byte. true = 1, false = 0
+    @Override
     void genSlurpBytes(CodeBuffer cb, String b, String s, String l) {
       cb.append("{\n");
       cb.append("if ("+l+"<1) {\n");
@@ -61,6 +65,7 @@ public class JBoolean extends JType {
     }
     
     // In Binary format, boolean is written as byte. true = 1, false = 0
+    @Override
     void genCompareBytes(CodeBuffer cb) {
       cb.append("{\n");
       cb.append("if (l1<1 || l2<1) {\n");
@@ -81,6 +86,7 @@ public class JBoolean extends JType {
       super("bool");
     }
     
+    @Override
     String getTypeIDObjectString() {
       return "new ::hadoop::TypeID(::hadoop::RIOTYPE_BOOL)";
     }
@@ -93,6 +99,7 @@ public class JBoolean extends JType {
     setCType(new CType());
   }
   
+  @Override
   String getSignature() {
     return "z";
   }



Mime
View raw message