You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sz...@apache.org on 2009/07/17 20:01:15 UTC
svn commit: r795172 - in /hadoop/common/trunk: CHANGES.txt
src/java/org/apache/hadoop/fs/ChecksumFileSystem.java
src/java/org/apache/hadoop/fs/FileSystem.java
src/java/org/apache/hadoop/fs/HarFileSystem.java
Author: szetszwo
Date: Fri Jul 17 18:01:15 2009
New Revision: 795172
URL: http://svn.apache.org/viewvc?rev=795172&view=rev
Log:
HADOOP-6138. Eliminate the depracate warnings introduced by H-5438. Contributed by He Yongqiang
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java
hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java
hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java
Modified: hadoop/common/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=795172&r1=795171&r2=795172&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Fri Jul 17 18:01:15 2009
@@ -880,6 +880,9 @@
HADOOP-6137. Fix project specific test-patch requirements
(Giridharan Kesavan)
+ HADOOP-6138. Eliminate the depracate warnings introduced by H-5438.
+ (He Yongqiang via szetszwo)
+
Release 0.20.1 - Unreleased
INCOMPATIBLE CHANGES
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java?rev=795172&r1=795171&r2=795172&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/ChecksumFileSystem.java Fri Jul 17 18:01:15 2009
@@ -20,6 +20,7 @@
import java.io.*;
import java.util.Arrays;
+import java.util.EnumSet;
import java.util.zip.CRC32;
import org.apache.commons.logging.Log;
@@ -360,14 +361,14 @@
/** {@inheritDoc} */
@Override
public FSDataOutputStream create(Path f, FsPermission permission,
- boolean overwrite, int bufferSize, short replication, long blockSize,
+ EnumSet<CreateFlag> flag, int bufferSize, short replication, long blockSize,
Progressable progress) throws IOException {
Path parent = f.getParent();
if (parent != null && !mkdirs(parent)) {
throw new IOException("Mkdirs failed to create " + parent);
}
final FSDataOutputStream out = new FSDataOutputStream(
- new ChecksumFSOutputSummer(this, f, overwrite, bufferSize, replication,
+ new ChecksumFSOutputSummer(this, f, flag.contains(CreateFlag.OVERWRITE), bufferSize, replication,
blockSize, progress), null);
if (permission != null) {
setPermission(f, permission);
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java?rev=795172&r1=795171&r2=795172&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/FileSystem.java Fri Jul 17 18:01:15 2009
@@ -500,8 +500,9 @@
long blockSize,
Progressable progress
) throws IOException {
- return this.create(f, FsPermission.getDefault(),
- overwrite, bufferSize, replication, blockSize, progress);
+ return this.create(f, FsPermission.getDefault(), overwrite ? EnumSet
+ .of(CreateFlag.OVERWRITE) : EnumSet.of(CreateFlag.CREATE), bufferSize,
+ replication, blockSize, progress);
}
/**
Modified: hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java?rev=795172&r1=795171&r2=795172&view=diff
==============================================================================
--- hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java (original)
+++ hadoop/common/trunk/src/java/org/apache/hadoop/fs/HarFileSystem.java Fri Jul 17 18:01:15 2009
@@ -22,6 +22,7 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.EnumSet;
import java.util.List;
import org.apache.hadoop.conf.Configuration;
@@ -580,7 +581,7 @@
public FSDataOutputStream create(Path f,
FsPermission permission,
- boolean overwrite,
+ EnumSet<CreateFlag> flag,
int bufferSize,
short replication,
long blockSize,