Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-3844. Merge change 1377168 from trunk. Contributed by Jing Zhao. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1377176 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2012-08-25 01:23:52 +00:00
parent 2ff2b79e33
commit 5998a179b4
380 changed files with 1289 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-common-project/hadoop-annotations/src/main/java/org/apache/hadoop/classification/tools/RootDocProcessor.java
View File

@ -97,6 +97,7 @@ public ExcludeHandler(Object target) {
this.target = target; this.target = target;
} }
@Override
public Object invoke(Object proxy, Method method, Object[] args) public Object invoke(Object proxy, Method method, Object[] args)
throws Throwable { throws Throwable {
String methodName = method.getName(); String methodName = method.getName();

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
View File

@ -1809,6 +1809,7 @@ public void clear() {
* *
* @return an iterator over the entries. * @return an iterator over the entries.
*/ */
@Override
public Iterator<Map.Entry<String, String>> iterator() { public Iterator<Map.Entry<String, String>> iterator() {
// Get a copy of just the string to string pairs. After the old object // Get a copy of just the string to string pairs. After the old object
// methods that allow non-strings to be put into configurations are removed, // methods that allow non-strings to be put into configurations are removed,
@ -2234,6 +2235,7 @@ public void readFields(DataInput in) throws IOException {
} }
//@Override //@Override
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
Properties props = getProps(); Properties props = getProps();
WritableUtils.writeVInt(out, props.size()); WritableUtils.writeVInt(out, props.size());

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configured.java
View File

@ -39,11 +39,13 @@ public Configured(Configuration conf) {
} }
// inherit javadoc // inherit javadoc
@Override
public void setConf(Configuration conf) { public void setConf(Configuration conf) {
this.conf = conf; this.conf = conf;
} }
// inherit javadoc // inherit javadoc
@Override
public Configuration getConf() { public Configuration getConf() {
return conf; return conf;
} }

11
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java
View File

@ -23,12 +23,10 @@
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import java.util.Collection; import java.util.Collection;
import java.util.Map;
import java.util.Enumeration; import java.util.Enumeration;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import javax.servlet.ServletContext;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -57,9 +55,6 @@ public class ReconfigurationServlet extends HttpServlet {
public static final String CONF_SERVLET_RECONFIGURABLE_PREFIX = public static final String CONF_SERVLET_RECONFIGURABLE_PREFIX =
"conf.servlet.reconfigurable."; "conf.servlet.reconfigurable.";
/**
* {@inheritDoc}
*/
@Override @Override
public void init() throws ServletException { public void init() throws ServletException {
super.init(); super.init();
@ -202,9 +197,6 @@ private void applyChanges(PrintWriter out, Reconfigurable reconf,
} }
} }
/**
* {@inheritDoc}
*/
@Override @Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) protected void doGet(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException { throws ServletException, IOException {
@ -219,9 +211,6 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
printFooter(out); printFooter(out);
} }
/**
* {@inheritDoc}
*/
@Override @Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) protected void doPost(HttpServletRequest req, HttpServletResponse resp)
throws ServletException, IOException { throws ServletException, IOException {

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AbstractFileSystem.java
View File

@ -47,7 +47,6 @@
import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.security.SecurityUtil; import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.util.DataChecksum;
import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.Progressable;
/** /**

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/AvroFSInput.java
View File

@ -45,22 +45,27 @@ public AvroFSInput(final FileContext fc, final Path p) throws IOException {
this.stream = fc.open(p); this.stream = fc.open(p);
} }
@Override
public long length() { public long length() {
return len; return len;
} }
@Override
public int read(byte[] b, int off, int len) throws IOException { public int read(byte[] b, int off, int len) throws IOException {
return stream.read(b, off, len); return stream.read(b, off, len);
} }
@Override
public void seek(long p) throws IOException { public void seek(long p) throws IOException {
stream.seek(p); stream.seek(p);
} }
@Override
public long tell() throws IOException { public long tell() throws IOException {
return stream.getPos(); return stream.getPos();
} }
@Override
public void close() throws IOException { public void close() throws IOException {
stream.close(); stream.close();
} }

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/BlockLocation.java
View File

@ -204,6 +204,7 @@ public void setTopologyPaths(String[] topologyPaths) throws IOException {
} }
} }
@Override
public String toString() { public String toString() {
StringBuilder result = new StringBuilder(); StringBuilder result = new StringBuilder();
result.append(offset); result.append(offset);

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/BufferedFSInputStream.java
View File

@ -19,7 +19,6 @@
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
@ -50,10 +49,12 @@ public BufferedFSInputStream(FSInputStream in, int size) {
super(in, size); super(in, size);
} }
@Override
public long getPos() throws IOException { public long getPos() throws IOException {
return ((FSInputStream)in).getPos()-(count-pos); return ((FSInputStream)in).getPos()-(count-pos);
} }
@Override
public long skip(long n) throws IOException { public long skip(long n) throws IOException {
if (n <= 0) { if (n <= 0) {
return 0; return 0;
@ -63,6 +64,7 @@ public long skip(long n) throws IOException {
return n; return n;
} }
@Override
public void seek(long pos) throws IOException { public void seek(long pos) throws IOException {
if( pos<0 ) { if( pos<0 ) {
return; return;
@ -82,20 +84,24 @@ public void seek(long pos) throws IOException {
((FSInputStream)in).seek(pos); ((FSInputStream)in).seek(pos);
} }
@Override
public boolean seekToNewSource(long targetPos) throws IOException { public boolean seekToNewSource(long targetPos) throws IOException {
pos = 0; pos = 0;
count = 0; count = 0;
return ((FSInputStream)in).seekToNewSource(targetPos); return ((FSInputStream)in).seekToNewSource(targetPos);
} }
@Override
public int read(long position, byte[] buffer, int offset, int length) throws IOException { public int read(long position, byte[] buffer, int offset, int length) throws IOException {
return ((FSInputStream)in).read(position, buffer, offset, length) ; return ((FSInputStream)in).read(position, buffer, offset, length) ;
} }
@Override
public void readFully(long position, byte[] buffer, int offset, int length) throws IOException { public void readFully(long position, byte[] buffer, int offset, int length) throws IOException {
((FSInputStream)in).readFully(position, buffer, offset, length); ((FSInputStream)in).readFully(position, buffer, offset, length);
} }
@Override
public void readFully(long position, byte[] buffer) throws IOException { public void readFully(long position, byte[] buffer) throws IOException {
((FSInputStream)in).readFully(position, buffer); ((FSInputStream)in).readFully(position, buffer);
} }

18
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java
View File

@ -53,6 +53,7 @@ public ChecksumFileSystem(FileSystem fs) {
super(fs); super(fs);
} }
@Override
public void setConf(Configuration conf) { public void setConf(Configuration conf) {
super.setConf(conf); super.setConf(conf);
if (conf != null) { if (conf != null) {
@ -64,6 +65,7 @@ public void setConf(Configuration conf) {
/** /**
* Set whether to verify checksum. * Set whether to verify checksum.
*/ */
@Override
public void setVerifyChecksum(boolean verifyChecksum) { public void setVerifyChecksum(boolean verifyChecksum) {
this.verifyChecksum = verifyChecksum; this.verifyChecksum = verifyChecksum;
} }
@ -74,6 +76,7 @@ public void setWriteChecksum(boolean writeChecksum) {
} }
/** get the raw file system */ /** get the raw file system */
@Override
public FileSystem getRawFileSystem() { public FileSystem getRawFileSystem() {
return fs; return fs;
} }
@ -162,14 +165,17 @@ private long getChecksumFilePos( long dataPos ) {
return HEADER_LENGTH + 4*(dataPos/bytesPerSum); return HEADER_LENGTH + 4*(dataPos/bytesPerSum);
} }
@Override
protected long getChunkPosition( long dataPos ) { protected long getChunkPosition( long dataPos ) {
return dataPos/bytesPerSum*bytesPerSum; return dataPos/bytesPerSum*bytesPerSum;
} }
@Override
public int available() throws IOException { public int available() throws IOException {
return datas.available() + super.available(); return datas.available() + super.available();
} }
@Override
public int read(long position, byte[] b, int off, int len) public int read(long position, byte[] b, int off, int len)
throws IOException { throws IOException {
// parameter check // parameter check
@ -190,6 +196,7 @@ public int read(long position, byte[] b, int off, int len)
return nread; return nread;
} }
@Override
public void close() throws IOException { public void close() throws IOException {
datas.close(); datas.close();
if( sums != null ) { if( sums != null ) {
@ -290,6 +297,7 @@ private long getFileLength() throws IOException {
* @exception IOException if an I/O error occurs. * @exception IOException if an I/O error occurs.
* ChecksumException if the chunk to skip to is corrupted * ChecksumException if the chunk to skip to is corrupted
*/ */
@Override
public synchronized long skip(long n) throws IOException { public synchronized long skip(long n) throws IOException {
long curPos = getPos(); long curPos = getPos();
long fileLength = getFileLength(); long fileLength = getFileLength();
@ -311,6 +319,7 @@ public synchronized long skip(long n) throws IOException {
* ChecksumException if the chunk to seek to is corrupted * ChecksumException if the chunk to seek to is corrupted
*/ */
@Override
public synchronized void seek(long pos) throws IOException { public synchronized void seek(long pos) throws IOException {
if(pos>getFileLength()) { if(pos>getFileLength()) {
throw new IOException("Cannot seek after EOF"); throw new IOException("Cannot seek after EOF");
@ -339,7 +348,7 @@ public FSDataInputStream open(Path f, int bufferSize) throws IOException {
return new FSDataBoundedInputStream(fs, f, in); return new FSDataBoundedInputStream(fs, f, in);
} }
/** {@inheritDoc} */ @Override
public FSDataOutputStream append(Path f, int bufferSize, public FSDataOutputStream append(Path f, int bufferSize,
Progressable progress) throws IOException { Progressable progress) throws IOException {
throw new IOException("Not supported"); throw new IOException("Not supported");
@ -398,6 +407,7 @@ public ChecksumFSOutputSummer(ChecksumFileSystem fs,
sums.writeInt(bytesPerSum); sums.writeInt(bytesPerSum);
} }
@Override
public void close() throws IOException { public void close() throws IOException {
flushBuffer(); flushBuffer();
sums.close(); sums.close();
@ -412,7 +422,6 @@ protected void writeChunk(byte[] b, int offset, int len, byte[] checksum)
} }
} }
/** {@inheritDoc} */
@Override @Override
public FSDataOutputStream create(Path f, FsPermission permission, public FSDataOutputStream create(Path f, FsPermission permission,
boolean overwrite, int bufferSize, short replication, long blockSize, boolean overwrite, int bufferSize, short replication, long blockSize,
@ -454,7 +463,6 @@ private FSDataOutputStream create(Path f, FsPermission permission,
return out; return out;
} }
/** {@inheritDoc} */
@Override @Override
public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, public FSDataOutputStream createNonRecursive(Path f, FsPermission permission,
boolean overwrite, int bufferSize, short replication, long blockSize, boolean overwrite, int bufferSize, short replication, long blockSize,
@ -472,6 +480,7 @@ public FSDataOutputStream createNonRecursive(Path f, FsPermission permission,
* @return true if successful; * @return true if successful;
* false if file does not exist or is a directory * false if file does not exist or is a directory
*/ */
@Override
public boolean setReplication(Path src, short replication) throws IOException { public boolean setReplication(Path src, short replication) throws IOException {
boolean value = fs.setReplication(src, replication); boolean value = fs.setReplication(src, replication);
if (!value) if (!value)
@ -487,6 +496,7 @@ public boolean setReplication(Path src, short replication) throws IOException {
/** /**
* Rename files/dirs * Rename files/dirs
*/ */
@Override
public boolean rename(Path src, Path dst) throws IOException { public boolean rename(Path src, Path dst) throws IOException {
if (fs.isDirectory(src)) { if (fs.isDirectory(src)) {
return fs.rename(src, dst); return fs.rename(src, dst);
@ -516,6 +526,7 @@ public boolean rename(Path src, Path dst) throws IOException {
* Implement the delete(Path, boolean) in checksum * Implement the delete(Path, boolean) in checksum
* file system. * file system.
*/ */
@Override
public boolean delete(Path f, boolean recursive) throws IOException{ public boolean delete(Path f, boolean recursive) throws IOException{
FileStatus fstatus = null; FileStatus fstatus = null;
try { try {
@ -538,6 +549,7 @@ public boolean delete(Path f, boolean recursive) throws IOException{
} }
final private static PathFilter DEFAULT_FILTER = new PathFilter() { final private static PathFilter DEFAULT_FILTER = new PathFilter() {
@Override
public boolean accept(Path file) { public boolean accept(Path file) {
return !isChecksumFile(file); return !isChecksumFile(file);
} }

10
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFs.java
View File

@ -32,7 +32,6 @@
import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.Progressable;
import org.apache.hadoop.util.PureJavaCrc32; import org.apache.hadoop.util.PureJavaCrc32;
import org.apache.hadoop.util.StringUtils;
/** /**
* Abstract Checksumed Fs. * Abstract Checksumed Fs.
@ -61,6 +60,7 @@ public ChecksumFs(AbstractFileSystem theFs)
/** /**
* Set whether to verify checksum. * Set whether to verify checksum.
*/ */
@Override
public void setVerifyChecksum(boolean inVerifyChecksum) { public void setVerifyChecksum(boolean inVerifyChecksum) {
this.verifyChecksum = inVerifyChecksum; this.verifyChecksum = inVerifyChecksum;
} }
@ -152,14 +152,17 @@ private long getChecksumFilePos(long dataPos) {
return HEADER_LENGTH + 4*(dataPos/bytesPerSum); return HEADER_LENGTH + 4*(dataPos/bytesPerSum);
} }
@Override
protected long getChunkPosition(long dataPos) { protected long getChunkPosition(long dataPos) {
return dataPos/bytesPerSum*bytesPerSum; return dataPos/bytesPerSum*bytesPerSum;
} }
@Override
public int available() throws IOException { public int available() throws IOException {
return datas.available() + super.available(); return datas.available() + super.available();
} }
@Override
public int read(long position, byte[] b, int off, int len) public int read(long position, byte[] b, int off, int len)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
// parameter check // parameter check
@ -180,6 +183,7 @@ public int read(long position, byte[] b, int off, int len)
return nread; return nread;
} }
@Override
public void close() throws IOException { public void close() throws IOException {
datas.close(); datas.close();
if (sums != null) { if (sums != null) {
@ -258,6 +262,7 @@ private long getFileLength() throws IOException, UnresolvedLinkException {
* @exception IOException if an I/O error occurs. * @exception IOException if an I/O error occurs.
* ChecksumException if the chunk to skip to is corrupted * ChecksumException if the chunk to skip to is corrupted
*/ */
@Override
public synchronized long skip(long n) throws IOException { public synchronized long skip(long n) throws IOException {
final long curPos = getPos(); final long curPos = getPos();
final long fileLength = getFileLength(); final long fileLength = getFileLength();
@ -279,6 +284,7 @@ public synchronized long skip(long n) throws IOException {
* ChecksumException if the chunk to seek to is corrupted * ChecksumException if the chunk to seek to is corrupted
*/ */
@Override
public synchronized void seek(long pos) throws IOException { public synchronized void seek(long pos) throws IOException {
if (pos>getFileLength()) { if (pos>getFileLength()) {
throw new IOException("Cannot seek after EOF"); throw new IOException("Cannot seek after EOF");
@ -348,6 +354,7 @@ public ChecksumFSOutputSummer(final ChecksumFs fs, final Path file,
sums.writeInt(bytesPerSum); sums.writeInt(bytesPerSum);
} }
@Override
public void close() throws IOException { public void close() throws IOException {
flushBuffer(); flushBuffer();
sums.close(); sums.close();
@ -447,6 +454,7 @@ public void renameInternal(Path src, Path dst)
* Implement the delete(Path, boolean) in checksum * Implement the delete(Path, boolean) in checksum
* file system. * file system.
*/ */
@Override
public boolean delete(Path f, boolean recursive) public boolean delete(Path f, boolean recursive)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
FileStatus fstatus = null; FileStatus fstatus = null;

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ContentSummary.java
View File

@ -75,7 +75,7 @@ public ContentSummary(
/** Returns (disk) space quota */ /** Returns (disk) space quota */
public long getSpaceQuota() {return spaceQuota;} public long getSpaceQuota() {return spaceQuota;}
/** {@inheritDoc} */ @Override
@InterfaceAudience.Private @InterfaceAudience.Private
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeLong(length); out.writeLong(length);
@ -86,7 +86,7 @@ public void write(DataOutput out) throws IOException {
out.writeLong(spaceQuota); out.writeLong(spaceQuota);
} }
/** {@inheritDoc} */ @Override
@InterfaceAudience.Private @InterfaceAudience.Private
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
this.length = in.readLong(); this.length = in.readLong();
@ -131,7 +131,7 @@ public static String getHeader(boolean qOption) {
return qOption ? QUOTA_HEADER : HEADER; return qOption ? QUOTA_HEADER : HEADER;
} }
/** {@inheritDoc} */ @Override
public String toString() { public String toString() {
return toString(true); return toString(true);
} }

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DF.java
View File

@ -131,6 +131,7 @@ public String getMount() throws IOException {
return mount; return mount;
} }
@Override
public String toString() { public String toString() {
return return
"df -k " + mount +"\n" + "df -k " + mount +"\n" +

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/DU.java
View File

@ -76,6 +76,7 @@ public DU(File path, Configuration conf) throws IOException {
**/ **/
class DURefreshThread implements Runnable { class DURefreshThread implements Runnable {
@Override
public void run() { public void run() {
while(shouldRun) { while(shouldRun) {
@ -169,16 +170,19 @@ public void shutdown() {
} }
} }
@Override
public String toString() { public String toString() {
return return
"du -sk " + dirPath +"\n" + "du -sk " + dirPath +"\n" +
used + "\t" + dirPath; used + "\t" + dirPath;
} }
@Override
protected String[] getExecString() { protected String[] getExecString() {
return new String[] {"du", "-sk", dirPath}; return new String[] {"du", "-sk", dirPath};
} }
@Override
protected void parseExecResult(BufferedReader lines) throws IOException { protected void parseExecResult(BufferedReader lines) throws IOException {
String line = lines.readLine(); String line = lines.readLine();
if (line == null) { if (line == null) {

7
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSDataInputStream.java
View File

@ -44,6 +44,7 @@ public FSDataInputStream(InputStream in)
* *
* @param desired offset to seek to * @param desired offset to seek to
*/ */
@Override
public synchronized void seek(long desired) throws IOException { public synchronized void seek(long desired) throws IOException {
((Seekable)in).seek(desired); ((Seekable)in).seek(desired);
} }
@ -53,6 +54,7 @@ public synchronized void seek(long desired) throws IOException {
* *
* @return current position in the input stream * @return current position in the input stream
*/ */
@Override
public long getPos() throws IOException { public long getPos() throws IOException {
return ((Seekable)in).getPos(); return ((Seekable)in).getPos();
} }
@ -68,6 +70,7 @@ public long getPos() throws IOException {
* if there is no more data because the end of the stream has been * if there is no more data because the end of the stream has been
* reached * reached
*/ */
@Override
public int read(long position, byte[] buffer, int offset, int length) public int read(long position, byte[] buffer, int offset, int length)
throws IOException { throws IOException {
return ((PositionedReadable)in).read(position, buffer, offset, length); return ((PositionedReadable)in).read(position, buffer, offset, length);
@ -85,6 +88,7 @@ public int read(long position, byte[] buffer, int offset, int length)
* If an exception is thrown an undetermined number * If an exception is thrown an undetermined number
* of bytes in the buffer may have been written. * of bytes in the buffer may have been written.
*/ */
@Override
public void readFully(long position, byte[] buffer, int offset, int length) public void readFully(long position, byte[] buffer, int offset, int length)
throws IOException { throws IOException {
((PositionedReadable)in).readFully(position, buffer, offset, length); ((PositionedReadable)in).readFully(position, buffer, offset, length);
@ -93,6 +97,7 @@ public void readFully(long position, byte[] buffer, int offset, int length)
/** /**
* See {@link #readFully(long, byte[], int, int)}. * See {@link #readFully(long, byte[], int, int)}.
*/ */
@Override
public void readFully(long position, byte[] buffer) public void readFully(long position, byte[] buffer)
throws IOException { throws IOException {
((PositionedReadable)in).readFully(position, buffer, 0, buffer.length); ((PositionedReadable)in).readFully(position, buffer, 0, buffer.length);
@ -104,6 +109,7 @@ public void readFully(long position, byte[] buffer)
* @param targetPos position to seek to * @param targetPos position to seek to
* @return true if a new source is found, false otherwise * @return true if a new source is found, false otherwise
*/ */
@Override
public boolean seekToNewSource(long targetPos) throws IOException { public boolean seekToNewSource(long targetPos) throws IOException {
return ((Seekable)in).seekToNewSource(targetPos); return ((Seekable)in).seekToNewSource(targetPos);
} }
@ -118,6 +124,7 @@ public InputStream getWrappedStream() {
return in; return in;
} }
@Override
public int read(ByteBuffer buf) throws IOException { public int read(ByteBuffer buf) throws IOException {
if (in instanceof ByteBufferReadable) { if (in instanceof ByteBufferReadable) {
return ((ByteBufferReadable)in).read(buf); return ((ByteBufferReadable)in).read(buf);

7
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputChecker.java
View File

@ -140,6 +140,7 @@ protected synchronized boolean needChecksum() {
* @exception IOException if an I/O error occurs. * @exception IOException if an I/O error occurs.
*/ */
@Override
public synchronized int read() throws IOException { public synchronized int read() throws IOException {
if (pos >= count) { if (pos >= count) {
fill(); fill();
@ -180,6 +181,7 @@ public synchronized int read() throws IOException {
* @exception IOException if an I/O error occurs. * @exception IOException if an I/O error occurs.
* ChecksumException if any checksum error occurs * ChecksumException if any checksum error occurs
*/ */
@Override
public synchronized int read(byte[] b, int off, int len) throws IOException { public synchronized int read(byte[] b, int off, int len) throws IOException {
// parameter check // parameter check
if ((off | len | (off + len) | (b.length - (off + len))) < 0) { if ((off | len | (off + len) | (b.length - (off + len))) < 0) {
@ -367,6 +369,7 @@ public synchronized int available() throws IOException {
* @exception IOException if an I/O error occurs. * @exception IOException if an I/O error occurs.
* ChecksumException if the chunk to skip to is corrupted * ChecksumException if the chunk to skip to is corrupted
*/ */
@Override
public synchronized long skip(long n) throws IOException { public synchronized long skip(long n) throws IOException {
if (n <= 0) { if (n <= 0) {
return 0; return 0;
@ -389,6 +392,7 @@ public synchronized long skip(long n) throws IOException {
* ChecksumException if the chunk to seek to is corrupted * ChecksumException if the chunk to seek to is corrupted
*/ */
@Override
public synchronized void seek(long pos) throws IOException { public synchronized void seek(long pos) throws IOException {
if( pos<0 ) { if( pos<0 ) {
return; return;
@ -462,13 +466,16 @@ final protected synchronized void set(boolean verifyChecksum,
this.pos = 0; this.pos = 0;
} }
@Override
final public boolean markSupported() { final public boolean markSupported() {
return false; return false;
} }
@Override
final public void mark(int readlimit) { final public void mark(int readlimit) {
} }
@Override
final public void reset() throws IOException { final public void reset() throws IOException {
throw new IOException("mark/reset not supported"); throw new IOException("mark/reset not supported");
} }

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSInputStream.java
View File

@ -36,19 +36,23 @@ public abstract class FSInputStream extends InputStream
* The next read() will be from that location. Can't * The next read() will be from that location. Can't
* seek past the end of the file. * seek past the end of the file.
*/ */
@Override
public abstract void seek(long pos) throws IOException; public abstract void seek(long pos) throws IOException;
/** /**
* Return the current offset from the start of the file * Return the current offset from the start of the file
*/ */
@Override
public abstract long getPos() throws IOException; public abstract long getPos() throws IOException;
/** /**
* Seeks a different copy of the data. Returns true if * Seeks a different copy of the data. Returns true if
* found a new source, false otherwise. * found a new source, false otherwise.
*/ */
@Override
public abstract boolean seekToNewSource(long targetPos) throws IOException; public abstract boolean seekToNewSource(long targetPos) throws IOException;
@Override
public int read(long position, byte[] buffer, int offset, int length) public int read(long position, byte[] buffer, int offset, int length)
throws IOException { throws IOException {
synchronized (this) { synchronized (this) {
@ -64,6 +68,7 @@ public int read(long position, byte[] buffer, int offset, int length)
} }
} }
@Override
public void readFully(long position, byte[] buffer, int offset, int length) public void readFully(long position, byte[] buffer, int offset, int length)
throws IOException { throws IOException {
int nread = 0; int nread = 0;
@ -76,6 +81,7 @@ public void readFully(long position, byte[] buffer, int offset, int length)
} }
} }
@Override
public void readFully(long position, byte[] buffer) public void readFully(long position, byte[] buffer)
throws IOException { throws IOException {
readFully(position, buffer, 0, buffer.length); readFully(position, buffer, 0, buffer.length);

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FSOutputSummer.java
View File

@ -55,6 +55,7 @@ protected abstract void writeChunk(byte[] b, int offset, int len, byte[] checksu
throws IOException; throws IOException;
/** Write one byte */ /** Write one byte */
@Override
public synchronized void write(int b) throws IOException { public synchronized void write(int b) throws IOException {
sum.update(b); sum.update(b);
buf[count++] = (byte)b; buf[count++] = (byte)b;
@ -81,6 +82,7 @@ public synchronized void write(int b) throws IOException {
* @param len the number of bytes to write. * @param len the number of bytes to write.
* @exception IOException if an I/O error occurs. * @exception IOException if an I/O error occurs.
*/ */
@Override
public synchronized void write(byte b[], int off, int len) public synchronized void write(byte b[], int off, int len)
throws IOException { throws IOException {
if (off < 0 || len < 0 || off > b.length - len) { if (off < 0 || len < 0 || off > b.length - len) {

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileChecksum.java
View File

@ -37,6 +37,7 @@ public abstract class FileChecksum implements Writable {
public abstract byte[] getBytes(); public abstract byte[] getBytes();
/** Return true if both the algorithms and the values are the same. */ /** Return true if both the algorithms and the values are the same. */
@Override
public boolean equals(Object other) { public boolean equals(Object other) {
if (other == this) { if (other == this) {
return true; return true;
@ -50,7 +51,7 @@ public boolean equals(Object other) {
&& Arrays.equals(this.getBytes(), that.getBytes()); && Arrays.equals(this.getBytes(), that.getBytes());
} }
/** {@inheritDoc} */ @Override
public int hashCode() { public int hashCode() {
return getAlgorithmName().hashCode() ^ Arrays.hashCode(getBytes()); return getAlgorithmName().hashCode() ^ Arrays.hashCode(getBytes());
} }

26
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java
View File

@ -190,6 +190,7 @@ public final class FileContext {
new FileContextFinalizer(); new FileContextFinalizer();
private static final PathFilter DEFAULT_FILTER = new PathFilter() { private static final PathFilter DEFAULT_FILTER = new PathFilter() {
@Override
public boolean accept(final Path file) { public boolean accept(final Path file) {
return true; return true;
} }
@ -318,6 +319,7 @@ private static AbstractFileSystem getAbstractFileSystem(
throws UnsupportedFileSystemException, IOException { throws UnsupportedFileSystemException, IOException {
try { try {
return user.doAs(new PrivilegedExceptionAction<AbstractFileSystem>() { return user.doAs(new PrivilegedExceptionAction<AbstractFileSystem>() {
@Override
public AbstractFileSystem run() throws UnsupportedFileSystemException { public AbstractFileSystem run() throws UnsupportedFileSystemException {
return AbstractFileSystem.get(uri, conf); return AbstractFileSystem.get(uri, conf);
} }
@ -660,6 +662,7 @@ public FSDataOutputStream create(final Path f,
final CreateOpts[] updatedOpts = final CreateOpts[] updatedOpts =
CreateOpts.setOpt(CreateOpts.perms(permission), opts); CreateOpts.setOpt(CreateOpts.perms(permission), opts);
return new FSLinkResolver<FSDataOutputStream>() { return new FSLinkResolver<FSDataOutputStream>() {
@Override
public FSDataOutputStream next(final AbstractFileSystem fs, final Path p) public FSDataOutputStream next(final AbstractFileSystem fs, final Path p)
throws IOException { throws IOException {
return fs.create(p, createFlag, updatedOpts); return fs.create(p, createFlag, updatedOpts);
@ -703,6 +706,7 @@ public void mkdir(final Path dir, final FsPermission permission,
final FsPermission absFerms = (permission == null ? final FsPermission absFerms = (permission == null ?
FsPermission.getDefault() : permission).applyUMask(umask); FsPermission.getDefault() : permission).applyUMask(umask);
new FSLinkResolver<Void>() { new FSLinkResolver<Void>() {
@Override
public Void next(final AbstractFileSystem fs, final Path p) public Void next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
fs.mkdir(p, absFerms, createParent); fs.mkdir(p, absFerms, createParent);
@ -738,6 +742,7 @@ public boolean delete(final Path f, final boolean recursive)
UnsupportedFileSystemException, IOException { UnsupportedFileSystemException, IOException {
Path absF = fixRelativePart(f); Path absF = fixRelativePart(f);
return new FSLinkResolver<Boolean>() { return new FSLinkResolver<Boolean>() {
@Override
public Boolean next(final AbstractFileSystem fs, final Path p) public Boolean next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
return Boolean.valueOf(fs.delete(p, recursive)); return Boolean.valueOf(fs.delete(p, recursive));
@ -766,6 +771,7 @@ public FSDataInputStream open(final Path f) throws AccessControlException,
FileNotFoundException, UnsupportedFileSystemException, IOException { FileNotFoundException, UnsupportedFileSystemException, IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<FSDataInputStream>() { return new FSLinkResolver<FSDataInputStream>() {
@Override
public FSDataInputStream next(final AbstractFileSystem fs, final Path p) public FSDataInputStream next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
return fs.open(p); return fs.open(p);
@ -796,6 +802,7 @@ public FSDataInputStream open(final Path f, final int bufferSize)
UnsupportedFileSystemException, IOException { UnsupportedFileSystemException, IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<FSDataInputStream>() { return new FSLinkResolver<FSDataInputStream>() {
@Override
public FSDataInputStream next(final AbstractFileSystem fs, final Path p) public FSDataInputStream next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
return fs.open(p, bufferSize); return fs.open(p, bufferSize);
@ -826,6 +833,7 @@ public boolean setReplication(final Path f, final short replication)
IOException { IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<Boolean>() { return new FSLinkResolver<Boolean>() {
@Override
public Boolean next(final AbstractFileSystem fs, final Path p) public Boolean next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
return Boolean.valueOf(fs.setReplication(p, replication)); return Boolean.valueOf(fs.setReplication(p, replication));
@ -894,6 +902,7 @@ public void rename(final Path src, final Path dst,
*/ */
final Path source = resolveIntermediate(absSrc); final Path source = resolveIntermediate(absSrc);
new FSLinkResolver<Void>() { new FSLinkResolver<Void>() {
@Override
public Void next(final AbstractFileSystem fs, final Path p) public Void next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
fs.rename(source, p, options); fs.rename(source, p, options);
@ -925,6 +934,7 @@ public void setPermission(final Path f, final FsPermission permission)
UnsupportedFileSystemException, IOException { UnsupportedFileSystemException, IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
new FSLinkResolver<Void>() { new FSLinkResolver<Void>() {
@Override
public Void next(final AbstractFileSystem fs, final Path p) public Void next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
fs.setPermission(p, permission); fs.setPermission(p, permission);
@ -967,6 +977,7 @@ public void setOwner(final Path f, final String username,
} }
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
new FSLinkResolver<Void>() { new FSLinkResolver<Void>() {
@Override
public Void next(final AbstractFileSystem fs, final Path p) public Void next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
fs.setOwner(p, username, groupname); fs.setOwner(p, username, groupname);
@ -1002,6 +1013,7 @@ public void setTimes(final Path f, final long mtime, final long atime)
UnsupportedFileSystemException, IOException { UnsupportedFileSystemException, IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
new FSLinkResolver<Void>() { new FSLinkResolver<Void>() {
@Override
public Void next(final AbstractFileSystem fs, final Path p) public Void next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
fs.setTimes(p, mtime, atime); fs.setTimes(p, mtime, atime);
@ -1034,6 +1046,7 @@ public FileChecksum getFileChecksum(final Path f)
IOException { IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<FileChecksum>() { return new FSLinkResolver<FileChecksum>() {
@Override
public FileChecksum next(final AbstractFileSystem fs, final Path p) public FileChecksum next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
return fs.getFileChecksum(p); return fs.getFileChecksum(p);
@ -1089,6 +1102,7 @@ public FileStatus getFileStatus(final Path f) throws AccessControlException,
FileNotFoundException, UnsupportedFileSystemException, IOException { FileNotFoundException, UnsupportedFileSystemException, IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<FileStatus>() { return new FSLinkResolver<FileStatus>() {
@Override
public FileStatus next(final AbstractFileSystem fs, final Path p) public FileStatus next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
return fs.getFileStatus(p); return fs.getFileStatus(p);
@ -1135,6 +1149,7 @@ public FileStatus getFileLinkStatus(final Path f)
UnsupportedFileSystemException, IOException { UnsupportedFileSystemException, IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<FileStatus>() { return new FSLinkResolver<FileStatus>() {
@Override
public FileStatus next(final AbstractFileSystem fs, final Path p) public FileStatus next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
FileStatus fi = fs.getFileLinkStatus(p); FileStatus fi = fs.getFileLinkStatus(p);
@ -1165,6 +1180,7 @@ public Path getLinkTarget(final Path f) throws AccessControlException,
FileNotFoundException, UnsupportedFileSystemException, IOException { FileNotFoundException, UnsupportedFileSystemException, IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<Path>() { return new FSLinkResolver<Path>() {
@Override
public Path next(final AbstractFileSystem fs, final Path p) public Path next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
FileStatus fi = fs.getFileLinkStatus(p); FileStatus fi = fs.getFileLinkStatus(p);
@ -1208,6 +1224,7 @@ public BlockLocation[] getFileBlockLocations(final Path f, final long start,
UnsupportedFileSystemException, IOException { UnsupportedFileSystemException, IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<BlockLocation[]>() { return new FSLinkResolver<BlockLocation[]>() {
@Override
public BlockLocation[] next(final AbstractFileSystem fs, final Path p) public BlockLocation[] next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
return fs.getFileBlockLocations(p, start, len); return fs.getFileBlockLocations(p, start, len);
@ -1246,6 +1263,7 @@ public FsStatus getFsStatus(final Path f) throws AccessControlException,
} }
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<FsStatus>() { return new FSLinkResolver<FsStatus>() {
@Override
public FsStatus next(final AbstractFileSystem fs, final Path p) public FsStatus next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
return fs.getFsStatus(p); return fs.getFsStatus(p);
@ -1339,6 +1357,7 @@ public void createSymlink(final Path target, final Path link,
IOException { IOException {
final Path nonRelLink = fixRelativePart(link); final Path nonRelLink = fixRelativePart(link);
new FSLinkResolver<Void>() { new FSLinkResolver<Void>() {
@Override
public Void next(final AbstractFileSystem fs, final Path p) public Void next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
fs.createSymlink(target, p, createParent); fs.createSymlink(target, p, createParent);
@ -1373,6 +1392,7 @@ public RemoteIterator<FileStatus> listStatus(final Path f) throws
UnsupportedFileSystemException, IOException { UnsupportedFileSystemException, IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<RemoteIterator<FileStatus>>() { return new FSLinkResolver<RemoteIterator<FileStatus>>() {
@Override
public RemoteIterator<FileStatus> next( public RemoteIterator<FileStatus> next(
final AbstractFileSystem fs, final Path p) final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
@ -1432,6 +1452,7 @@ public RemoteIterator<LocatedFileStatus> listLocatedStatus(
UnsupportedFileSystemException, IOException { UnsupportedFileSystemException, IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<RemoteIterator<LocatedFileStatus>>() { return new FSLinkResolver<RemoteIterator<LocatedFileStatus>>() {
@Override
public RemoteIterator<LocatedFileStatus> next( public RemoteIterator<LocatedFileStatus> next(
final AbstractFileSystem fs, final Path p) final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
@ -1703,6 +1724,7 @@ public FileStatus[] listStatus(final Path f) throws AccessControlException,
IOException { IOException {
final Path absF = fixRelativePart(f); final Path absF = fixRelativePart(f);
return new FSLinkResolver<FileStatus[]>() { return new FSLinkResolver<FileStatus[]>() {
@Override
public FileStatus[] next(final AbstractFileSystem fs, final Path p) public FileStatus[] next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
return fs.listStatus(p); return fs.listStatus(p);
@ -2232,6 +2254,7 @@ private static boolean isSameFS(Path qualPath1, Path qualPath2) {
* Deletes all the paths in deleteOnExit on JVM shutdown. * Deletes all the paths in deleteOnExit on JVM shutdown.
*/ */
static class FileContextFinalizer implements Runnable { static class FileContextFinalizer implements Runnable {
@Override
public synchronized void run() { public synchronized void run() {
processDeleteOnExit(); processDeleteOnExit();
} }
@ -2244,6 +2267,7 @@ public synchronized void run() {
protected Path resolve(final Path f) throws FileNotFoundException, protected Path resolve(final Path f) throws FileNotFoundException,
UnresolvedLinkException, AccessControlException, IOException { UnresolvedLinkException, AccessControlException, IOException {
return new FSLinkResolver<Path>() { return new FSLinkResolver<Path>() {
@Override
public Path next(final AbstractFileSystem fs, final Path p) public Path next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
return fs.resolvePath(p); return fs.resolvePath(p);
@ -2259,6 +2283,7 @@ public Path next(final AbstractFileSystem fs, final Path p)
*/ */
protected Path resolveIntermediate(final Path f) throws IOException { protected Path resolveIntermediate(final Path f) throws IOException {
return new FSLinkResolver<FileStatus>() { return new FSLinkResolver<FileStatus>() {
@Override
public FileStatus next(final AbstractFileSystem fs, final Path p) public FileStatus next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
return fs.getFileLinkStatus(p); return fs.getFileLinkStatus(p);
@ -2281,6 +2306,7 @@ Set<AbstractFileSystem> resolveAbstractFileSystems(final Path f)
final HashSet<AbstractFileSystem> result final HashSet<AbstractFileSystem> result
= new HashSet<AbstractFileSystem>(); = new HashSet<AbstractFileSystem>();
new FSLinkResolver<Void>() { new FSLinkResolver<Void>() {
@Override
public Void next(final AbstractFileSystem fs, final Path p) public Void next(final AbstractFileSystem fs, final Path p)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
result.add(fs); result.add(fs);

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileStatus.java
View File

@ -253,6 +253,7 @@ public void setSymlink(final Path p) {
////////////////////////////////////////////////// //////////////////////////////////////////////////
// Writable // Writable
////////////////////////////////////////////////// //////////////////////////////////////////////////
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
Text.writeString(out, getPath().toString(), Text.DEFAULT_MAX_LEN); Text.writeString(out, getPath().toString(), Text.DEFAULT_MAX_LEN);
out.writeLong(getLen()); out.writeLong(getLen());
@ -270,6 +271,7 @@ public void write(DataOutput out) throws IOException {
} }
} }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
String strPath = Text.readString(in, Text.DEFAULT_MAX_LEN); String strPath = Text.readString(in, Text.DEFAULT_MAX_LEN);
this.path = new Path(strPath); this.path = new Path(strPath);
@ -299,6 +301,7 @@ public void readFields(DataInput in) throws IOException {
* @throws ClassCastException if the specified object's is not of * @throws ClassCastException if the specified object's is not of
* type FileStatus * type FileStatus
*/ */
@Override
public int compareTo(Object o) { public int compareTo(Object o) {
FileStatus other = (FileStatus)o; FileStatus other = (FileStatus)o;
return this.getPath().compareTo(other.getPath()); return this.getPath().compareTo(other.getPath());
@ -308,6 +311,7 @@ public int compareTo(Object o) {
* @param o the object to be compared. * @param o the object to be compared.
* @return true if two file status has the same path name; false if not. * @return true if two file status has the same path name; false if not.
*/ */
@Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (o == null) { if (o == null) {
return false; return false;
@ -328,6 +332,7 @@ public boolean equals(Object o) {
* *
* @return a hash code value for the path name. * @return a hash code value for the path name.
*/ */
@Override
public int hashCode() { public int hashCode() {
return getPath().hashCode(); return getPath().hashCode();
} }

12
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileSystem.java
View File

@ -147,6 +147,7 @@ public static FileSystem get(final URI uri, final Configuration conf,
UserGroupInformation ugi = UserGroupInformation ugi =
UserGroupInformation.getBestUGI(ticketCachePath, user); UserGroupInformation.getBestUGI(ticketCachePath, user);
return ugi.doAs(new PrivilegedExceptionAction<FileSystem>() { return ugi.doAs(new PrivilegedExceptionAction<FileSystem>() {
@Override
public FileSystem run() throws IOException { public FileSystem run() throws IOException {
return get(uri, conf); return get(uri, conf);
} }
@ -332,6 +333,7 @@ public static FileSystem newInstance(final URI uri, final Configuration conf,
UserGroupInformation ugi = UserGroupInformation ugi =
UserGroupInformation.getBestUGI(ticketCachePath, user); UserGroupInformation.getBestUGI(ticketCachePath, user);
return ugi.doAs(new PrivilegedExceptionAction<FileSystem>() { return ugi.doAs(new PrivilegedExceptionAction<FileSystem>() {
@Override
public FileSystem run() throws IOException { public FileSystem run() throws IOException {
return newInstance(uri,conf); return newInstance(uri,conf);
} }
@ -1389,6 +1391,7 @@ public ContentSummary getContentSummary(Path f) throws IOException {
} }
final private static PathFilter DEFAULT_FILTER = new PathFilter() { final private static PathFilter DEFAULT_FILTER = new PathFilter() {
@Override
public boolean accept(Path file) { public boolean accept(Path file) {
return true; return true;
} }
@ -2056,6 +2059,7 @@ public void completeLocalOutput(Path fsOutputFile, Path tmpLocalFile)
* No more filesystem operations are needed. Will * No more filesystem operations are needed. Will
* release any held locks. * release any held locks.
*/ */
@Override
public void close() throws IOException { public void close() throws IOException {
// delete all files that were marked as delete-on-exit. // delete all files that were marked as delete-on-exit.
processDeleteOnExit(); processDeleteOnExit();
@ -2393,6 +2397,7 @@ synchronized void closeAll(boolean onlyAutomatic) throws IOException {
} }
private class ClientFinalizer implements Runnable { private class ClientFinalizer implements Runnable {
@Override
public synchronized void run() { public synchronized void run() {
try { try {
closeAll(true); closeAll(true);
@ -2447,7 +2452,7 @@ static class Key {
this.ugi = UserGroupInformation.getCurrentUser(); this.ugi = UserGroupInformation.getCurrentUser();
} }
/** {@inheritDoc} */ @Override
public int hashCode() { public int hashCode() {
return (scheme + authority).hashCode() + ugi.hashCode() + (int)unique; return (scheme + authority).hashCode() + ugi.hashCode() + (int)unique;
} }
@ -2456,7 +2461,7 @@ static boolean isEqual(Object a, Object b) {
return a == b || (a != null && a.equals(b)); return a == b || (a != null && a.equals(b));
} }
/** {@inheritDoc} */ @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj == this) { if (obj == this) {
return true; return true;
@ -2471,7 +2476,7 @@ && isEqual(this.ugi, that.ugi)
return false; return false;
} }
/** {@inheritDoc} */ @Override
public String toString() { public String toString() {
return "("+ugi.toString() + ")@" + scheme + "://" + authority; return "("+ugi.toString() + ")@" + scheme + "://" + authority;
} }
@ -2584,6 +2589,7 @@ public int getWriteOps() {
return writeOps.get(); return writeOps.get();
} }
@Override
public String toString() { public String toString() {
return bytesRead + " bytes read, " + bytesWritten + " bytes written, " return bytesRead + " bytes read, " + bytesWritten + " bytes written, "
+ readOps + " read ops, " + largeReadOps + " large read ops, " + readOps + " read ops, " + largeReadOps + " large read ops, "

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java
View File

@ -414,9 +414,11 @@ private static class CygPathCommand extends Shell {
String getResult() throws IOException { String getResult() throws IOException {
return result; return result;
} }
@Override
protected String[] getExecString() { protected String[] getExecString() {
return command; return command;
} }
@Override
protected void parseExecResult(BufferedReader lines) throws IOException { protected void parseExecResult(BufferedReader lines) throws IOException {
String line = lines.readLine(); String line = lines.readLine();
if (line == null) { if (line == null) {

38
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFileSystem.java
View File

@ -76,6 +76,7 @@ public FileSystem getRawFileSystem() {
* for this FileSystem * for this FileSystem
* @param conf the configuration * @param conf the configuration
*/ */
@Override
public void initialize(URI name, Configuration conf) throws IOException { public void initialize(URI name, Configuration conf) throws IOException {
super.initialize(name, conf); super.initialize(name, conf);
// this is less than ideal, but existing filesystems sometimes neglect // this is less than ideal, but existing filesystems sometimes neglect
@ -90,6 +91,7 @@ public void initialize(URI name, Configuration conf) throws IOException {
} }
/** Returns a URI whose scheme and authority identify this FileSystem.*/ /** Returns a URI whose scheme and authority identify this FileSystem.*/
@Override
public URI getUri() { public URI getUri() {
return fs.getUri(); return fs.getUri();
} }
@ -104,6 +106,7 @@ protected URI getCanonicalUri() {
} }
/** Make sure that a path specifies a FileSystem. */ /** Make sure that a path specifies a FileSystem. */
@Override
public Path makeQualified(Path path) { public Path makeQualified(Path path) {
Path fqPath = fs.makeQualified(path); Path fqPath = fs.makeQualified(path);
// swap in our scheme if the filtered fs is using a different scheme // swap in our scheme if the filtered fs is using a different scheme
@ -125,10 +128,12 @@ public Path makeQualified(Path path) {
/////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////
/** Check that a Path belongs to this FileSystem. */ /** Check that a Path belongs to this FileSystem. */
@Override
protected void checkPath(Path path) { protected void checkPath(Path path) {
fs.checkPath(path); fs.checkPath(path);
} }
@Override
public BlockLocation[] getFileBlockLocations(FileStatus file, long start, public BlockLocation[] getFileBlockLocations(FileStatus file, long start,
long len) throws IOException { long len) throws IOException {
return fs.getFileBlockLocations(file, start, len); return fs.getFileBlockLocations(file, start, len);
@ -143,17 +148,17 @@ public Path resolvePath(final Path p) throws IOException {
* @param f the file name to open * @param f the file name to open
* @param bufferSize the size of the buffer to be used. * @param bufferSize the size of the buffer to be used.
*/ */
@Override
public FSDataInputStream open(Path f, int bufferSize) throws IOException { public FSDataInputStream open(Path f, int bufferSize) throws IOException {
return fs.open(f, bufferSize); return fs.open(f, bufferSize);
} }
/** {@inheritDoc} */ @Override
public FSDataOutputStream append(Path f, int bufferSize, public FSDataOutputStream append(Path f, int bufferSize,
Progressable progress) throws IOException { Progressable progress) throws IOException {
return fs.append(f, bufferSize, progress); return fs.append(f, bufferSize, progress);
} }
/** {@inheritDoc} */
@Override @Override
public FSDataOutputStream create(Path f, FsPermission permission, public FSDataOutputStream create(Path f, FsPermission permission,
boolean overwrite, int bufferSize, short replication, long blockSize, boolean overwrite, int bufferSize, short replication, long blockSize,
@ -171,6 +176,7 @@ public FSDataOutputStream create(Path f, FsPermission permission,
* @return true if successful; * @return true if successful;
* false if file does not exist or is a directory * false if file does not exist or is a directory
*/ */
@Override
public boolean setReplication(Path src, short replication) throws IOException { public boolean setReplication(Path src, short replication) throws IOException {
return fs.setReplication(src, replication); return fs.setReplication(src, replication);
} }
@ -179,23 +185,23 @@ public boolean setReplication(Path src, short replication) throws IOException {
* Renames Path src to Path dst. Can take place on local fs * Renames Path src to Path dst. Can take place on local fs
* or remote DFS. * or remote DFS.
*/ */
@Override
public boolean rename(Path src, Path dst) throws IOException { public boolean rename(Path src, Path dst) throws IOException {
return fs.rename(src, dst); return fs.rename(src, dst);
} }
/** Delete a file */ /** Delete a file */
@Override
public boolean delete(Path f, boolean recursive) throws IOException { public boolean delete(Path f, boolean recursive) throws IOException {
return fs.delete(f, recursive); return fs.delete(f, recursive);
} }
/** List files in a directory. */ /** List files in a directory. */
@Override
public FileStatus[] listStatus(Path f) throws IOException { public FileStatus[] listStatus(Path f) throws IOException {
return fs.listStatus(f); return fs.listStatus(f);
} }
/**
* {@inheritDoc}
*/
@Override @Override
public RemoteIterator<Path> listCorruptFileBlocks(Path path) public RemoteIterator<Path> listCorruptFileBlocks(Path path)
throws IOException { throws IOException {
@ -203,11 +209,13 @@ public RemoteIterator<Path> listCorruptFileBlocks(Path path)
} }
/** List files and its block locations in a directory. */ /** List files and its block locations in a directory. */
@Override
public RemoteIterator<LocatedFileStatus> listLocatedStatus(Path f) public RemoteIterator<LocatedFileStatus> listLocatedStatus(Path f)
throws IOException { throws IOException {
return fs.listLocatedStatus(f); return fs.listLocatedStatus(f);
} }
@Override
public Path getHomeDirectory() { public Path getHomeDirectory() {
return fs.getHomeDirectory(); return fs.getHomeDirectory();
} }
@ -219,6 +227,7 @@ public Path getHomeDirectory() {
* *
* @param newDir * @param newDir
*/ */
@Override
public void setWorkingDirectory(Path newDir) { public void setWorkingDirectory(Path newDir) {
fs.setWorkingDirectory(newDir); fs.setWorkingDirectory(newDir);
} }
@ -228,21 +237,21 @@ public void setWorkingDirectory(Path newDir) {
* *
* @return the directory pathname * @return the directory pathname
*/ */
@Override
public Path getWorkingDirectory() { public Path getWorkingDirectory() {
return fs.getWorkingDirectory(); return fs.getWorkingDirectory();
} }
@Override
protected Path getInitialWorkingDirectory() { protected Path getInitialWorkingDirectory() {
return fs.getInitialWorkingDirectory(); return fs.getInitialWorkingDirectory();
} }
/** {@inheritDoc} */
@Override @Override
public FsStatus getStatus(Path p) throws IOException { public FsStatus getStatus(Path p) throws IOException {
return fs.getStatus(p); return fs.getStatus(p);
} }
/** {@inheritDoc} */
@Override @Override
public boolean mkdirs(Path f, FsPermission permission) throws IOException { public boolean mkdirs(Path f, FsPermission permission) throws IOException {
return fs.mkdirs(f, permission); return fs.mkdirs(f, permission);
@ -254,6 +263,7 @@ public boolean mkdirs(Path f, FsPermission permission) throws IOException {
* the given dst name. * the given dst name.
* delSrc indicates if the source should be removed * delSrc indicates if the source should be removed
*/ */
@Override
public void copyFromLocalFile(boolean delSrc, Path src, Path dst) public void copyFromLocalFile(boolean delSrc, Path src, Path dst)
throws IOException { throws IOException {
fs.copyFromLocalFile(delSrc, src, dst); fs.copyFromLocalFile(delSrc, src, dst);
@ -264,6 +274,7 @@ public void copyFromLocalFile(boolean delSrc, Path src, Path dst)
* the given dst name. * the given dst name.
* delSrc indicates if the source should be removed * delSrc indicates if the source should be removed
*/ */
@Override
public void copyFromLocalFile(boolean delSrc, boolean overwrite, public void copyFromLocalFile(boolean delSrc, boolean overwrite,
Path[] srcs, Path dst) Path[] srcs, Path dst)
throws IOException { throws IOException {
@ -275,6 +286,7 @@ public void copyFromLocalFile(boolean delSrc, boolean overwrite,
* the given dst name. * the given dst name.
* delSrc indicates if the source should be removed * delSrc indicates if the source should be removed
*/ */
@Override
public void copyFromLocalFile(boolean delSrc, boolean overwrite, public void copyFromLocalFile(boolean delSrc, boolean overwrite,
Path src, Path dst) Path src, Path dst)
throws IOException { throws IOException {
@ -286,6 +298,7 @@ public void copyFromLocalFile(boolean delSrc, boolean overwrite,
* Copy it from FS control to the local dst name. * Copy it from FS control to the local dst name.
* delSrc indicates if the src will be removed or not. * delSrc indicates if the src will be removed or not.
*/ */
@Override
public void copyToLocalFile(boolean delSrc, Path src, Path dst) public void copyToLocalFile(boolean delSrc, Path src, Path dst)
throws IOException { throws IOException {
fs.copyToLocalFile(delSrc, src, dst); fs.copyToLocalFile(delSrc, src, dst);
@ -297,6 +310,7 @@ public void copyToLocalFile(boolean delSrc, Path src, Path dst)
* file. If the FS is local, we write directly into the target. If * file. If the FS is local, we write directly into the target. If
* the FS is remote, we write into the tmp local area. * the FS is remote, we write into the tmp local area.
*/ */
@Override
public Path startLocalOutput(Path fsOutputFile, Path tmpLocalFile) public Path startLocalOutput(Path fsOutputFile, Path tmpLocalFile)
throws IOException { throws IOException {
return fs.startLocalOutput(fsOutputFile, tmpLocalFile); return fs.startLocalOutput(fsOutputFile, tmpLocalFile);
@ -308,12 +322,14 @@ public Path startLocalOutput(Path fsOutputFile, Path tmpLocalFile)
* FS will copy the contents of tmpLocalFile to the correct target at * FS will copy the contents of tmpLocalFile to the correct target at
* fsOutputFile. * fsOutputFile.
*/ */
@Override
public void completeLocalOutput(Path fsOutputFile, Path tmpLocalFile) public void completeLocalOutput(Path fsOutputFile, Path tmpLocalFile)
throws IOException { throws IOException {
fs.completeLocalOutput(fsOutputFile, tmpLocalFile); fs.completeLocalOutput(fsOutputFile, tmpLocalFile);
} }
/** Return the total size of all files in the filesystem.*/ /** Return the total size of all files in the filesystem.*/
@Override
public long getUsed() throws IOException{ public long getUsed() throws IOException{
return fs.getUsed(); return fs.getUsed();
} }
@ -357,16 +373,17 @@ public FsServerDefaults getServerDefaults(Path f) throws IOException {
/** /**
* Get file status. * Get file status.
*/ */
@Override
public FileStatus getFileStatus(Path f) throws IOException { public FileStatus getFileStatus(Path f) throws IOException {
return fs.getFileStatus(f); return fs.getFileStatus(f);
} }
/** {@inheritDoc} */ @Override
public FileChecksum getFileChecksum(Path f) throws IOException { public FileChecksum getFileChecksum(Path f) throws IOException {
return fs.getFileChecksum(f); return fs.getFileChecksum(f);
} }
/** {@inheritDoc} */ @Override
public void setVerifyChecksum(boolean verifyChecksum) { public void setVerifyChecksum(boolean verifyChecksum) {
fs.setVerifyChecksum(verifyChecksum); fs.setVerifyChecksum(verifyChecksum);
} }
@ -387,21 +404,18 @@ public void close() throws IOException {
fs.close(); fs.close();
} }
/** {@inheritDoc} */
@Override @Override
public void setOwner(Path p, String username, String groupname public void setOwner(Path p, String username, String groupname
) throws IOException { ) throws IOException {
fs.setOwner(p, username, groupname); fs.setOwner(p, username, groupname);
} }
/** {@inheritDoc} */
@Override @Override
public void setTimes(Path p, long mtime, long atime public void setTimes(Path p, long mtime, long atime
) throws IOException { ) throws IOException {
fs.setTimes(p, mtime, atime); fs.setTimes(p, mtime, atime);
} }
/** {@inheritDoc} */
@Override @Override
public void setPermission(Path p, FsPermission permission public void setPermission(Path p, FsPermission permission
) throws IOException { ) throws IOException {

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FilterFs.java
View File

@ -174,9 +174,6 @@ public FileStatus[] listStatus(Path f)
return myFs.listStatus(f); return myFs.listStatus(f);
} }
/**
* {@inheritDoc}
*/
@Override @Override
public RemoteIterator<Path> listCorruptFileBlocks(Path path) public RemoteIterator<Path> listCorruptFileBlocks(Path path)
throws IOException { throws IOException {

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsServerDefaults.java
View File

@ -39,6 +39,7 @@ public class FsServerDefaults implements Writable {
static { // register a ctor static { // register a ctor
WritableFactories.setFactory(FsServerDefaults.class, new WritableFactory() { WritableFactories.setFactory(FsServerDefaults.class, new WritableFactory() {
@Override
public Writable newInstance() { public Writable newInstance() {
return new FsServerDefaults(); return new FsServerDefaults();
} }
@ -106,6 +107,7 @@ public DataChecksum.Type getChecksumType() {
// ///////////////////////////////////////// // /////////////////////////////////////////
// Writable // Writable
// ///////////////////////////////////////// // /////////////////////////////////////////
@Override
@InterfaceAudience.Private @InterfaceAudience.Private
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeLong(blockSize); out.writeLong(blockSize);
@ -116,6 +118,7 @@ public void write(DataOutput out) throws IOException {
WritableUtils.writeEnum(out, checksumType); WritableUtils.writeEnum(out, checksumType);
} }
@Override
@InterfaceAudience.Private @InterfaceAudience.Private
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
blockSize = in.readLong(); blockSize = in.readLong();

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsShell.java
View File

@ -236,6 +236,7 @@ private void printInstanceHelp(PrintStream out, Command instance) {
/** /**
* run * run
*/ */
@Override
public int run(String argv[]) throws Exception { public int run(String argv[]) throws Exception {
// initialize FsShell // initialize FsShell
init(); init();

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsStatus.java
View File

@ -60,12 +60,14 @@ public long getRemaining() {
////////////////////////////////////////////////// //////////////////////////////////////////////////
// Writable // Writable
////////////////////////////////////////////////// //////////////////////////////////////////////////
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeLong(capacity); out.writeLong(capacity);
out.writeLong(used); out.writeLong(used);
out.writeLong(remaining); out.writeLong(remaining);
} }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
capacity = in.readLong(); capacity = in.readLong();
used = in.readLong(); used = in.readLong();

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlConnection.java
View File

@ -53,7 +53,6 @@ public void connect() throws IOException {
} }
} }
/* @inheritDoc */
@Override @Override
public InputStream getInputStream() throws IOException { public InputStream getInputStream() throws IOException {
if (is == null) { if (is == null) {

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FsUrlStreamHandlerFactory.java
View File

@ -59,6 +59,7 @@ public FsUrlStreamHandlerFactory(Configuration conf) {
this.handler = new FsUrlStreamHandler(this.conf); this.handler = new FsUrlStreamHandler(this.conf);
} }
@Override
public java.net.URLStreamHandler createURLStreamHandler(String protocol) { public java.net.URLStreamHandler createURLStreamHandler(String protocol) {
if (!protocols.containsKey(protocol)) { if (!protocols.containsKey(protocol)) {
boolean known = true; boolean known = true;

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobFilter.java
View File

@ -31,6 +31,7 @@
@InterfaceStability.Evolving @InterfaceStability.Evolving
public class GlobFilter implements PathFilter { public class GlobFilter implements PathFilter {
private final static PathFilter DEFAULT_FILTER = new PathFilter() { private final static PathFilter DEFAULT_FILTER = new PathFilter() {
@Override
public boolean accept(Path file) { public boolean accept(Path file) {
return true; return true;
} }
@ -75,6 +76,7 @@ boolean hasPattern() {
return pattern.hasWildcard(); return pattern.hasWildcard();
} }
@Override
public boolean accept(Path path) { public boolean accept(Path path) {
return pattern.matches(path.getName()) && userFilter.accept(path); return pattern.matches(path.getName()) && userFilter.accept(path);
} }

26
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/HarFileSystem.java
View File

@ -106,6 +106,7 @@ public HarFileSystem(FileSystem fs) {
* har:///archivepath. This assumes the underlying filesystem * har:///archivepath. This assumes the underlying filesystem
* to be used in case not specified. * to be used in case not specified.
*/ */
@Override
public void initialize(URI name, Configuration conf) throws IOException { public void initialize(URI name, Configuration conf) throws IOException {
// decode the name // decode the name
URI underLyingURI = decodeHarURI(name, conf); URI underLyingURI = decodeHarURI(name, conf);
@ -247,6 +248,7 @@ private String decodeFileName(String fname)
/** /**
* return the top level archive. * return the top level archive.
*/ */
@Override
public Path getWorkingDirectory() { public Path getWorkingDirectory() {
return new Path(uri.toString()); return new Path(uri.toString());
} }
@ -636,6 +638,7 @@ private HarStatus getFileHarStatus(Path f) throws IOException {
/** /**
* @return null since no checksum algorithm is implemented. * @return null since no checksum algorithm is implemented.
*/ */
@Override
public FileChecksum getFileChecksum(Path f) { public FileChecksum getFileChecksum(Path f) {
return null; return null;
} }
@ -668,6 +671,7 @@ public FSDataOutputStream create(Path f, int bufferSize)
throw new IOException("Har: Create not allowed"); throw new IOException("Har: Create not allowed");
} }
@Override
public FSDataOutputStream create(Path f, public FSDataOutputStream create(Path f,
FsPermission permission, FsPermission permission,
boolean overwrite, boolean overwrite,
@ -735,10 +739,12 @@ public FileStatus[] listStatus(Path f) throws IOException {
/** /**
* return the top level archive path. * return the top level archive path.
*/ */
@Override
public Path getHomeDirectory() { public Path getHomeDirectory() {
return new Path(uri.toString()); return new Path(uri.toString());
} }
@Override
public void setWorkingDirectory(Path newDir) { public void setWorkingDirectory(Path newDir) {
//does nothing. //does nothing.
} }
@ -746,6 +752,7 @@ public void setWorkingDirectory(Path newDir) {
/** /**
* not implemented. * not implemented.
*/ */
@Override
public boolean mkdirs(Path f, FsPermission permission) throws IOException { public boolean mkdirs(Path f, FsPermission permission) throws IOException {
throw new IOException("Har: mkdirs not allowed"); throw new IOException("Har: mkdirs not allowed");
} }
@ -753,6 +760,7 @@ public boolean mkdirs(Path f, FsPermission permission) throws IOException {
/** /**
* not implemented. * not implemented.
*/ */
@Override
public void copyFromLocalFile(boolean delSrc, Path src, Path dst) throws public void copyFromLocalFile(boolean delSrc, Path src, Path dst) throws
IOException { IOException {
throw new IOException("Har: copyfromlocalfile not allowed"); throw new IOException("Har: copyfromlocalfile not allowed");
@ -761,6 +769,7 @@ public void copyFromLocalFile(boolean delSrc, Path src, Path dst) throws
/** /**
* copies the file in the har filesystem to a local file. * copies the file in the har filesystem to a local file.
*/ */
@Override
public void copyToLocalFile(boolean delSrc, Path src, Path dst) public void copyToLocalFile(boolean delSrc, Path src, Path dst)
throws IOException { throws IOException {
FileUtil.copy(this, src, getLocal(getConf()), dst, false, getConf()); FileUtil.copy(this, src, getLocal(getConf()), dst, false, getConf());
@ -769,6 +778,7 @@ public void copyToLocalFile(boolean delSrc, Path src, Path dst)
/** /**
* not implemented. * not implemented.
*/ */
@Override
public Path startLocalOutput(Path fsOutputFile, Path tmpLocalFile) public Path startLocalOutput(Path fsOutputFile, Path tmpLocalFile)
throws IOException { throws IOException {
throw new IOException("Har: startLocalOutput not allowed"); throw new IOException("Har: startLocalOutput not allowed");
@ -777,6 +787,7 @@ public Path startLocalOutput(Path fsOutputFile, Path tmpLocalFile)
/** /**
* not implemented. * not implemented.
*/ */
@Override
public void completeLocalOutput(Path fsOutputFile, Path tmpLocalFile) public void completeLocalOutput(Path fsOutputFile, Path tmpLocalFile)
throws IOException { throws IOException {
throw new IOException("Har: completeLocalOutput not allowed"); throw new IOException("Har: completeLocalOutput not allowed");
@ -785,6 +796,7 @@ public void completeLocalOutput(Path fsOutputFile, Path tmpLocalFile)
/** /**
* not implemented. * not implemented.
*/ */
@Override
public void setOwner(Path p, String username, String groupname) public void setOwner(Path p, String username, String groupname)
throws IOException { throws IOException {
throw new IOException("Har: setowner not allowed"); throw new IOException("Har: setowner not allowed");
@ -793,6 +805,7 @@ public void setOwner(Path p, String username, String groupname)
/** /**
* Not implemented. * Not implemented.
*/ */
@Override
public void setPermission(Path p, FsPermission permisssion) public void setPermission(Path p, FsPermission permisssion)
throws IOException { throws IOException {
throw new IOException("Har: setPermission not allowed"); throw new IOException("Har: setPermission not allowed");
@ -825,6 +838,7 @@ private static class HarFsInputStream extends FSInputStream {
this.end = start + length; this.end = start + length;
} }
@Override
public synchronized int available() throws IOException { public synchronized int available() throws IOException {
long remaining = end - underLyingStream.getPos(); long remaining = end - underLyingStream.getPos();
if (remaining > (long)Integer.MAX_VALUE) { if (remaining > (long)Integer.MAX_VALUE) {
@ -833,6 +847,7 @@ public synchronized int available() throws IOException {
return (int) remaining; return (int) remaining;
} }
@Override
public synchronized void close() throws IOException { public synchronized void close() throws IOException {
underLyingStream.close(); underLyingStream.close();
super.close(); super.close();
@ -847,15 +862,18 @@ public void mark(int readLimit) {
/** /**
* reset is not implemented * reset is not implemented
*/ */
@Override
public void reset() throws IOException { public void reset() throws IOException {
throw new IOException("reset not implemented."); throw new IOException("reset not implemented.");
} }
@Override
public synchronized int read() throws IOException { public synchronized int read() throws IOException {
int ret = read(oneBytebuff, 0, 1); int ret = read(oneBytebuff, 0, 1);
return (ret <= 0) ? -1: (oneBytebuff[0] & 0xff); return (ret <= 0) ? -1: (oneBytebuff[0] & 0xff);
} }
@Override
public synchronized int read(byte[] b) throws IOException { public synchronized int read(byte[] b) throws IOException {
int ret = read(b, 0, b.length); int ret = read(b, 0, b.length);
if (ret != -1) { if (ret != -1) {
@ -867,6 +885,7 @@ public synchronized int read(byte[] b) throws IOException {
/** /**
* *
*/ */
@Override
public synchronized int read(byte[] b, int offset, int len) public synchronized int read(byte[] b, int offset, int len)
throws IOException { throws IOException {
int newlen = len; int newlen = len;
@ -882,6 +901,7 @@ public synchronized int read(byte[] b, int offset, int len)
return ret; return ret;
} }
@Override
public synchronized long skip(long n) throws IOException { public synchronized long skip(long n) throws IOException {
long tmpN = n; long tmpN = n;
if (tmpN > 0) { if (tmpN > 0) {
@ -895,10 +915,12 @@ public synchronized long skip(long n) throws IOException {
return (tmpN < 0)? -1 : 0; return (tmpN < 0)? -1 : 0;
} }
@Override
public synchronized long getPos() throws IOException { public synchronized long getPos() throws IOException {
return (position - start); return (position - start);
} }
@Override
public synchronized void seek(long pos) throws IOException { public synchronized void seek(long pos) throws IOException {
if (pos < 0 || (start + pos > end)) { if (pos < 0 || (start + pos > end)) {
throw new IOException("Failed to seek: EOF"); throw new IOException("Failed to seek: EOF");
@ -907,6 +929,7 @@ public synchronized void seek(long pos) throws IOException {
underLyingStream.seek(position); underLyingStream.seek(position);
} }
@Override
public boolean seekToNewSource(long targetPos) throws IOException { public boolean seekToNewSource(long targetPos) throws IOException {
//do not need to implement this //do not need to implement this
// hdfs in itself does seektonewsource // hdfs in itself does seektonewsource
@ -917,6 +940,7 @@ public boolean seekToNewSource(long targetPos) throws IOException {
/** /**
* implementing position readable. * implementing position readable.
*/ */
@Override
public int read(long pos, byte[] b, int offset, int length) public int read(long pos, byte[] b, int offset, int length)
throws IOException { throws IOException {
int nlength = length; int nlength = length;
@ -929,6 +953,7 @@ public int read(long pos, byte[] b, int offset, int length)
/** /**
* position readable again. * position readable again.
*/ */
@Override
public void readFully(long pos, byte[] b, int offset, int length) public void readFully(long pos, byte[] b, int offset, int length)
throws IOException { throws IOException {
if (start + length + pos > end) { if (start + length + pos > end) {
@ -937,6 +962,7 @@ public void readFully(long pos, byte[] b, int offset, int length)
underLyingStream.readFully(pos + start, b, offset, length); underLyingStream.readFully(pos + start, b, offset, length);
} }
@Override
public void readFully(long pos, byte[] b) throws IOException { public void readFully(long pos, byte[] b) throws IOException {
readFully(pos, b, 0, b.length); readFully(pos, b, 0, b.length);
} }

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocalFileSystem.java
View File

@ -91,6 +91,7 @@ public void copyToLocalFile(boolean delSrc, Path src, Path dst)
* Moves files to a bad file directory on the same device, so that their * Moves files to a bad file directory on the same device, so that their
* storage will not be reused. * storage will not be reused.
*/ */
@Override
public boolean reportChecksumFailure(Path p, FSDataInputStream in, public boolean reportChecksumFailure(Path p, FSDataInputStream in,
long inPos, long inPos,
FSDataInputStream sums, long sumsPos) { FSDataInputStream sums, long sumsPos) {

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/LocatedFileStatus.java
View File

@ -94,6 +94,7 @@ public BlockLocation[] getBlockLocations() {
* @throws ClassCastException if the specified object's is not of * @throws ClassCastException if the specified object's is not of
* type FileStatus * type FileStatus
*/ */
@Override
public int compareTo(Object o) { public int compareTo(Object o) {
return super.compareTo(o); return super.compareTo(o);
} }
@ -102,6 +103,7 @@ public int compareTo(Object o) {
* @param o the object to be compared. * @param o the object to be compared.
* @return true if two file status has the same path name; false if not. * @return true if two file status has the same path name; false if not.
*/ */
@Override
public boolean equals(Object o) { public boolean equals(Object o) {
return super.equals(o); return super.equals(o);
} }
@ -112,6 +114,7 @@ public boolean equals(Object o) {
* *
* @return a hash code value for the path name. * @return a hash code value for the path name.
*/ */
@Override
public int hashCode() { public int hashCode() {
return super.hashCode(); return super.hashCode();
} }

20
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/MD5MD5CRC32FileChecksum.java
View File

@ -57,7 +57,7 @@ public MD5MD5CRC32FileChecksum(int bytesPerCRC, long crcPerBlock, MD5Hash md5) {
this.md5 = md5; this.md5 = md5;
} }
/** {@inheritDoc} */ @Override
public String getAlgorithmName() { public String getAlgorithmName() {
return "MD5-of-" + crcPerBlock + "MD5-of-" + bytesPerCRC + return "MD5-of-" + crcPerBlock + "MD5-of-" + bytesPerCRC +
getCrcType().name(); getCrcType().name();
@ -73,11 +73,11 @@ public static DataChecksum.Type getCrcTypeFromAlgorithmName(String algorithm)
throw new IOException("Unknown checksum type in " + algorithm); throw new IOException("Unknown checksum type in " + algorithm);
} }
/** {@inheritDoc} */ @Override
public int getLength() {return LENGTH;} public int getLength() {return LENGTH;}
/** {@inheritDoc} */ @Override
public byte[] getBytes() { public byte[] getBytes() {
return WritableUtils.toByteArray(this); return WritableUtils.toByteArray(this);
} }
@ -92,14 +92,14 @@ public ChecksumOpt getChecksumOpt() {
return new ChecksumOpt(getCrcType(), bytesPerCRC); return new ChecksumOpt(getCrcType(), bytesPerCRC);
} }
/** {@inheritDoc} */ @Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
bytesPerCRC = in.readInt(); bytesPerCRC = in.readInt();
crcPerBlock = in.readLong(); crcPerBlock = in.readLong();
md5 = MD5Hash.read(in); md5 = MD5Hash.read(in);
} }
/** {@inheritDoc} */ @Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeInt(bytesPerCRC); out.writeInt(bytesPerCRC);
out.writeLong(crcPerBlock); out.writeLong(crcPerBlock);
@ -161,8 +161,8 @@ public static MD5MD5CRC32FileChecksum valueOf(Attributes attrs
+ ", md5=" + md5, e); + ", md5=" + md5, e);
} }
} }
/** {@inheritDoc} */ @Override
public String toString() { public String toString() {
return getAlgorithmName() + ":" + md5; return getAlgorithmName() + ":" + md5;
} }

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Options.java
View File

@ -22,7 +22,6 @@
import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.util.DataChecksum; import org.apache.hadoop.util.DataChecksum;
import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.Progressable;
import org.apache.hadoop.HadoopIllegalArgumentException;
/** /**
* This class contains options related to file system operations. * This class contains options related to file system operations.

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java
View File

@ -261,6 +261,7 @@ public Path suffix(String suffix) {
return new Path(getParent(), getName()+suffix); return new Path(getParent(), getName()+suffix);
} }
@Override
public String toString() { public String toString() {
// we can't use uri.toString(), which escapes everything, because we want // we can't use uri.toString(), which escapes everything, because we want
// illegal characters unescaped in the string, for glob processing, etc. // illegal characters unescaped in the string, for glob processing, etc.
@ -289,6 +290,7 @@ public String toString() {
return buffer.toString(); return buffer.toString();
} }
@Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof Path)) { if (!(o instanceof Path)) {
return false; return false;
@ -297,10 +299,12 @@ public boolean equals(Object o) {
return this.uri.equals(that.uri); return this.uri.equals(that.uri);
} }
@Override
public int hashCode() { public int hashCode() {
return uri.hashCode(); return uri.hashCode();
} }
@Override
public int compareTo(Object o) { public int compareTo(Object o) {
Path that = (Path)o; Path that = (Path)o;
return this.uri.compareTo(that.uri); return this.uri.compareTo(that.uri);

36
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/RawLocalFileSystem.java
View File

@ -72,8 +72,10 @@ public File pathToFile(Path path) {
return new File(path.toUri().getPath()); return new File(path.toUri().getPath());
} }
@Override
public URI getUri() { return NAME; } public URI getUri() { return NAME; }
@Override
public void initialize(URI uri, Configuration conf) throws IOException { public void initialize(URI uri, Configuration conf) throws IOException {
super.initialize(uri, conf); super.initialize(uri, conf);
setConf(conf); setConf(conf);
@ -84,6 +86,7 @@ public TrackingFileInputStream(File f) throws IOException {
super(f); super(f);
} }
@Override
public int read() throws IOException { public int read() throws IOException {
int result = super.read(); int result = super.read();
if (result != -1) { if (result != -1) {
@ -92,6 +95,7 @@ public int read() throws IOException {
return result; return result;
} }
@Override
public int read(byte[] data) throws IOException { public int read(byte[] data) throws IOException {
int result = super.read(data); int result = super.read(data);
if (result != -1) { if (result != -1) {
@ -100,6 +104,7 @@ public int read(byte[] data) throws IOException {
return result; return result;
} }
@Override
public int read(byte[] data, int offset, int length) throws IOException { public int read(byte[] data, int offset, int length) throws IOException {
int result = super.read(data, offset, length); int result = super.read(data, offset, length);
if (result != -1) { if (result != -1) {
@ -120,15 +125,18 @@ public LocalFSFileInputStream(Path f) throws IOException {
this.fis = new TrackingFileInputStream(pathToFile(f)); this.fis = new TrackingFileInputStream(pathToFile(f));
} }
@Override
public void seek(long pos) throws IOException { public void seek(long pos) throws IOException {
fis.getChannel().position(pos); fis.getChannel().position(pos);
this.position = pos; this.position = pos;
} }
@Override
public long getPos() throws IOException { public long getPos() throws IOException {
return this.position; return this.position;
} }
@Override
public boolean seekToNewSource(long targetPos) throws IOException { public boolean seekToNewSource(long targetPos) throws IOException {
return false; return false;
} }
@ -136,11 +144,14 @@ public boolean seekToNewSource(long targetPos) throws IOException {
/* /*
* Just forward to the fis * Just forward to the fis
*/ */
@Override
public int available() throws IOException { return fis.available(); } public int available() throws IOException { return fis.available(); }
@Override
public void close() throws IOException { fis.close(); } public void close() throws IOException { fis.close(); }
@Override @Override
public boolean markSupported() { return false; } public boolean markSupported() { return false; }
@Override
public int read() throws IOException { public int read() throws IOException {
try { try {
int value = fis.read(); int value = fis.read();
@ -153,6 +164,7 @@ public int read() throws IOException {
} }
} }
@Override
public int read(byte[] b, int off, int len) throws IOException { public int read(byte[] b, int off, int len) throws IOException {
try { try {
int value = fis.read(b, off, len); int value = fis.read(b, off, len);
@ -165,6 +177,7 @@ public int read(byte[] b, int off, int len) throws IOException {
} }
} }
@Override
public int read(long position, byte[] b, int off, int len) public int read(long position, byte[] b, int off, int len)
throws IOException { throws IOException {
ByteBuffer bb = ByteBuffer.wrap(b, off, len); ByteBuffer bb = ByteBuffer.wrap(b, off, len);
@ -175,6 +188,7 @@ public int read(long position, byte[] b, int off, int len)
} }
} }
@Override
public long skip(long n) throws IOException { public long skip(long n) throws IOException {
long value = fis.skip(n); long value = fis.skip(n);
if (value > 0) { if (value > 0) {
@ -189,6 +203,7 @@ public FileDescriptor getFileDescriptor() throws IOException {
} }
} }
@Override
public FSDataInputStream open(Path f, int bufferSize) throws IOException { public FSDataInputStream open(Path f, int bufferSize) throws IOException {
if (!exists(f)) { if (!exists(f)) {
throw new FileNotFoundException(f.toString()); throw new FileNotFoundException(f.toString());
@ -210,8 +225,11 @@ private LocalFSFileOutputStream(Path f, boolean append) throws IOException {
/* /*
* Just forward to the fos * Just forward to the fos
*/ */
@Override
public void close() throws IOException { fos.close(); } public void close() throws IOException { fos.close(); }
@Override
public void flush() throws IOException { fos.flush(); } public void flush() throws IOException { fos.flush(); }
@Override
public void write(byte[] b, int off, int len) throws IOException { public void write(byte[] b, int off, int len) throws IOException {
try { try {
fos.write(b, off, len); fos.write(b, off, len);
@ -220,6 +238,7 @@ public void write(byte[] b, int off, int len) throws IOException {
} }
} }
@Override
public void write(int b) throws IOException { public void write(int b) throws IOException {
try { try {
fos.write(b); fos.write(b);
@ -229,7 +248,7 @@ public void write(int b) throws IOException {
} }
} }
/** {@inheritDoc} */ @Override
public FSDataOutputStream append(Path f, int bufferSize, public FSDataOutputStream append(Path f, int bufferSize,
Progressable progress) throws IOException { Progressable progress) throws IOException {
if (!exists(f)) { if (!exists(f)) {
@ -242,7 +261,6 @@ public FSDataOutputStream append(Path f, int bufferSize,
new LocalFSFileOutputStream(f, true), bufferSize), statistics); new LocalFSFileOutputStream(f, true), bufferSize), statistics);
} }
/** {@inheritDoc} */
@Override @Override
public FSDataOutputStream create(Path f, boolean overwrite, int bufferSize, public FSDataOutputStream create(Path f, boolean overwrite, int bufferSize,
short replication, long blockSize, Progressable progress) short replication, long blockSize, Progressable progress)
@ -264,7 +282,6 @@ private FSDataOutputStream create(Path f, boolean overwrite,
new LocalFSFileOutputStream(f, false), bufferSize), statistics); new LocalFSFileOutputStream(f, false), bufferSize), statistics);
} }
/** {@inheritDoc} */
@Override @Override
public FSDataOutputStream create(Path f, FsPermission permission, public FSDataOutputStream create(Path f, FsPermission permission,
boolean overwrite, int bufferSize, short replication, long blockSize, boolean overwrite, int bufferSize, short replication, long blockSize,
@ -276,7 +293,6 @@ public FSDataOutputStream create(Path f, FsPermission permission,
return out; return out;
} }
/** {@inheritDoc} */
@Override @Override
public FSDataOutputStream createNonRecursive(Path f, FsPermission permission, public FSDataOutputStream createNonRecursive(Path f, FsPermission permission,
boolean overwrite, boolean overwrite,
@ -288,6 +304,7 @@ public FSDataOutputStream createNonRecursive(Path f, FsPermission permission,
return out; return out;
} }
@Override
public boolean rename(Path src, Path dst) throws IOException { public boolean rename(Path src, Path dst) throws IOException {
if (pathToFile(src).renameTo(pathToFile(dst))) { if (pathToFile(src).renameTo(pathToFile(dst))) {
return true; return true;
@ -302,6 +319,7 @@ public boolean rename(Path src, Path dst) throws IOException {
* @return true if the file or directory and all its contents were deleted * @return true if the file or directory and all its contents were deleted
* @throws IOException if p is non-empty and recursive is false * @throws IOException if p is non-empty and recursive is false
*/ */
@Override
public boolean delete(Path p, boolean recursive) throws IOException { public boolean delete(Path p, boolean recursive) throws IOException {
File f = pathToFile(p); File f = pathToFile(p);
if (f.isFile()) { if (f.isFile()) {
@ -313,6 +331,7 @@ public boolean delete(Path p, boolean recursive) throws IOException {
return FileUtil.fullyDelete(f); return FileUtil.fullyDelete(f);
} }
@Override
public FileStatus[] listStatus(Path f) throws IOException { public FileStatus[] listStatus(Path f) throws IOException {
File localf = pathToFile(f); File localf = pathToFile(f);
FileStatus[] results; FileStatus[] results;
@ -350,6 +369,7 @@ public FileStatus[] listStatus(Path f) throws IOException {
* Creates the specified directory hierarchy. Does not * Creates the specified directory hierarchy. Does not
* treat existence as an error. * treat existence as an error.
*/ */
@Override
public boolean mkdirs(Path f) throws IOException { public boolean mkdirs(Path f) throws IOException {
if(f == null) { if(f == null) {
throw new IllegalArgumentException("mkdirs path arg is null"); throw new IllegalArgumentException("mkdirs path arg is null");
@ -367,7 +387,6 @@ public boolean mkdirs(Path f) throws IOException {
(p2f.mkdir() || p2f.isDirectory()); (p2f.mkdir() || p2f.isDirectory());
} }
/** {@inheritDoc} */
@Override @Override
public boolean mkdirs(Path f, FsPermission permission) throws IOException { public boolean mkdirs(Path f, FsPermission permission) throws IOException {
boolean b = mkdirs(f); boolean b = mkdirs(f);
@ -412,7 +431,6 @@ protected Path getInitialWorkingDirectory() {
return this.makeQualified(new Path(System.getProperty("user.dir"))); return this.makeQualified(new Path(System.getProperty("user.dir")));
} }
/** {@inheritDoc} */
@Override @Override
public FsStatus getStatus(Path p) throws IOException { public FsStatus getStatus(Path p) throws IOException {
File partition = pathToFile(p == null ? new Path("/") : p); File partition = pathToFile(p == null ? new Path("/") : p);
@ -424,29 +442,35 @@ public FsStatus getStatus(Path p) throws IOException {
} }
// In the case of the local filesystem, we can just rename the file. // In the case of the local filesystem, we can just rename the file.
@Override
public void moveFromLocalFile(Path src, Path dst) throws IOException { public void moveFromLocalFile(Path src, Path dst) throws IOException {
rename(src, dst); rename(src, dst);
} }
// We can write output directly to the final location // We can write output directly to the final location
@Override
public Path startLocalOutput(Path fsOutputFile, Path tmpLocalFile) public Path startLocalOutput(Path fsOutputFile, Path tmpLocalFile)
throws IOException { throws IOException {
return fsOutputFile; return fsOutputFile;
} }
// It's in the right place - nothing to do. // It's in the right place - nothing to do.
@Override
public void completeLocalOutput(Path fsWorkingFile, Path tmpLocalFile) public void completeLocalOutput(Path fsWorkingFile, Path tmpLocalFile)
throws IOException { throws IOException {
} }
@Override
public void close() throws IOException { public void close() throws IOException {
super.close(); super.close();
} }
@Override
public String toString() { public String toString() {
return "LocalFS"; return "LocalFS";
} }
@Override
public FileStatus getFileStatus(Path f) throws IOException { public FileStatus getFileStatus(Path f) throws IOException {
File path = pathToFile(f); File path = pathToFile(f);
if (path.exists()) { if (path.exists()) {

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java
View File

@ -263,6 +263,7 @@ private class Emptier implements Runnable {
} }
} }
@Override
public void run() { public void run() {
if (emptierInterval == 0) if (emptierInterval == 0)
return; // trash disabled return; // trash disabled

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPFileSystem.java
View File

@ -262,6 +262,7 @@ public void close() throws IOException {
} }
/** This optional operation is not yet supported. */ /** This optional operation is not yet supported. */
@Override
public FSDataOutputStream append(Path f, int bufferSize, public FSDataOutputStream append(Path f, int bufferSize,
Progressable progress) throws IOException { Progressable progress) throws IOException {
throw new IOException("Not supported"); throw new IOException("Not supported");

9
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ftp/FTPInputStream.java
View File

@ -51,19 +51,23 @@ public FTPInputStream(InputStream stream, FTPClient client,
this.closed = false; this.closed = false;
} }
@Override
public long getPos() throws IOException { public long getPos() throws IOException {
return pos; return pos;
} }
// We don't support seek. // We don't support seek.
@Override
public void seek(long pos) throws IOException { public void seek(long pos) throws IOException {
throw new IOException("Seek not supported"); throw new IOException("Seek not supported");
} }
@Override
public boolean seekToNewSource(long targetPos) throws IOException { public boolean seekToNewSource(long targetPos) throws IOException {
throw new IOException("Seek not supported"); throw new IOException("Seek not supported");
} }
@Override
public synchronized int read() throws IOException { public synchronized int read() throws IOException {
if (closed) { if (closed) {
throw new IOException("Stream closed"); throw new IOException("Stream closed");
@ -79,6 +83,7 @@ public synchronized int read() throws IOException {
return byteRead; return byteRead;
} }
@Override
public synchronized int read(byte buf[], int off, int len) throws IOException { public synchronized int read(byte buf[], int off, int len) throws IOException {
if (closed) { if (closed) {
throw new IOException("Stream closed"); throw new IOException("Stream closed");
@ -95,6 +100,7 @@ public synchronized int read(byte buf[], int off, int len) throws IOException {
return result; return result;
} }
@Override
public synchronized void close() throws IOException { public synchronized void close() throws IOException {
if (closed) { if (closed) {
throw new IOException("Stream closed"); throw new IOException("Stream closed");
@ -116,14 +122,17 @@ public synchronized void close() throws IOException {
// Not supported. // Not supported.
@Override
public boolean markSupported() { public boolean markSupported() {
return false; return false;
} }
@Override
public void mark(int readLimit) { public void mark(int readLimit) {
// Do nothing // Do nothing
} }
@Override
public void reset() throws IOException { public void reset() throws IOException {
throw new IOException("Mark not supported"); throw new IOException("Mark not supported");
} }

17
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSImpl.java
View File

@ -50,22 +50,27 @@ public KFSImpl(String metaServerHost, int metaServerPort,
statistics = stats; statistics = stats;
} }
@Override
public boolean exists(String path) throws IOException { public boolean exists(String path) throws IOException {
return kfsAccess.kfs_exists(path); return kfsAccess.kfs_exists(path);
} }
@Override
public boolean isDirectory(String path) throws IOException { public boolean isDirectory(String path) throws IOException {
return kfsAccess.kfs_isDirectory(path); return kfsAccess.kfs_isDirectory(path);
} }
@Override
public boolean isFile(String path) throws IOException { public boolean isFile(String path) throws IOException {
return kfsAccess.kfs_isFile(path); return kfsAccess.kfs_isFile(path);
} }
@Override
public String[] readdir(String path) throws IOException { public String[] readdir(String path) throws IOException {
return kfsAccess.kfs_readdir(path); return kfsAccess.kfs_readdir(path);
} }
@Override
public FileStatus[] readdirplus(Path path) throws IOException { public FileStatus[] readdirplus(Path path) throws IOException {
String srep = path.toUri().getPath(); String srep = path.toUri().getPath();
KfsFileAttr[] fattr = kfsAccess.kfs_readdirplus(srep); KfsFileAttr[] fattr = kfsAccess.kfs_readdirplus(srep);
@ -100,52 +105,64 @@ public FileStatus[] readdirplus(Path path) throws IOException {
} }
@Override
public int mkdirs(String path) throws IOException { public int mkdirs(String path) throws IOException {
return kfsAccess.kfs_mkdirs(path); return kfsAccess.kfs_mkdirs(path);
} }
@Override
public int rename(String source, String dest) throws IOException { public int rename(String source, String dest) throws IOException {
return kfsAccess.kfs_rename(source, dest); return kfsAccess.kfs_rename(source, dest);
} }
@Override
public int rmdir(String path) throws IOException { public int rmdir(String path) throws IOException {
return kfsAccess.kfs_rmdir(path); return kfsAccess.kfs_rmdir(path);
} }
@Override
public int remove(String path) throws IOException { public int remove(String path) throws IOException {
return kfsAccess.kfs_remove(path); return kfsAccess.kfs_remove(path);
} }
@Override
public long filesize(String path) throws IOException { public long filesize(String path) throws IOException {
return kfsAccess.kfs_filesize(path); return kfsAccess.kfs_filesize(path);
} }
@Override
public short getReplication(String path) throws IOException { public short getReplication(String path) throws IOException {
return kfsAccess.kfs_getReplication(path); return kfsAccess.kfs_getReplication(path);
} }
@Override
public short setReplication(String path, short replication) throws IOException { public short setReplication(String path, short replication) throws IOException {
return kfsAccess.kfs_setReplication(path, replication); return kfsAccess.kfs_setReplication(path, replication);
} }
@Override
public String[][] getDataLocation(String path, long start, long len) throws IOException { public String[][] getDataLocation(String path, long start, long len) throws IOException {
return kfsAccess.kfs_getDataLocation(path, start, len); return kfsAccess.kfs_getDataLocation(path, start, len);
} }
@Override
public long getModificationTime(String path) throws IOException { public long getModificationTime(String path) throws IOException {
return kfsAccess.kfs_getModificationTime(path); return kfsAccess.kfs_getModificationTime(path);
} }
@Override
public FSDataInputStream open(String path, int bufferSize) throws IOException { public FSDataInputStream open(String path, int bufferSize) throws IOException {
return new FSDataInputStream(new KFSInputStream(kfsAccess, path, return new FSDataInputStream(new KFSInputStream(kfsAccess, path,
statistics)); statistics));
} }
@Override
public FSDataOutputStream create(String path, short replication, int bufferSize, Progressable progress) throws IOException { public FSDataOutputStream create(String path, short replication, int bufferSize, Progressable progress) throws IOException {
return new FSDataOutputStream(new KFSOutputStream(kfsAccess, path, replication, false, progress), return new FSDataOutputStream(new KFSOutputStream(kfsAccess, path, replication, false, progress),
statistics); statistics);
} }
@Override
public FSDataOutputStream append(String path, int bufferSize, Progressable progress) throws IOException { public FSDataOutputStream append(String path, int bufferSize, Progressable progress) throws IOException {
// when opening for append, # of replicas is ignored // when opening for append, # of replicas is ignored
return new FSDataOutputStream(new KFSOutputStream(kfsAccess, path, (short) 1, true, progress), return new FSDataOutputStream(new KFSOutputStream(kfsAccess, path, (short) 1, true, progress),

10
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSInputStream.java
View File

@ -53,6 +53,7 @@ public KFSInputStream(KfsAccess kfsAccess, String path,
this.fsize = 0; this.fsize = 0;
} }
@Override
public long getPos() throws IOException { public long getPos() throws IOException {
if (kfsChannel == null) { if (kfsChannel == null) {
throw new IOException("File closed"); throw new IOException("File closed");
@ -60,6 +61,7 @@ public long getPos() throws IOException {
return kfsChannel.tell(); return kfsChannel.tell();
} }
@Override
public synchronized int available() throws IOException { public synchronized int available() throws IOException {
if (kfsChannel == null) { if (kfsChannel == null) {
throw new IOException("File closed"); throw new IOException("File closed");
@ -67,6 +69,7 @@ public synchronized int available() throws IOException {
return (int) (this.fsize - getPos()); return (int) (this.fsize - getPos());
} }
@Override
public synchronized void seek(long targetPos) throws IOException { public synchronized void seek(long targetPos) throws IOException {
if (kfsChannel == null) { if (kfsChannel == null) {
throw new IOException("File closed"); throw new IOException("File closed");
@ -74,10 +77,12 @@ public synchronized void seek(long targetPos) throws IOException {
kfsChannel.seek(targetPos); kfsChannel.seek(targetPos);
} }
@Override
public synchronized boolean seekToNewSource(long targetPos) throws IOException { public synchronized boolean seekToNewSource(long targetPos) throws IOException {
return false; return false;
} }
@Override
public synchronized int read() throws IOException { public synchronized int read() throws IOException {
if (kfsChannel == null) { if (kfsChannel == null) {
throw new IOException("File closed"); throw new IOException("File closed");
@ -93,6 +98,7 @@ public synchronized int read() throws IOException {
return -1; return -1;
} }
@Override
public synchronized int read(byte b[], int off, int len) throws IOException { public synchronized int read(byte b[], int off, int len) throws IOException {
if (kfsChannel == null) { if (kfsChannel == null) {
throw new IOException("File closed"); throw new IOException("File closed");
@ -109,6 +115,7 @@ public synchronized int read(byte b[], int off, int len) throws IOException {
return res; return res;
} }
@Override
public synchronized void close() throws IOException { public synchronized void close() throws IOException {
if (kfsChannel == null) { if (kfsChannel == null) {
return; return;
@ -118,14 +125,17 @@ public synchronized void close() throws IOException {
kfsChannel = null; kfsChannel = null;
} }
@Override
public boolean markSupported() { public boolean markSupported() {
return false; return false;
} }
@Override
public void mark(int readLimit) { public void mark(int readLimit) {
// Do nothing // Do nothing
} }
@Override
public void reset() throws IOException { public void reset() throws IOException {
throw new IOException("Mark not supported"); throw new IOException("Mark not supported");
} }

9
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/kfs/KFSOutputStream.java
View File

@ -20,15 +20,10 @@
package org.apache.hadoop.fs.kfs; package org.apache.hadoop.fs.kfs;
import java.io.*; import java.io.*;
import java.net.*;
import java.util.*;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.Progressable;
import org.kosmix.kosmosfs.access.KfsAccess; import org.kosmix.kosmosfs.access.KfsAccess;
@ -60,6 +55,7 @@ public long getPos() throws IOException {
return kfsChannel.tell(); return kfsChannel.tell();
} }
@Override
public void write(int v) throws IOException { public void write(int v) throws IOException {
if (kfsChannel == null) { if (kfsChannel == null) {
throw new IOException("File closed"); throw new IOException("File closed");
@ -70,6 +66,7 @@ public void write(int v) throws IOException {
write(b, 0, 1); write(b, 0, 1);
} }
@Override
public void write(byte b[], int off, int len) throws IOException { public void write(byte b[], int off, int len) throws IOException {
if (kfsChannel == null) { if (kfsChannel == null) {
throw new IOException("File closed"); throw new IOException("File closed");
@ -80,6 +77,7 @@ public void write(byte b[], int off, int len) throws IOException {
kfsChannel.write(ByteBuffer.wrap(b, off, len)); kfsChannel.write(ByteBuffer.wrap(b, off, len));
} }
@Override
public void flush() throws IOException { public void flush() throws IOException {
if (kfsChannel == null) { if (kfsChannel == null) {
throw new IOException("File closed"); throw new IOException("File closed");
@ -89,6 +87,7 @@ public void flush() throws IOException {
kfsChannel.sync(); kfsChannel.sync();
} }
@Override
public synchronized void close() throws IOException { public synchronized void close() throws IOException {
if (kfsChannel == null) { if (kfsChannel == null) {
return; return;

13
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/FsPermission.java
View File

@ -40,6 +40,7 @@ public class FsPermission implements Writable {
private static final Log LOG = LogFactory.getLog(FsPermission.class); private static final Log LOG = LogFactory.getLog(FsPermission.class);
static final WritableFactory FACTORY = new WritableFactory() { static final WritableFactory FACTORY = new WritableFactory() {
@Override
public Writable newInstance() { return new FsPermission(); } public Writable newInstance() { return new FsPermission(); }
}; };
static { // register a ctor static { // register a ctor
@ -124,12 +125,12 @@ public void fromShort(short n) {
set(v[(n >>> 6) & 7], v[(n >>> 3) & 7], v[n & 7], (((n >>> 9) & 1) == 1) ); set(v[(n >>> 6) & 7], v[(n >>> 3) & 7], v[n & 7], (((n >>> 9) & 1) == 1) );
} }
/** {@inheritDoc} */ @Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeShort(toShort()); out.writeShort(toShort());
} }
/** {@inheritDoc} */ @Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
fromShort(in.readShort()); fromShort(in.readShort());
} }
@ -155,7 +156,7 @@ public short toShort() {
return (short)s; return (short)s;
} }
/** {@inheritDoc} */ @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (obj instanceof FsPermission) { if (obj instanceof FsPermission) {
FsPermission that = (FsPermission)obj; FsPermission that = (FsPermission)obj;
@ -167,10 +168,10 @@ public boolean equals(Object obj) {
return false; return false;
} }
/** {@inheritDoc} */ @Override
public int hashCode() {return toShort();} public int hashCode() {return toShort();}
/** {@inheritDoc} */ @Override
public String toString() { public String toString() {
String str = useraction.SYMBOL + groupaction.SYMBOL + otheraction.SYMBOL; String str = useraction.SYMBOL + groupaction.SYMBOL + otheraction.SYMBOL;
if(stickyBit) { if(stickyBit) {
@ -300,9 +301,11 @@ private static class ImmutableFsPermission extends FsPermission {
public ImmutableFsPermission(short permission) { public ImmutableFsPermission(short permission) {
super(permission); super(permission);
} }
@Override
public FsPermission applyUMask(FsPermission umask) { public FsPermission applyUMask(FsPermission umask) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }

9
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/permission/PermissionStatus.java
View File

@ -32,6 +32,7 @@
@InterfaceStability.Unstable @InterfaceStability.Unstable
public class PermissionStatus implements Writable { public class PermissionStatus implements Writable {
static final WritableFactory FACTORY = new WritableFactory() { static final WritableFactory FACTORY = new WritableFactory() {
@Override
public Writable newInstance() { return new PermissionStatus(); } public Writable newInstance() { return new PermissionStatus(); }
}; };
static { // register a ctor static { // register a ctor
@ -42,9 +43,11 @@ public class PermissionStatus implements Writable {
public static PermissionStatus createImmutable( public static PermissionStatus createImmutable(
String user, String group, FsPermission permission) { String user, String group, FsPermission permission) {
return new PermissionStatus(user, group, permission) { return new PermissionStatus(user, group, permission) {
@Override
public PermissionStatus applyUMask(FsPermission umask) { public PermissionStatus applyUMask(FsPermission umask) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@ -82,14 +85,14 @@ public PermissionStatus applyUMask(FsPermission umask) {
return this; return this;
} }
/** {@inheritDoc} */ @Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
username = Text.readString(in, Text.DEFAULT_MAX_LEN); username = Text.readString(in, Text.DEFAULT_MAX_LEN);
groupname = Text.readString(in, Text.DEFAULT_MAX_LEN); groupname = Text.readString(in, Text.DEFAULT_MAX_LEN);
permission = FsPermission.read(in); permission = FsPermission.read(in);
} }
/** {@inheritDoc} */ @Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
write(out, username, groupname, permission); write(out, username, groupname, permission);
} }
@ -115,7 +118,7 @@ public static void write(DataOutput out,
permission.write(out); permission.write(out);
} }
/** {@inheritDoc} */ @Override
public String toString() { public String toString() {
return username + ":" + groupname + ":" + permission; return username + ":" + groupname + ":" + permission;
} }

14
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/Jets3tFileSystemStore.java
View File

@ -83,6 +83,7 @@ class Jets3tFileSystemStore implements FileSystemStore {
private static final Log LOG = private static final Log LOG =
LogFactory.getLog(Jets3tFileSystemStore.class.getName()); LogFactory.getLog(Jets3tFileSystemStore.class.getName());
@Override
public void initialize(URI uri, Configuration conf) throws IOException { public void initialize(URI uri, Configuration conf) throws IOException {
this.conf = conf; this.conf = conf;
@ -108,6 +109,7 @@ public void initialize(URI uri, Configuration conf) throws IOException {
); );
} }
@Override
public String getVersion() throws IOException { public String getVersion() throws IOException {
return FILE_SYSTEM_VERSION_VALUE; return FILE_SYSTEM_VERSION_VALUE;
} }
@ -123,14 +125,17 @@ private void delete(String key) throws IOException {
} }
} }
@Override
public void deleteINode(Path path) throws IOException { public void deleteINode(Path path) throws IOException {
delete(pathToKey(path)); delete(pathToKey(path));
} }
@Override
public void deleteBlock(Block block) throws IOException { public void deleteBlock(Block block) throws IOException {
delete(blockToKey(block)); delete(blockToKey(block));
} }
@Override
public boolean inodeExists(Path path) throws IOException { public boolean inodeExists(Path path) throws IOException {
InputStream in = get(pathToKey(path), true); InputStream in = get(pathToKey(path), true);
if (in == null) { if (in == null) {
@ -140,6 +145,7 @@ public boolean inodeExists(Path path) throws IOException {
return true; return true;
} }
@Override
public boolean blockExists(long blockId) throws IOException { public boolean blockExists(long blockId) throws IOException {
InputStream in = get(blockToKey(blockId), false); InputStream in = get(blockToKey(blockId), false);
if (in == null) { if (in == null) {
@ -203,10 +209,12 @@ private void checkMetadata(S3Object object) throws S3FileSystemException,
} }
} }
@Override
public INode retrieveINode(Path path) throws IOException { public INode retrieveINode(Path path) throws IOException {
return INode.deserialize(get(pathToKey(path), true)); return INode.deserialize(get(pathToKey(path), true));
} }
@Override
public File retrieveBlock(Block block, long byteRangeStart) public File retrieveBlock(Block block, long byteRangeStart)
throws IOException { throws IOException {
File fileBlock = null; File fileBlock = null;
@ -249,6 +257,7 @@ private File newBackupFile() throws IOException {
return result; return result;
} }
@Override
public Set<Path> listSubPaths(Path path) throws IOException { public Set<Path> listSubPaths(Path path) throws IOException {
try { try {
String prefix = pathToKey(path); String prefix = pathToKey(path);
@ -270,6 +279,7 @@ public Set<Path> listSubPaths(Path path) throws IOException {
} }
} }
@Override
public Set<Path> listDeepSubPaths(Path path) throws IOException { public Set<Path> listDeepSubPaths(Path path) throws IOException {
try { try {
String prefix = pathToKey(path); String prefix = pathToKey(path);
@ -311,10 +321,12 @@ private void put(String key, InputStream in, long length, boolean storeMetadata)
} }
} }
@Override
public void storeINode(Path path, INode inode) throws IOException { public void storeINode(Path path, INode inode) throws IOException {
put(pathToKey(path), inode.serialize(), inode.getSerializedLength(), true); put(pathToKey(path), inode.serialize(), inode.getSerializedLength(), true);
} }
@Override
public void storeBlock(Block block, File file) throws IOException { public void storeBlock(Block block, File file) throws IOException {
BufferedInputStream in = null; BufferedInputStream in = null;
try { try {
@ -354,6 +366,7 @@ private String blockToKey(Block block) {
return blockToKey(block.getId()); return blockToKey(block.getId());
} }
@Override
public void purge() throws IOException { public void purge() throws IOException {
try { try {
S3Object[] objects = s3Service.listObjects(bucket); S3Object[] objects = s3Service.listObjects(bucket);
@ -368,6 +381,7 @@ public void purge() throws IOException {
} }
} }
@Override
public void dump() throws IOException { public void dump() throws IOException {
StringBuilder sb = new StringBuilder("S3 Filesystem, "); StringBuilder sb = new StringBuilder("S3 Filesystem, ");
sb.append(bucket.getName()).append("\n"); sb.append(bucket.getName()).append("\n");

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/MigrationTool.java
View File

@ -61,6 +61,7 @@ public static void main(String[] args) throws Exception {
System.exit(res); System.exit(res);
} }
@Override
public int run(String[] args) throws Exception { public int run(String[] args) throws Exception {
if (args.length == 0) { if (args.length == 0) {
@ -195,6 +196,7 @@ interface Store {
class UnversionedStore implements Store { class UnversionedStore implements Store {
@Override
public Set<Path> listAllPaths() throws IOException { public Set<Path> listAllPaths() throws IOException {
try { try {
String prefix = urlEncode(Path.SEPARATOR); String prefix = urlEncode(Path.SEPARATOR);
@ -212,6 +214,7 @@ public Set<Path> listAllPaths() throws IOException {
} }
} }
@Override
public void deleteINode(Path path) throws IOException { public void deleteINode(Path path) throws IOException {
delete(pathToKey(path)); delete(pathToKey(path));
} }
@ -227,6 +230,7 @@ private void delete(String key) throws IOException {
} }
} }
@Override
public INode retrieveINode(Path path) throws IOException { public INode retrieveINode(Path path) throws IOException {
return INode.deserialize(get(pathToKey(path))); return INode.deserialize(get(pathToKey(path)));
} }

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/s3/S3FileSystem.java
View File

@ -206,6 +206,7 @@ public FileStatus[] listStatus(Path f) throws IOException {
} }
/** This optional operation is not yet supported. */ /** This optional operation is not yet supported. */
@Override
public FSDataOutputStream append(Path f, int bufferSize, public FSDataOutputStream append(Path f, int bufferSize,
Progressable progress) throws IOException { Progressable progress) throws IOException {
throw new IOException("Not supported"); throw new IOException("Not supported");
@ -298,6 +299,7 @@ private boolean renameRecursive(Path src, Path dst) throws IOException {
return true; return true;
} }
@Override
public boolean delete(Path path, boolean recursive) throws IOException { public boolean delete(Path path, boolean recursive) throws IOException {
Path absolutePath = makeAbsolute(path); Path absolutePath = makeAbsolute(path);
INode inode = store.retrieveINode(absolutePath); INode inode = store.retrieveINode(absolutePath);

12
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
View File

@ -49,6 +49,7 @@ class Jets3tNativeFileSystemStore implements NativeFileSystemStore {
private S3Service s3Service; private S3Service s3Service;
private S3Bucket bucket; private S3Bucket bucket;
@Override
public void initialize(URI uri, Configuration conf) throws IOException { public void initialize(URI uri, Configuration conf) throws IOException {
S3Credentials s3Credentials = new S3Credentials(); S3Credentials s3Credentials = new S3Credentials();
s3Credentials.initialize(uri, conf); s3Credentials.initialize(uri, conf);
@ -63,6 +64,7 @@ public void initialize(URI uri, Configuration conf) throws IOException {
bucket = new S3Bucket(uri.getHost()); bucket = new S3Bucket(uri.getHost());
} }
@Override
public void storeFile(String key, File file, byte[] md5Hash) public void storeFile(String key, File file, byte[] md5Hash)
throws IOException { throws IOException {
@ -90,6 +92,7 @@ public void storeFile(String key, File file, byte[] md5Hash)
} }
} }
@Override
public void storeEmptyFile(String key) throws IOException { public void storeEmptyFile(String key) throws IOException {
try { try {
S3Object object = new S3Object(key); S3Object object = new S3Object(key);
@ -102,6 +105,7 @@ public void storeEmptyFile(String key) throws IOException {
} }
} }
@Override
public FileMetadata retrieveMetadata(String key) throws IOException { public FileMetadata retrieveMetadata(String key) throws IOException {
try { try {
S3Object object = s3Service.getObjectDetails(bucket, key); S3Object object = s3Service.getObjectDetails(bucket, key);
@ -117,6 +121,7 @@ public FileMetadata retrieveMetadata(String key) throws IOException {
} }
} }
@Override
public InputStream retrieve(String key) throws IOException { public InputStream retrieve(String key) throws IOException {
try { try {
S3Object object = s3Service.getObject(bucket, key); S3Object object = s3Service.getObject(bucket, key);
@ -127,6 +132,7 @@ public InputStream retrieve(String key) throws IOException {
} }
} }
@Override
public InputStream retrieve(String key, long byteRangeStart) public InputStream retrieve(String key, long byteRangeStart)
throws IOException { throws IOException {
try { try {
@ -139,11 +145,13 @@ public InputStream retrieve(String key, long byteRangeStart)
} }
} }
@Override
public PartialListing list(String prefix, int maxListingLength) public PartialListing list(String prefix, int maxListingLength)
throws IOException { throws IOException {
return list(prefix, maxListingLength, null, false); return list(prefix, maxListingLength, null, false);
} }
@Override
public PartialListing list(String prefix, int maxListingLength, String priorLastKey, public PartialListing list(String prefix, int maxListingLength, String priorLastKey,
boolean recurse) throws IOException { boolean recurse) throws IOException {
@ -175,6 +183,7 @@ private PartialListing list(String prefix, String delimiter,
} }
} }
@Override
public void delete(String key) throws IOException { public void delete(String key) throws IOException {
try { try {
s3Service.deleteObject(bucket, key); s3Service.deleteObject(bucket, key);
@ -183,6 +192,7 @@ public void delete(String key) throws IOException {
} }
} }
@Override
public void copy(String srcKey, String dstKey) throws IOException { public void copy(String srcKey, String dstKey) throws IOException {
try { try {
s3Service.copyObject(bucket.getName(), srcKey, bucket.getName(), s3Service.copyObject(bucket.getName(), srcKey, bucket.getName(),
@ -192,6 +202,7 @@ public void copy(String srcKey, String dstKey) throws IOException {
} }
} }
@Override
public void purge(String prefix) throws IOException { public void purge(String prefix) throws IOException {
try { try {
S3Object[] objects = s3Service.listObjects(bucket, prefix, null); S3Object[] objects = s3Service.listObjects(bucket, prefix, null);
@ -203,6 +214,7 @@ public void purge(String prefix) throws IOException {
} }
} }
@Override
public void dump() throws IOException { public void dump() throws IOException {
StringBuilder sb = new StringBuilder("S3 Native Filesystem, "); StringBuilder sb = new StringBuilder("S3 Native Filesystem, ");
sb.append(bucket.getName()).append("\n"); sb.append(bucket.getName()).append("\n");

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/CommandFormat.java
View File

@ -150,6 +150,7 @@ protected IllegalNumberOfArgumentsException(int want, int got) {
actual = got; actual = got;
} }
@Override
public String getMessage() { public String getMessage() {
return "expected " + expected + " but got " + actual; return "expected " + expected + " but got " + actual;
} }
@ -165,6 +166,7 @@ public TooManyArgumentsException(int expected, int actual) {
super(expected, actual); super(expected, actual);
} }
@Override
public String getMessage() { public String getMessage() {
return "Too many arguments: " + super.getMessage(); return "Too many arguments: " + super.getMessage();
} }
@ -180,6 +182,7 @@ public NotEnoughArgumentsException(int expected, int actual) {
super(expected, actual); super(expected, actual);
} }
@Override
public String getMessage() { public String getMessage() {
return "Not enough arguments: " + super.getMessage(); return "Not enough arguments: " + super.getMessage();
} }

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
View File

@ -114,6 +114,7 @@ private boolean moveToTrash(PathData item) throws IOException {
static class Rmr extends Rm { static class Rmr extends Rm {
public static final String NAME = "rmr"; public static final String NAME = "rmr";
@Override
protected void processOptions(LinkedList<String> args) throws IOException { protected void processOptions(LinkedList<String> args) throws IOException {
args.addFirst("-r"); args.addFirst("-r");
super.processOptions(args); super.processOptions(args);
@ -136,6 +137,7 @@ static class Rmdir extends FsCommand {
private boolean ignoreNonEmpty = false; private boolean ignoreNonEmpty = false;
@Override
protected void processOptions(LinkedList<String> args) throws IOException { protected void processOptions(LinkedList<String> args) throws IOException {
CommandFormat cf = new CommandFormat( CommandFormat cf = new CommandFormat(
1, Integer.MAX_VALUE, "-ignore-fail-on-non-empty"); 1, Integer.MAX_VALUE, "-ignore-fail-on-non-empty");

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Display.java
View File

@ -162,6 +162,7 @@ public TextRecordInputStream(FileStatus f) throws IOException {
outbuf = new DataOutputBuffer(); outbuf = new DataOutputBuffer();
} }
@Override
public int read() throws IOException { public int read() throws IOException {
int ret; int ret;
if (null == inbuf || -1 == (ret = inbuf.read())) { if (null == inbuf || -1 == (ret = inbuf.read())) {
@ -181,6 +182,7 @@ public int read() throws IOException {
return ret; return ret;
} }
@Override
public void close() throws IOException { public void close() throws IOException {
r.close(); r.close();
super.close(); super.close();

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/FsCommand.java
View File

@ -73,6 +73,7 @@ public String getCommandName() {
// abstract method that normally is invoked by runall() which is // abstract method that normally is invoked by runall() which is
// overridden below // overridden below
@Override
protected void run(Path path) throws IOException { protected void run(Path path) throws IOException {
throw new RuntimeException("not supposed to get here"); throw new RuntimeException("not supposed to get here");
} }

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/PathData.java
View File

@ -380,6 +380,7 @@ private static int findLongestDirPrefix(String cwd, String path, boolean isDir)
* as given on the commandline, or the full path * as given on the commandline, or the full path
* @return String of the path * @return String of the path
*/ */
@Override
public String toString() { public String toString() {
String scheme = uri.getScheme(); String scheme = uri.getScheme();
// No interpretation of symbols. Just decode % escaped chars. // No interpretation of symbols. Just decode % escaped chars.

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ChRootedFileSystem.java
View File

@ -102,6 +102,7 @@ public ChRootedFileSystem(final URI uri, Configuration conf)
* for this FileSystem * for this FileSystem
* @param conf the configuration * @param conf the configuration
*/ */
@Override
public void initialize(final URI name, final Configuration conf) public void initialize(final URI name, final Configuration conf)
throws IOException { throws IOException {
super.initialize(name, conf); super.initialize(name, conf);

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/NotInMountpointException.java
View File

@ -20,10 +20,6 @@
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.classification.InterfaceStability;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashSet;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
/** /**

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
View File

@ -164,6 +164,7 @@ public String getScheme() {
* this FileSystem * this FileSystem
* @param conf the configuration * @param conf the configuration
*/ */
@Override
public void initialize(final URI theUri, final Configuration conf) public void initialize(final URI theUri, final Configuration conf)
throws IOException { throws IOException {
super.initialize(theUri, conf); super.initialize(theUri, conf);

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFsFileStatus.java
View File

@ -42,7 +42,8 @@ public boolean equals(Object o) {
return super.equals(o); return super.equals(o);
} }
public int hashCode() { @Override
public int hashCode() {
return super.hashCode(); return super.hashCode();
} }

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ActiveStandbyElector.java
View File

@ -892,6 +892,7 @@ private String createWithRetries(final String path, final byte[] data,
final List<ACL> acl, final CreateMode mode) final List<ACL> acl, final CreateMode mode)
throws InterruptedException, KeeperException { throws InterruptedException, KeeperException {
return zkDoWithRetries(new ZKAction<String>() { return zkDoWithRetries(new ZKAction<String>() {
@Override
public String run() throws KeeperException, InterruptedException { public String run() throws KeeperException, InterruptedException {
return zkClient.create(path, data, acl, mode); return zkClient.create(path, data, acl, mode);
} }
@ -901,6 +902,7 @@ public String run() throws KeeperException, InterruptedException {
private byte[] getDataWithRetries(final String path, final boolean watch, private byte[] getDataWithRetries(final String path, final boolean watch,
final Stat stat) throws InterruptedException, KeeperException { final Stat stat) throws InterruptedException, KeeperException {
return zkDoWithRetries(new ZKAction<byte[]>() { return zkDoWithRetries(new ZKAction<byte[]>() {
@Override
public byte[] run() throws KeeperException, InterruptedException { public byte[] run() throws KeeperException, InterruptedException {
return zkClient.getData(path, watch, stat); return zkClient.getData(path, watch, stat);
} }
@ -910,6 +912,7 @@ public byte[] run() throws KeeperException, InterruptedException {
private Stat setDataWithRetries(final String path, final byte[] data, private Stat setDataWithRetries(final String path, final byte[] data,
final int version) throws InterruptedException, KeeperException { final int version) throws InterruptedException, KeeperException {
return zkDoWithRetries(new ZKAction<Stat>() { return zkDoWithRetries(new ZKAction<Stat>() {
@Override
public Stat run() throws KeeperException, InterruptedException { public Stat run() throws KeeperException, InterruptedException {
return zkClient.setData(path, data, version); return zkClient.setData(path, data, version);
} }
@ -919,6 +922,7 @@ public Stat run() throws KeeperException, InterruptedException {
private void deleteWithRetries(final String path, final int version) private void deleteWithRetries(final String path, final int version)
throws KeeperException, InterruptedException { throws KeeperException, InterruptedException {
zkDoWithRetries(new ZKAction<Void>() { zkDoWithRetries(new ZKAction<Void>() {
@Override
public Void run() throws KeeperException, InterruptedException { public Void run() throws KeeperException, InterruptedException {
zkClient.delete(path, version); zkClient.delete(path, version);
return null; return null;

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAServiceProtocol.java
View File

@ -56,6 +56,7 @@ public enum HAServiceState {
this.name = name; this.name = name;
} }
@Override
public String toString() { public String toString() {
return name; return name;
} }

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/NodeFencer.java
View File

@ -184,6 +184,7 @@ private FenceMethodWithArg(FenceMethod method, String arg) {
this.arg = arg; this.arg = arg;
} }
@Override
public String toString() { public String toString() {
return method.getClass().getCanonicalName() + "(" + arg + ")"; return method.getClass().getCanonicalName() + "(" + arg + ")";
} }

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/SshFenceByTcpPort.java
View File

@ -274,6 +274,7 @@ private static class LogAdapter implements com.jcraft.jsch.Logger {
static final Log LOG = LogFactory.getLog( static final Log LOG = LogFactory.getLog(
SshFenceByTcpPort.class.getName() + ".jsch"); SshFenceByTcpPort.class.getName() + ".jsch");
@Override
public boolean isEnabled(int level) { public boolean isEnabled(int level) {
switch (level) { switch (level) {
case com.jcraft.jsch.Logger.DEBUG: case com.jcraft.jsch.Logger.DEBUG:
@ -291,6 +292,7 @@ public boolean isEnabled(int level) {
} }
} }
@Override
public void log(int level, String message) { public void log(int level, String message) {
switch (level) { switch (level) {
case com.jcraft.jsch.Logger.DEBUG: case com.jcraft.jsch.Logger.DEBUG:

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer.java
View File

@ -473,7 +473,7 @@ public void addInternalServlet(String name, String pathSpec,
} }
} }
/** {@inheritDoc} */ @Override
public void addFilter(String name, String classname, public void addFilter(String name, String classname,
Map<String, String> parameters) { Map<String, String> parameters) {
@ -493,7 +493,7 @@ public void addFilter(String name, String classname,
filterNames.add(name); filterNames.add(name);
} }
/** {@inheritDoc} */ @Override
public void addGlobalFilter(String name, String classname, public void addGlobalFilter(String name, String classname,
Map<String, String> parameters) { Map<String, String> parameters) {
final String[] ALL_URLS = { "/*" }; final String[] ALL_URLS = { "/*" };

6
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/AbstractMapWritable.java
View File

@ -164,16 +164,18 @@ protected AbstractMapWritable() {
} }
/** @return the conf */ /** @return the conf */
@Override
public Configuration getConf() { public Configuration getConf() {
return conf.get(); return conf.get();
} }
/** @param conf the conf to set */ /** @param conf the conf to set */
@Override
public void setConf(Configuration conf) { public void setConf(Configuration conf) {
this.conf.set(conf); this.conf.set(conf);
} }
/** {@inheritDoc} */ @Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
// First write out the size of the class table and any classes that are // First write out the size of the class table and any classes that are
@ -187,7 +189,7 @@ public void write(DataOutput out) throws IOException {
} }
} }
/** {@inheritDoc} */ @Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
// Get the number of "unknown" classes // Get the number of "unknown" classes

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ArrayWritable.java
View File

@ -88,6 +88,7 @@ public Object toArray() {
public Writable[] get() { return values; } public Writable[] get() { return values; }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
values = new Writable[in.readInt()]; // construct values values = new Writable[in.readInt()]; // construct values
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.length; i++) {
@ -97,6 +98,7 @@ public void readFields(DataInput in) throws IOException {
} }
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeInt(values.length); // write values out.writeInt(values.length); // write values
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.length; i++) {

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/BooleanWritable.java
View File

@ -57,12 +57,14 @@ public boolean get() {
/** /**
*/ */
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
value = in.readBoolean(); value = in.readBoolean();
} }
/** /**
*/ */
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeBoolean(value); out.writeBoolean(value);
} }

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ByteWritable.java
View File

@ -39,10 +39,12 @@ public ByteWritable() {}
/** Return the value of this ByteWritable. */ /** Return the value of this ByteWritable. */
public byte get() { return value; } public byte get() { return value; }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
value = in.readByte(); value = in.readByte();
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeByte(value); out.writeByte(value);
} }

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/BytesWritable.java
View File

@ -81,6 +81,7 @@ public byte[] copyBytes() {
* if you need the returned array to be precisely the length of the data. * if you need the returned array to be precisely the length of the data.
* @return The data is only valid between 0 and getLength() - 1. * @return The data is only valid between 0 and getLength() - 1.
*/ */
@Override
public byte[] getBytes() { public byte[] getBytes() {
return bytes; return bytes;
} }
@ -97,6 +98,7 @@ public byte[] get() {
/** /**
* Get the current size of the buffer. * Get the current size of the buffer.
*/ */
@Override
public int getLength() { public int getLength() {
return size; return size;
} }
@ -171,6 +173,7 @@ public void set(byte[] newData, int offset, int length) {
} }
// inherit javadoc // inherit javadoc
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
setSize(0); // clear the old data setSize(0); // clear the old data
setSize(in.readInt()); setSize(in.readInt());
@ -178,6 +181,7 @@ public void readFields(DataInput in) throws IOException {
} }
// inherit javadoc // inherit javadoc
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeInt(size); out.writeInt(size);
out.write(bytes, 0, size); out.write(bytes, 0, size);

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/CompressedWritable.java
View File

@ -45,6 +45,7 @@ public abstract class CompressedWritable implements Writable {
public CompressedWritable() {} public CompressedWritable() {}
@Override
public final void readFields(DataInput in) throws IOException { public final void readFields(DataInput in) throws IOException {
compressed = new byte[in.readInt()]; compressed = new byte[in.readInt()];
in.readFully(compressed, 0, compressed.length); in.readFully(compressed, 0, compressed.length);
@ -70,6 +71,7 @@ protected void ensureInflated() {
protected abstract void readFieldsCompressed(DataInput in) protected abstract void readFieldsCompressed(DataInput in)
throws IOException; throws IOException;
@Override
public final void write(DataOutput out) throws IOException { public final void write(DataOutput out) throws IOException {
if (compressed == null) { if (compressed == null) {
ByteArrayOutputStream deflated = new ByteArrayOutputStream(); ByteArrayOutputStream deflated = new ByteArrayOutputStream();

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputByteBuffer.java
View File

@ -21,8 +21,6 @@
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.LinkedList;
import java.util.List;
public class DataInputByteBuffer extends DataInputStream { public class DataInputByteBuffer extends DataInputStream {

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DefaultStringifier.java
View File

@ -72,6 +72,7 @@ public DefaultStringifier(Configuration conf, Class<T> c) {
} }
} }
@Override
public T fromString(String str) throws IOException { public T fromString(String str) throws IOException {
try { try {
byte[] bytes = Base64.decodeBase64(str.getBytes("UTF-8")); byte[] bytes = Base64.decodeBase64(str.getBytes("UTF-8"));
@ -83,6 +84,7 @@ public T fromString(String str) throws IOException {
} }
} }
@Override
public String toString(T obj) throws IOException { public String toString(T obj) throws IOException {
outBuf.reset(); outBuf.reset();
serializer.serialize(obj); serializer.serialize(obj);
@ -91,6 +93,7 @@ public String toString(T obj) throws IOException {
return new String(Base64.encodeBase64(buf)); return new String(Base64.encodeBase64(buf));
} }
@Override
public void close() throws IOException { public void close() throws IOException {
inBuf.close(); inBuf.close();
outBuf.close(); outBuf.close();

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DoubleWritable.java
View File

@ -42,10 +42,12 @@ public DoubleWritable(double value) {
set(value); set(value);
} }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
value = in.readDouble(); value = in.readDouble();
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeDouble(value); out.writeDouble(value);
} }

15
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/EnumSetWritable.java
View File

@ -23,7 +23,6 @@
import java.io.IOException; import java.io.IOException;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.Collection;
import java.util.AbstractCollection; import java.util.AbstractCollection;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
@ -46,8 +45,11 @@ public class EnumSetWritable<E extends Enum<E>> extends AbstractCollection<E>
EnumSetWritable() { EnumSetWritable() {
} }
@Override
public Iterator<E> iterator() { return value.iterator(); } public Iterator<E> iterator() { return value.iterator(); }
@Override
public int size() { return value.size(); } public int size() { return value.size(); }
@Override
public boolean add(E e) { public boolean add(E e) {
if (value == null) { if (value == null) {
value = EnumSet.of(e); value = EnumSet.of(e);
@ -109,7 +111,7 @@ public EnumSet<E> get() {
return value; return value;
} }
/** {@inheritDoc} */ @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
int length = in.readInt(); int length = in.readInt();
@ -127,7 +129,7 @@ else if (length == 0) {
} }
} }
/** {@inheritDoc} */ @Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
if (this.value == null) { if (this.value == null) {
out.writeInt(-1); out.writeInt(-1);
@ -152,6 +154,7 @@ public void write(DataOutput out) throws IOException {
* Returns true if <code>o</code> is an EnumSetWritable with the same value, * Returns true if <code>o</code> is an EnumSetWritable with the same value,
* or both are null. * or both are null.
*/ */
@Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (o == null) { if (o == null) {
throw new IllegalArgumentException("null argument passed in equal()."); throw new IllegalArgumentException("null argument passed in equal().");
@ -180,27 +183,25 @@ public Class<E> getElementType() {
return elementType; return elementType;
} }
/** {@inheritDoc} */ @Override
public int hashCode() { public int hashCode() {
if (value == null) if (value == null)
return 0; return 0;
return (int) value.hashCode(); return (int) value.hashCode();
} }
/** {@inheritDoc} */ @Override
public String toString() { public String toString() {
if (value == null) if (value == null)
return "(null)"; return "(null)";
return value.toString(); return value.toString();
} }
/** {@inheritDoc} */
@Override @Override
public Configuration getConf() { public Configuration getConf() {
return this.conf; return this.conf;
} }
/** {@inheritDoc} */
@Override @Override
public void setConf(Configuration conf) { public void setConf(Configuration conf) {
this.conf = conf; this.conf = conf;

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/FloatWritable.java
View File

@ -39,10 +39,12 @@ public FloatWritable() {}
/** Return the value of this FloatWritable. */ /** Return the value of this FloatWritable. */
public float get() { return value; } public float get() { return value; }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
value = in.readFloat(); value = in.readFloat();
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeFloat(value); out.writeFloat(value);
} }

5
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/GenericWritable.java
View File

@ -114,11 +114,13 @@ public Writable get() {
return instance; return instance;
} }
@Override
public String toString() { public String toString() {
return "GW[" + (instance != null ? ("class=" + instance.getClass().getName() + return "GW[" + (instance != null ? ("class=" + instance.getClass().getName() +
",value=" + instance.toString()) : "(null)") + "]"; ",value=" + instance.toString()) : "(null)") + "]";
} }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
type = in.readByte(); type = in.readByte();
Class<? extends Writable> clazz = getTypes()[type & 0xff]; Class<? extends Writable> clazz = getTypes()[type & 0xff];
@ -131,6 +133,7 @@ public void readFields(DataInput in) throws IOException {
instance.readFields(in); instance.readFields(in);
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
if (type == NOT_SET || instance == null) if (type == NOT_SET || instance == null)
throw new IOException("The GenericWritable has NOT been set correctly. type=" throw new IOException("The GenericWritable has NOT been set correctly. type="
@ -145,10 +148,12 @@ public void write(DataOutput out) throws IOException {
*/ */
abstract protected Class<? extends Writable>[] getTypes(); abstract protected Class<? extends Writable>[] getTypes();
@Override
public Configuration getConf() { public Configuration getConf() {
return conf; return conf;
} }
@Override
public void setConf(Configuration conf) { public void setConf(Configuration conf) {
this.conf = conf; this.conf = conf;
} }

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IOUtils.java
View File

@ -272,9 +272,11 @@ public static void closeSocket(Socket sock) {
* The /dev/null of OutputStreams. * The /dev/null of OutputStreams.
*/ */
public static class NullOutputStream extends OutputStream { public static class NullOutputStream extends OutputStream {
@Override
public void write(byte[] b, int off, int len) throws IOException { public void write(byte[] b, int off, int len) throws IOException {
} }
@Override
public void write(int b) throws IOException { public void write(int b) throws IOException {
} }
} }

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/IntWritable.java
View File

@ -42,10 +42,12 @@ public IntWritable() {}
/** Return the value of this IntWritable. */ /** Return the value of this IntWritable. */
public int get() { return value; } public int get() { return value; }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
value = in.readInt(); value = in.readInt();
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeInt(value); out.writeInt(value);
} }

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/LongWritable.java
View File

@ -42,15 +42,18 @@ public LongWritable() {}
/** Return the value of this LongWritable. */ /** Return the value of this LongWritable. */
public long get() { return value; } public long get() { return value; }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
value = in.readLong(); value = in.readLong();
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeLong(value); out.writeLong(value);
} }
/** Returns true iff <code>o</code> is a LongWritable with the same value. */ /** Returns true iff <code>o</code> is a LongWritable with the same value. */
@Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof LongWritable)) if (!(o instanceof LongWritable))
return false; return false;
@ -58,17 +61,20 @@ public boolean equals(Object o) {
return this.value == other.value; return this.value == other.value;
} }
@Override
public int hashCode() { public int hashCode() {
return (int)value; return (int)value;
} }
/** Compares two LongWritables. */ /** Compares two LongWritables. */
@Override
public int compareTo(LongWritable o) { public int compareTo(LongWritable o) {
long thisValue = this.value; long thisValue = this.value;
long thatValue = o.value; long thatValue = o.value;
return (thisValue<thatValue ? -1 : (thisValue==thatValue ? 0 : 1)); return (thisValue<thatValue ? -1 : (thisValue==thatValue ? 0 : 1));
} }
@Override
public String toString() { public String toString() {
return Long.toString(value); return Long.toString(value);
} }
@ -79,6 +85,7 @@ public Comparator() {
super(LongWritable.class); super(LongWritable.class);
} }
@Override
public int compare(byte[] b1, int s1, int l1, public int compare(byte[] b1, int s1, int l1,
byte[] b2, int s2, int l2) { byte[] b2, int s2, int l2) {
long thisValue = readLong(b1, s1); long thisValue = readLong(b1, s1);
@ -94,6 +101,7 @@ public static class DecreasingComparator extends Comparator {
public int compare(WritableComparable a, WritableComparable b) { public int compare(WritableComparable a, WritableComparable b) {
return -super.compare(a, b); return -super.compare(a, b);
} }
@Override
public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) { public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
return -super.compare(b1, s1, l1, b2, s2, l2); return -super.compare(b1, s1, l1, b2, s2, l2);
} }

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MD5Hash.java
View File

@ -36,6 +36,7 @@ public class MD5Hash implements WritableComparable<MD5Hash> {
public static final int MD5_LEN = 16; public static final int MD5_LEN = 16;
private static ThreadLocal<MessageDigest> DIGESTER_FACTORY = new ThreadLocal<MessageDigest>() { private static ThreadLocal<MessageDigest> DIGESTER_FACTORY = new ThreadLocal<MessageDigest>() {
@Override
protected MessageDigest initialValue() { protected MessageDigest initialValue() {
try { try {
return MessageDigest.getInstance("MD5"); return MessageDigest.getInstance("MD5");
@ -65,6 +66,7 @@ public MD5Hash(byte[] digest) {
} }
// javadoc from Writable // javadoc from Writable
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
in.readFully(digest); in.readFully(digest);
} }
@ -77,6 +79,7 @@ public static MD5Hash read(DataInput in) throws IOException {
} }
// javadoc from Writable // javadoc from Writable
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.write(digest); out.write(digest);
} }
@ -155,6 +158,7 @@ public int quarterDigest() {
/** Returns true iff <code>o</code> is an MD5Hash whose digest contains the /** Returns true iff <code>o</code> is an MD5Hash whose digest contains the
* same values. */ * same values. */
@Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof MD5Hash)) if (!(o instanceof MD5Hash))
return false; return false;
@ -165,12 +169,14 @@ public boolean equals(Object o) {
/** Returns a hash code value for this object. /** Returns a hash code value for this object.
* Only uses the first 4 bytes, since md5s are evenly distributed. * Only uses the first 4 bytes, since md5s are evenly distributed.
*/ */
@Override
public int hashCode() { public int hashCode() {
return quarterDigest(); return quarterDigest();
} }
/** Compares this object with the specified object for order.*/ /** Compares this object with the specified object for order.*/
@Override
public int compareTo(MD5Hash that) { public int compareTo(MD5Hash that) {
return WritableComparator.compareBytes(this.digest, 0, MD5_LEN, return WritableComparator.compareBytes(this.digest, 0, MD5_LEN,
that.digest, 0, MD5_LEN); that.digest, 0, MD5_LEN);
@ -182,6 +188,7 @@ public Comparator() {
super(MD5Hash.class); super(MD5Hash.class);
} }
@Override
public int compare(byte[] b1, int s1, int l1, public int compare(byte[] b1, int s1, int l1,
byte[] b2, int s2, int l2) { byte[] b2, int s2, int l2) {
return compareBytes(b1, s1, MD5_LEN, b2, s2, MD5_LEN); return compareBytes(b1, s1, MD5_LEN, b2, s2, MD5_LEN);
@ -196,6 +203,7 @@ public int compare(byte[] b1, int s1, int l1,
{'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'}; {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
/** Returns a string representation of this object. */ /** Returns a string representation of this object. */
@Override
public String toString() { public String toString() {
StringBuilder buf = new StringBuilder(MD5_LEN*2); StringBuilder buf = new StringBuilder(MD5_LEN*2);
for (int i = 0; i < MD5_LEN; i++) { for (int i = 0; i < MD5_LEN; i++) {

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MapFile.java
View File

@ -296,6 +296,7 @@ public static void setIndexInterval(Configuration conf, int interval) {
} }
/** Close the map. */ /** Close the map. */
@Override
public synchronized void close() throws IOException { public synchronized void close() throws IOException {
data.close(); data.close();
index.close(); index.close();
@ -723,6 +724,7 @@ public synchronized WritableComparable getClosest(WritableComparable key,
} }
/** Close the map. */ /** Close the map. */
@Override
public synchronized void close() throws IOException { public synchronized void close() throws IOException {
if (!indexClosed) { if (!indexClosed) {
index.close(); index.close();

30
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/MapWritable.java
View File

@ -55,27 +55,27 @@ public MapWritable(MapWritable other) {
copy(other); copy(other);
} }
/** {@inheritDoc} */ @Override
public void clear() { public void clear() {
instance.clear(); instance.clear();
} }
/** {@inheritDoc} */ @Override
public boolean containsKey(Object key) { public boolean containsKey(Object key) {
return instance.containsKey(key); return instance.containsKey(key);
} }
/** {@inheritDoc} */ @Override
public boolean containsValue(Object value) { public boolean containsValue(Object value) {
return instance.containsValue(value); return instance.containsValue(value);
} }
/** {@inheritDoc} */ @Override
public Set<Map.Entry<Writable, Writable>> entrySet() { public Set<Map.Entry<Writable, Writable>> entrySet() {
return instance.entrySet(); return instance.entrySet();
} }
/** {@inheritDoc} */ @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == obj) { if (this == obj) {
return true; return true;
@ -93,27 +93,27 @@ public boolean equals(Object obj) {
return false; return false;
} }
/** {@inheritDoc} */ @Override
public Writable get(Object key) { public Writable get(Object key) {
return instance.get(key); return instance.get(key);
} }
/** {@inheritDoc} */ @Override
public int hashCode() { public int hashCode() {
return 1 + this.instance.hashCode(); return 1 + this.instance.hashCode();
} }
/** {@inheritDoc} */ @Override
public boolean isEmpty() { public boolean isEmpty() {
return instance.isEmpty(); return instance.isEmpty();
} }
/** {@inheritDoc} */ @Override
public Set<Writable> keySet() { public Set<Writable> keySet() {
return instance.keySet(); return instance.keySet();
} }
/** {@inheritDoc} */ @Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public Writable put(Writable key, Writable value) { public Writable put(Writable key, Writable value) {
addToMap(key.getClass()); addToMap(key.getClass());
@ -121,31 +121,30 @@ public Writable put(Writable key, Writable value) {
return instance.put(key, value); return instance.put(key, value);
} }
/** {@inheritDoc} */ @Override
public void putAll(Map<? extends Writable, ? extends Writable> t) { public void putAll(Map<? extends Writable, ? extends Writable> t) {
for (Map.Entry<? extends Writable, ? extends Writable> e: t.entrySet()) { for (Map.Entry<? extends Writable, ? extends Writable> e: t.entrySet()) {
put(e.getKey(), e.getValue()); put(e.getKey(), e.getValue());
} }
} }
/** {@inheritDoc} */ @Override
public Writable remove(Object key) { public Writable remove(Object key) {
return instance.remove(key); return instance.remove(key);
} }
/** {@inheritDoc} */ @Override
public int size() { public int size() {
return instance.size(); return instance.size();
} }
/** {@inheritDoc} */ @Override
public Collection<Writable> values() { public Collection<Writable> values() {
return instance.values(); return instance.values();
} }
// Writable // Writable
/** {@inheritDoc} */
@Override @Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
super.write(out); super.write(out);
@ -164,7 +163,6 @@ public void write(DataOutput out) throws IOException {
} }
} }
/** {@inheritDoc} */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/NullWritable.java
View File

@ -35,6 +35,7 @@ private NullWritable() {} // no public ctor
/** Returns the single instance of this class. */ /** Returns the single instance of this class. */
public static NullWritable get() { return THIS; } public static NullWritable get() { return THIS; }
@Override
public String toString() { public String toString() {
return "(null)"; return "(null)";
} }
@ -46,8 +47,11 @@ public String toString() {
public int compareTo(NullWritable other) { public int compareTo(NullWritable other) {
return 0; return 0;
} }
@Override
public boolean equals(Object other) { return other instanceof NullWritable; } public boolean equals(Object other) { return other instanceof NullWritable; }
@Override
public void readFields(DataInput in) throws IOException {} public void readFields(DataInput in) throws IOException {}
@Override
public void write(DataOutput out) throws IOException {} public void write(DataOutput out) throws IOException {}
/** A Comparator &quot;optimized&quot; for NullWritable. */ /** A Comparator &quot;optimized&quot; for NullWritable. */

7
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ObjectWritable.java
View File

@ -66,15 +66,18 @@ public void set(Object instance) {
this.instance = instance; this.instance = instance;
} }
@Override
public String toString() { public String toString() {
return "OW[class=" + declaredClass + ",value=" + instance + "]"; return "OW[class=" + declaredClass + ",value=" + instance + "]";
} }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
readObject(in, this, this.conf); readObject(in, this, this.conf);
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
writeObject(out, instance, declaredClass, conf); writeObject(out, instance, declaredClass, conf);
} }
@ -99,6 +102,7 @@ public NullInstance(Class declaredClass, Configuration conf) {
super(conf); super(conf);
this.declaredClass = declaredClass; this.declaredClass = declaredClass;
} }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
String className = UTF8.readString(in); String className = UTF8.readString(in);
declaredClass = PRIMITIVE_NAMES.get(className); declaredClass = PRIMITIVE_NAMES.get(className);
@ -110,6 +114,7 @@ public void readFields(DataInput in) throws IOException {
} }
} }
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
UTF8.writeString(out, declaredClass.getName()); UTF8.writeString(out, declaredClass.getName());
} }
@ -375,10 +380,12 @@ public static Class<?> loadClass(Configuration conf, String className) {
return declaredClass; return declaredClass;
} }
@Override
public void setConf(Configuration conf) { public void setConf(Configuration conf) {
this.conf = conf; this.conf = conf;
} }
@Override
public Configuration getConf() { public Configuration getConf() {
return this.conf; return this.conf;
} }

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/OutputBuffer.java
View File

@ -50,6 +50,7 @@ public class OutputBuffer extends FilterOutputStream {
private static class Buffer extends ByteArrayOutputStream { private static class Buffer extends ByteArrayOutputStream {
public byte[] getData() { return buf; } public byte[] getData() { return buf; }
public int getLength() { return count; } public int getLength() { return count; }
@Override
public void reset() { count = 0; } public void reset() { count = 0; }
public void write(InputStream in, int len) throws IOException { public void write(InputStream in, int len) throws IOException {

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/ReadaheadPool.java
View File

@ -194,6 +194,7 @@ private ReadaheadRequestImpl(String identifier, FileDescriptor fd, long off, lon
this.len = len; this.len = len;
} }
@Override
public void run() { public void run() {
if (canceled) return; if (canceled) return;
// There's a very narrow race here that the file will close right at // There's a very narrow race here that the file will close right at

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SecureIOUtils.java
View File

@ -24,7 +24,6 @@
import java.io.IOException; import java.io.IOException;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.fs.permission.FsPermission;

32
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
View File

@ -625,15 +625,18 @@ private void reset(DataInputStream in, int length) throws IOException {
dataSize = length; dataSize = length;
} }
@Override
public int getSize() { public int getSize() {
return dataSize; return dataSize;
} }
@Override
public void writeUncompressedBytes(DataOutputStream outStream) public void writeUncompressedBytes(DataOutputStream outStream)
throws IOException { throws IOException {
outStream.write(data, 0, dataSize); outStream.write(data, 0, dataSize);
} }
@Override
public void writeCompressedBytes(DataOutputStream outStream) public void writeCompressedBytes(DataOutputStream outStream)
throws IllegalArgumentException, IOException { throws IllegalArgumentException, IOException {
throw throw
@ -666,10 +669,12 @@ private void reset(DataInputStream in, int length) throws IOException {
dataSize = length; dataSize = length;
} }
@Override
public int getSize() { public int getSize() {
return dataSize; return dataSize;
} }
@Override
public void writeUncompressedBytes(DataOutputStream outStream) public void writeUncompressedBytes(DataOutputStream outStream)
throws IOException { throws IOException {
if (decompressedStream == null) { if (decompressedStream == null) {
@ -687,6 +692,7 @@ public void writeUncompressedBytes(DataOutputStream outStream)
} }
} }
@Override
public void writeCompressedBytes(DataOutputStream outStream) public void writeCompressedBytes(DataOutputStream outStream)
throws IllegalArgumentException, IOException { throws IllegalArgumentException, IOException {
outStream.write(data, 0, dataSize); outStream.write(data, 0, dataSize);
@ -728,6 +734,7 @@ public TreeMap<Text, Text> getMetadata() {
return new TreeMap<Text, Text>(this.theMetadata); return new TreeMap<Text, Text>(this.theMetadata);
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeInt(this.theMetadata.size()); out.writeInt(this.theMetadata.size());
Iterator<Map.Entry<Text, Text>> iter = Iterator<Map.Entry<Text, Text>> iter =
@ -739,6 +746,7 @@ public void write(DataOutput out) throws IOException {
} }
} }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
int sz = in.readInt(); int sz = in.readInt();
if (sz < 0) throw new IOException("Invalid size: " + sz + " for file metadata object"); if (sz < 0) throw new IOException("Invalid size: " + sz + " for file metadata object");
@ -752,6 +760,7 @@ public void readFields(DataInput in) throws IOException {
} }
} }
@Override
public boolean equals(Object other) { public boolean equals(Object other) {
if (other == null) { if (other == null) {
return false; return false;
@ -788,11 +797,13 @@ public boolean equals(Metadata other) {
return true; return true;
} }
@Override
public int hashCode() { public int hashCode() {
assert false : "hashCode not designed"; assert false : "hashCode not designed";
return 42; // any arbitrary constant will do return 42; // any arbitrary constant will do
} }
@Override
public String toString() { public String toString() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("size: ").append(this.theMetadata.size()).append("\n"); sb.append("size: ").append(this.theMetadata.size()).append("\n");
@ -1250,6 +1261,7 @@ public void hflush() throws IOException {
Configuration getConf() { return conf; } Configuration getConf() { return conf; }
/** Close the file. */ /** Close the file. */
@Override
public synchronized void close() throws IOException { public synchronized void close() throws IOException {
keySerializer.close(); keySerializer.close();
uncompressedValSerializer.close(); uncompressedValSerializer.close();
@ -1360,6 +1372,7 @@ static class RecordCompressWriter extends Writer {
} }
/** Append a key/value pair. */ /** Append a key/value pair. */
@Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public synchronized void append(Object key, Object val) public synchronized void append(Object key, Object val)
throws IOException { throws IOException {
@ -1392,6 +1405,7 @@ public synchronized void append(Object key, Object val)
} }
/** Append a key/value pair. */ /** Append a key/value pair. */
@Override
public synchronized void appendRaw(byte[] keyData, int keyOffset, public synchronized void appendRaw(byte[] keyData, int keyOffset,
int keyLength, ValueBytes val) throws IOException { int keyLength, ValueBytes val) throws IOException {
@ -1449,6 +1463,7 @@ void writeBuffer(DataOutputBuffer uncompressedDataBuffer)
} }
/** Compress and flush contents to dfs */ /** Compress and flush contents to dfs */
@Override
public synchronized void sync() throws IOException { public synchronized void sync() throws IOException {
if (noBufferedRecords > 0) { if (noBufferedRecords > 0) {
super.sync(); super.sync();
@ -1478,6 +1493,7 @@ public synchronized void sync() throws IOException {
} }
/** Close the file. */ /** Close the file. */
@Override
public synchronized void close() throws IOException { public synchronized void close() throws IOException {
if (out != null) { if (out != null) {
sync(); sync();
@ -1486,6 +1502,7 @@ public synchronized void close() throws IOException {
} }
/** Append a key/value pair. */ /** Append a key/value pair. */
@Override
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public synchronized void append(Object key, Object val) public synchronized void append(Object key, Object val)
throws IOException { throws IOException {
@ -1518,6 +1535,7 @@ public synchronized void append(Object key, Object val)
} }
/** Append a key/value pair. */ /** Append a key/value pair. */
@Override
public synchronized void appendRaw(byte[] keyData, int keyOffset, public synchronized void appendRaw(byte[] keyData, int keyOffset,
int keyLength, ValueBytes val) throws IOException { int keyLength, ValueBytes val) throws IOException {
@ -1960,6 +1978,7 @@ private Deserializer getDeserializer(SerializationFactory sf, Class c) {
} }
/** Close the file. */ /** Close the file. */
@Override
public synchronized void close() throws IOException { public synchronized void close() throws IOException {
// Return the decompressors to the pool // Return the decompressors to the pool
CodecPool.returnDecompressor(keyLenDecompressor); CodecPool.returnDecompressor(keyLenDecompressor);
@ -2618,6 +2637,7 @@ public synchronized long getPosition() throws IOException {
} }
/** Returns the name of the file. */ /** Returns the name of the file. */
@Override
public String toString() { public String toString() {
return filename; return filename;
} }
@ -2948,6 +2968,7 @@ private void sort(int count) {
mergeSort.mergeSort(pointersCopy, pointers, 0, count); mergeSort.mergeSort(pointersCopy, pointers, 0, count);
} }
class SeqFileComparator implements Comparator<IntWritable> { class SeqFileComparator implements Comparator<IntWritable> {
@Override
public int compare(IntWritable I, IntWritable J) { public int compare(IntWritable I, IntWritable J) {
return comparator.compare(rawBuffer, keyOffsets[I.get()], return comparator.compare(rawBuffer, keyOffsets[I.get()],
keyLengths[I.get()], rawBuffer, keyLengths[I.get()], rawBuffer,
@ -3221,6 +3242,7 @@ public MergeQueue(List <SegmentDescriptor> segments,
this.tmpDir = tmpDir; this.tmpDir = tmpDir;
this.progress = progress; this.progress = progress;
} }
@Override
protected boolean lessThan(Object a, Object b) { protected boolean lessThan(Object a, Object b) {
// indicate we're making progress // indicate we're making progress
if (progress != null) { if (progress != null) {
@ -3232,6 +3254,7 @@ protected boolean lessThan(Object a, Object b) {
msa.getKey().getLength(), msb.getKey().getData(), 0, msa.getKey().getLength(), msb.getKey().getData(), 0,
msb.getKey().getLength()) < 0; msb.getKey().getLength()) < 0;
} }
@Override
public void close() throws IOException { public void close() throws IOException {
SegmentDescriptor ms; // close inputs SegmentDescriptor ms; // close inputs
while ((ms = (SegmentDescriptor)pop()) != null) { while ((ms = (SegmentDescriptor)pop()) != null) {
@ -3239,12 +3262,15 @@ public void close() throws IOException {
} }
minSegment = null; minSegment = null;
} }
@Override
public DataOutputBuffer getKey() throws IOException { public DataOutputBuffer getKey() throws IOException {
return rawKey; return rawKey;
} }
@Override
public ValueBytes getValue() throws IOException { public ValueBytes getValue() throws IOException {
return rawValue; return rawValue;
} }
@Override
public boolean next() throws IOException { public boolean next() throws IOException {
if (size() == 0) if (size() == 0)
return false; return false;
@ -3272,6 +3298,7 @@ public boolean next() throws IOException {
return true; return true;
} }
@Override
public Progress getProgress() { public Progress getProgress() {
return mergeProgress; return mergeProgress;
} }
@ -3469,6 +3496,7 @@ public boolean shouldPreserveInput() {
return preserveInput; return preserveInput;
} }
@Override
public int compareTo(Object o) { public int compareTo(Object o) {
SegmentDescriptor that = (SegmentDescriptor)o; SegmentDescriptor that = (SegmentDescriptor)o;
if (this.segmentLength != that.segmentLength) { if (this.segmentLength != that.segmentLength) {
@ -3481,6 +3509,7 @@ public int compareTo(Object o) {
compareTo(that.segmentPathName.toString()); compareTo(that.segmentPathName.toString());
} }
@Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof SegmentDescriptor)) { if (!(o instanceof SegmentDescriptor)) {
return false; return false;
@ -3495,6 +3524,7 @@ public boolean equals(Object o) {
return false; return false;
} }
@Override
public int hashCode() { public int hashCode() {
return 37 * 17 + (int) (segmentOffset^(segmentOffset>>>32)); return 37 * 17 + (int) (segmentOffset^(segmentOffset>>>32));
} }
@ -3584,12 +3614,14 @@ public LinkedSegmentsDescriptor (long segmentOffset, long segmentLength,
/** The default cleanup. Subclasses can override this with a custom /** The default cleanup. Subclasses can override this with a custom
* cleanup * cleanup
*/ */
@Override
public void cleanup() throws IOException { public void cleanup() throws IOException {
super.close(); super.close();
if (super.shouldPreserveInput()) return; if (super.shouldPreserveInput()) return;
parentContainer.cleanup(); parentContainer.cleanup();
} }
@Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof LinkedSegmentsDescriptor)) { if (!(o instanceof LinkedSegmentsDescriptor)) {
return false; return false;

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SetFile.java
View File

@ -87,6 +87,7 @@ public Reader(FileSystem fs, String dirName, WritableComparator comparator, Conf
} }
// javadoc inherited // javadoc inherited
@Override
public boolean seek(WritableComparable key) public boolean seek(WritableComparable key)
throws IOException { throws IOException {
return super.seek(key); return super.seek(key);

38
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SortedMapWritable.java
View File

@ -57,86 +57,86 @@ public SortedMapWritable(SortedMapWritable other) {
copy(other); copy(other);
} }
/** {@inheritDoc} */ @Override
public Comparator<? super WritableComparable> comparator() { public Comparator<? super WritableComparable> comparator() {
// Returning null means we use the natural ordering of the keys // Returning null means we use the natural ordering of the keys
return null; return null;
} }
/** {@inheritDoc} */ @Override
public WritableComparable firstKey() { public WritableComparable firstKey() {
return instance.firstKey(); return instance.firstKey();
} }
/** {@inheritDoc} */ @Override
public SortedMap<WritableComparable, Writable> public SortedMap<WritableComparable, Writable>
headMap(WritableComparable toKey) { headMap(WritableComparable toKey) {
return instance.headMap(toKey); return instance.headMap(toKey);
} }
/** {@inheritDoc} */ @Override
public WritableComparable lastKey() { public WritableComparable lastKey() {
return instance.lastKey(); return instance.lastKey();
} }
/** {@inheritDoc} */ @Override
public SortedMap<WritableComparable, Writable> public SortedMap<WritableComparable, Writable>
subMap(WritableComparable fromKey, WritableComparable toKey) { subMap(WritableComparable fromKey, WritableComparable toKey) {
return instance.subMap(fromKey, toKey); return instance.subMap(fromKey, toKey);
} }
/** {@inheritDoc} */ @Override
public SortedMap<WritableComparable, Writable> public SortedMap<WritableComparable, Writable>
tailMap(WritableComparable fromKey) { tailMap(WritableComparable fromKey) {
return instance.tailMap(fromKey); return instance.tailMap(fromKey);
} }
/** {@inheritDoc} */ @Override
public void clear() { public void clear() {
instance.clear(); instance.clear();
} }
/** {@inheritDoc} */ @Override
public boolean containsKey(Object key) { public boolean containsKey(Object key) {
return instance.containsKey(key); return instance.containsKey(key);
} }
/** {@inheritDoc} */ @Override
public boolean containsValue(Object value) { public boolean containsValue(Object value) {
return instance.containsValue(value); return instance.containsValue(value);
} }
/** {@inheritDoc} */ @Override
public Set<java.util.Map.Entry<WritableComparable, Writable>> entrySet() { public Set<java.util.Map.Entry<WritableComparable, Writable>> entrySet() {
return instance.entrySet(); return instance.entrySet();
} }
/** {@inheritDoc} */ @Override
public Writable get(Object key) { public Writable get(Object key) {
return instance.get(key); return instance.get(key);
} }
/** {@inheritDoc} */ @Override
public boolean isEmpty() { public boolean isEmpty() {
return instance.isEmpty(); return instance.isEmpty();
} }
/** {@inheritDoc} */ @Override
public Set<WritableComparable> keySet() { public Set<WritableComparable> keySet() {
return instance.keySet(); return instance.keySet();
} }
/** {@inheritDoc} */ @Override
public Writable put(WritableComparable key, Writable value) { public Writable put(WritableComparable key, Writable value) {
addToMap(key.getClass()); addToMap(key.getClass());
addToMap(value.getClass()); addToMap(value.getClass());
return instance.put(key, value); return instance.put(key, value);
} }
/** {@inheritDoc} */ @Override
public void putAll(Map<? extends WritableComparable, ? extends Writable> t) { public void putAll(Map<? extends WritableComparable, ? extends Writable> t) {
for (Map.Entry<? extends WritableComparable, ? extends Writable> e: for (Map.Entry<? extends WritableComparable, ? extends Writable> e:
t.entrySet()) { t.entrySet()) {
@ -145,22 +145,21 @@ public void putAll(Map<? extends WritableComparable, ? extends Writable> t) {
} }
} }
/** {@inheritDoc} */ @Override
public Writable remove(Object key) { public Writable remove(Object key) {
return instance.remove(key); return instance.remove(key);
} }
/** {@inheritDoc} */ @Override
public int size() { public int size() {
return instance.size(); return instance.size();
} }
/** {@inheritDoc} */ @Override
public Collection<Writable> values() { public Collection<Writable> values() {
return instance.values(); return instance.values();
} }
/** {@inheritDoc} */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
@ -187,7 +186,6 @@ public void readFields(DataInput in) throws IOException {
} }
} }
/** {@inheritDoc} */
@Override @Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
super.write(out); super.write(out);

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/Stringifier.java
View File

@ -54,6 +54,7 @@ public interface Stringifier<T> extends java.io.Closeable {
* Closes this object. * Closes this object.
* @throws IOException if an I/O error occurs * @throws IOException if an I/O error occurs
* */ * */
@Override
public void close() throws IOException; public void close() throws IOException;
} }

8
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/Text.java
View File

@ -55,6 +55,7 @@ public class Text extends BinaryComparable
private static ThreadLocal<CharsetEncoder> ENCODER_FACTORY = private static ThreadLocal<CharsetEncoder> ENCODER_FACTORY =
new ThreadLocal<CharsetEncoder>() { new ThreadLocal<CharsetEncoder>() {
@Override
protected CharsetEncoder initialValue() { protected CharsetEncoder initialValue() {
return Charset.forName("UTF-8").newEncoder(). return Charset.forName("UTF-8").newEncoder().
onMalformedInput(CodingErrorAction.REPORT). onMalformedInput(CodingErrorAction.REPORT).
@ -64,6 +65,7 @@ protected CharsetEncoder initialValue() {
private static ThreadLocal<CharsetDecoder> DECODER_FACTORY = private static ThreadLocal<CharsetDecoder> DECODER_FACTORY =
new ThreadLocal<CharsetDecoder>() { new ThreadLocal<CharsetDecoder>() {
@Override
protected CharsetDecoder initialValue() { protected CharsetDecoder initialValue() {
return Charset.forName("UTF-8").newDecoder(). return Charset.forName("UTF-8").newDecoder().
onMalformedInput(CodingErrorAction.REPORT). onMalformedInput(CodingErrorAction.REPORT).
@ -112,11 +114,13 @@ public byte[] copyBytes() {
* valid. Please use {@link #copyBytes()} if you * valid. Please use {@link #copyBytes()} if you
* need the returned array to be precisely the length of the data. * need the returned array to be precisely the length of the data.
*/ */
@Override
public byte[] getBytes() { public byte[] getBytes() {
return bytes; return bytes;
} }
/** Returns the number of bytes in the byte array */ /** Returns the number of bytes in the byte array */
@Override
public int getLength() { public int getLength() {
return length; return length;
} }
@ -281,6 +285,7 @@ public String toString() {
/** deserialize /** deserialize
*/ */
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
int newLength = WritableUtils.readVInt(in); int newLength = WritableUtils.readVInt(in);
setCapacity(newLength, false); setCapacity(newLength, false);
@ -313,6 +318,7 @@ public static void skip(DataInput in) throws IOException {
* length uses zero-compressed encoding * length uses zero-compressed encoding
* @see Writable#write(DataOutput) * @see Writable#write(DataOutput)
*/ */
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
WritableUtils.writeVInt(out, length); WritableUtils.writeVInt(out, length);
out.write(bytes, 0, length); out.write(bytes, 0, length);
@ -329,6 +335,7 @@ public void write(DataOutput out, int maxLength) throws IOException {
} }
/** Returns true iff <code>o</code> is a Text with the same contents. */ /** Returns true iff <code>o</code> is a Text with the same contents. */
@Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (o instanceof Text) if (o instanceof Text)
return super.equals(o); return super.equals(o);
@ -346,6 +353,7 @@ public Comparator() {
super(Text.class); super(Text.class);
} }
@Override
public int compare(byte[] b1, int s1, int l1, public int compare(byte[] b1, int s1, int l1,
byte[] b2, int s2, int l2) { byte[] b2, int s2, int l2) {
int n1 = WritableUtils.decodeVIntSize(b1[s1]); int n1 = WritableUtils.decodeVIntSize(b1[s1]);

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/TwoDArrayWritable.java
View File

@ -57,6 +57,7 @@ public Object toArray() {
public Writable[][] get() { return values; } public Writable[][] get() { return values; }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
// construct matrix // construct matrix
values = new Writable[in.readInt()][]; values = new Writable[in.readInt()][];
@ -81,6 +82,7 @@ public void readFields(DataInput in) throws IOException {
} }
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeInt(values.length); // write values out.writeInt(values.length); // write values
for (int i = 0; i < values.length; i++) { for (int i = 0; i < values.length; i++) {

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/UTF8.java
View File

@ -110,6 +110,7 @@ public void set(UTF8 other) {
System.arraycopy(other.bytes, 0, bytes, 0, length); System.arraycopy(other.bytes, 0, bytes, 0, length);
} }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
length = in.readUnsignedShort(); length = in.readUnsignedShort();
if (bytes == null || bytes.length < length) if (bytes == null || bytes.length < length)
@ -123,6 +124,7 @@ public static void skip(DataInput in) throws IOException {
WritableUtils.skipFully(in, length); WritableUtils.skipFully(in, length);
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeShort(length); out.writeShort(length);
out.write(bytes, 0, length); out.write(bytes, 0, length);

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/VIntWritable.java
View File

@ -43,10 +43,12 @@ public VIntWritable() {}
/** Return the value of this VIntWritable. */ /** Return the value of this VIntWritable. */
public int get() { return value; } public int get() { return value; }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
value = WritableUtils.readVInt(in); value = WritableUtils.readVInt(in);
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
WritableUtils.writeVInt(out, value); WritableUtils.writeVInt(out, value);
} }

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/VLongWritable.java
View File

@ -43,10 +43,12 @@ public VLongWritable() {}
/** Return the value of this LongWritable. */ /** Return the value of this LongWritable. */
public long get() { return value; } public long get() { return value; }
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
value = WritableUtils.readVLong(in); value = WritableUtils.readVLong(in);
} }
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
WritableUtils.writeVLong(out, value); WritableUtils.writeVLong(out, value);
} }

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/VersionMismatchException.java
View File

@ -39,6 +39,7 @@ public VersionMismatchException(byte expectedVersionIn, byte foundVersionIn){
} }
/** Returns a string representation of this object. */ /** Returns a string representation of this object. */
@Override
public String toString(){ public String toString(){
return "A record version mismatch occured. Expecting v" return "A record version mismatch occured. Expecting v"
+ expectedVersion + ", found v" + foundVersion; + expectedVersion + ", found v" + foundVersion;

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/VersionedWritable.java
View File

@ -40,11 +40,13 @@ public abstract class VersionedWritable implements Writable {
public abstract byte getVersion(); public abstract byte getVersion();
// javadoc from Writable // javadoc from Writable
@Override
public void write(DataOutput out) throws IOException { public void write(DataOutput out) throws IOException {
out.writeByte(getVersion()); // store version out.writeByte(getVersion()); // store version
} }
// javadoc from Writable // javadoc from Writable
@Override
public void readFields(DataInput in) throws IOException { public void readFields(DataInput in) throws IOException {
byte version = in.readByte(); // read version byte version = in.readByte(); // read version
if (version != getVersion()) if (version != getVersion())

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/WritableComparator.java
View File

@ -120,6 +120,7 @@ public WritableComparable newKey() {
* Writable#readFields(DataInput)}, then calls {@link * Writable#readFields(DataInput)}, then calls {@link
* #compare(WritableComparable,WritableComparable)}. * #compare(WritableComparable,WritableComparable)}.
*/ */
@Override
public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) { public int compare(byte[] b1, int s1, int l1, byte[] b2, int s2, int l2) {
try { try {
buffer.reset(b1, s1, l1); // parse key1 buffer.reset(b1, s1, l1); // parse key1
@ -144,6 +145,7 @@ public int compare(WritableComparable a, WritableComparable b) {
return a.compareTo(b); return a.compareTo(b);
} }
@Override
public int compare(Object a, Object b) { public int compare(Object a, Object b) {
return compare((WritableComparable)a, (WritableComparable)b); return compare((WritableComparable)a, (WritableComparable)b);
} }

20
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BZip2Codec.java
View File

@ -63,6 +63,7 @@ public BZip2Codec() { }
* @throws java.io.IOException * @throws java.io.IOException
* Throws IO exception * Throws IO exception
*/ */
@Override
public CompressionOutputStream createOutputStream(OutputStream out) public CompressionOutputStream createOutputStream(OutputStream out)
throws IOException { throws IOException {
return new BZip2CompressionOutputStream(out); return new BZip2CompressionOutputStream(out);
@ -74,6 +75,7 @@ public CompressionOutputStream createOutputStream(OutputStream out)
* @return CompressionOutputStream * @return CompressionOutputStream
@throws java.io.IOException @throws java.io.IOException
*/ */
@Override
public CompressionOutputStream createOutputStream(OutputStream out, public CompressionOutputStream createOutputStream(OutputStream out,
Compressor compressor) throws IOException { Compressor compressor) throws IOException {
return createOutputStream(out); return createOutputStream(out);
@ -84,6 +86,7 @@ public CompressionOutputStream createOutputStream(OutputStream out,
* *
* @return BZip2DummyCompressor.class * @return BZip2DummyCompressor.class
*/ */
@Override
public Class<? extends org.apache.hadoop.io.compress.Compressor> getCompressorType() { public Class<? extends org.apache.hadoop.io.compress.Compressor> getCompressorType() {
return BZip2DummyCompressor.class; return BZip2DummyCompressor.class;
} }
@ -93,6 +96,7 @@ public Class<? extends org.apache.hadoop.io.compress.Compressor> getCompressorTy
* *
* @return Compressor * @return Compressor
*/ */
@Override
public Compressor createCompressor() { public Compressor createCompressor() {
return new BZip2DummyCompressor(); return new BZip2DummyCompressor();
} }
@ -106,6 +110,7 @@ public Compressor createCompressor() {
* @throws java.io.IOException * @throws java.io.IOException
* Throws IOException * Throws IOException
*/ */
@Override
public CompressionInputStream createInputStream(InputStream in) public CompressionInputStream createInputStream(InputStream in)
throws IOException { throws IOException {
return new BZip2CompressionInputStream(in); return new BZip2CompressionInputStream(in);
@ -116,6 +121,7 @@ public CompressionInputStream createInputStream(InputStream in)
* *
* @return CompressionInputStream * @return CompressionInputStream
*/ */
@Override
public CompressionInputStream createInputStream(InputStream in, public CompressionInputStream createInputStream(InputStream in,
Decompressor decompressor) throws IOException { Decompressor decompressor) throws IOException {
return createInputStream(in); return createInputStream(in);
@ -133,6 +139,7 @@ public CompressionInputStream createInputStream(InputStream in,
* *
* @return CompressionInputStream for BZip2 aligned at block boundaries * @return CompressionInputStream for BZip2 aligned at block boundaries
*/ */
@Override
public SplitCompressionInputStream createInputStream(InputStream seekableIn, public SplitCompressionInputStream createInputStream(InputStream seekableIn,
Decompressor decompressor, long start, long end, READ_MODE readMode) Decompressor decompressor, long start, long end, READ_MODE readMode)
throws IOException { throws IOException {
@ -181,6 +188,7 @@ public SplitCompressionInputStream createInputStream(InputStream seekableIn,
* *
* @return BZip2DummyDecompressor.class * @return BZip2DummyDecompressor.class
*/ */
@Override
public Class<? extends org.apache.hadoop.io.compress.Decompressor> getDecompressorType() { public Class<? extends org.apache.hadoop.io.compress.Decompressor> getDecompressorType() {
return BZip2DummyDecompressor.class; return BZip2DummyDecompressor.class;
} }
@ -190,6 +198,7 @@ public Class<? extends org.apache.hadoop.io.compress.Decompressor> getDecompress
* *
* @return Decompressor * @return Decompressor
*/ */
@Override
public Decompressor createDecompressor() { public Decompressor createDecompressor() {
return new BZip2DummyDecompressor(); return new BZip2DummyDecompressor();
} }
@ -199,6 +208,7 @@ public Decompressor createDecompressor() {
* *
* @return A String telling the default bzip2 file extension * @return A String telling the default bzip2 file extension
*/ */
@Override
public String getDefaultExtension() { public String getDefaultExtension() {
return ".bz2"; return ".bz2";
} }
@ -226,6 +236,7 @@ private void writeStreamHeader() throws IOException {
} }
} }
@Override
public void finish() throws IOException { public void finish() throws IOException {
if (needsReset) { if (needsReset) {
// In the case that nothing is written to this stream, we still need to // In the case that nothing is written to this stream, we still need to
@ -245,12 +256,14 @@ private void internalReset() throws IOException {
} }
} }
@Override
public void resetState() throws IOException { public void resetState() throws IOException {
// Cannot write to out at this point because out might not be ready // Cannot write to out at this point because out might not be ready
// yet, as in SequenceFile.Writer implementation. // yet, as in SequenceFile.Writer implementation.
needsReset = true; needsReset = true;
} }
@Override
public void write(int b) throws IOException { public void write(int b) throws IOException {
if (needsReset) { if (needsReset) {
internalReset(); internalReset();
@ -258,6 +271,7 @@ public void write(int b) throws IOException {
this.output.write(b); this.output.write(b);
} }
@Override
public void write(byte[] b, int off, int len) throws IOException { public void write(byte[] b, int off, int len) throws IOException {
if (needsReset) { if (needsReset) {
internalReset(); internalReset();
@ -265,6 +279,7 @@ public void write(byte[] b, int off, int len) throws IOException {
this.output.write(b, off, len); this.output.write(b, off, len);
} }
@Override
public void close() throws IOException { public void close() throws IOException {
if (needsReset) { if (needsReset) {
// In the case that nothing is written to this stream, we still need to // In the case that nothing is written to this stream, we still need to
@ -382,6 +397,7 @@ private BufferedInputStream readStreamHeader() throws IOException {
}// end of method }// end of method
@Override
public void close() throws IOException { public void close() throws IOException {
if (!needsReset) { if (!needsReset) {
input.close(); input.close();
@ -417,6 +433,7 @@ public void close() throws IOException {
* *
*/ */
@Override
public int read(byte[] b, int off, int len) throws IOException { public int read(byte[] b, int off, int len) throws IOException {
if (needsReset) { if (needsReset) {
internalReset(); internalReset();
@ -440,6 +457,7 @@ public int read(byte[] b, int off, int len) throws IOException {
} }
@Override
public int read() throws IOException { public int read() throws IOException {
byte b[] = new byte[1]; byte b[] = new byte[1];
int result = this.read(b, 0, 1); int result = this.read(b, 0, 1);
@ -454,6 +472,7 @@ private void internalReset() throws IOException {
} }
} }
@Override
public void resetState() throws IOException { public void resetState() throws IOException {
// Cannot read from bufferedIn at this point because bufferedIn // Cannot read from bufferedIn at this point because bufferedIn
// might not be ready // might not be ready
@ -461,6 +480,7 @@ public void resetState() throws IOException {
needsReset = true; needsReset = true;
} }
@Override
public long getPos() { public long getPos() {
return this.compressedStreamPosition; return this.compressedStreamPosition;
} }

3
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/BlockCompressorStream.java
View File

@ -78,6 +78,7 @@ public BlockCompressorStream(OutputStream out, Compressor compressor) {
* Each block contains the uncompressed length for the block, followed by * Each block contains the uncompressed length for the block, followed by
* one or more length-prefixed blocks of compressed data. * one or more length-prefixed blocks of compressed data.
*/ */
@Override
public void write(byte[] b, int off, int len) throws IOException { public void write(byte[] b, int off, int len) throws IOException {
// Sanity checks // Sanity checks
if (compressor.finished()) { if (compressor.finished()) {
@ -132,6 +133,7 @@ public void write(byte[] b, int off, int len) throws IOException {
} }
} }
@Override
public void finish() throws IOException { public void finish() throws IOException {
if (!compressor.finished()) { if (!compressor.finished()) {
rawWriteInt((int)compressor.getBytesRead()); rawWriteInt((int)compressor.getBytesRead());
@ -142,6 +144,7 @@ public void finish() throws IOException {
} }
} }
@Override
protected void compress() throws IOException { protected void compress() throws IOException {
int len = compressor.compress(buffer, 0, buffer.length); int len = compressor.compress(buffer, 0, buffer.length);
if (len > 0) { if (len > 0) {

Some files were not shown because too many files have changed in this diff Show More