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 om...@apache.org on 2011/03/08 05:36:18 UTC
svn commit: r1079108 - in /hadoop/common/branches/yahoo-merge: CHANGES.txt
src/java/org/apache/hadoop/fs/Options.java
src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
Author: omalley
Date: Tue Mar 8 04:36:18 2011
New Revision: 1079108
URL: http://svn.apache.org/viewvc?rev=1079108&view=rev
Log:
commit c54a1ef9f84d2e3565718f47d0d00f3affc1e623
Author: Jitendra Nath Pandey <jitendra@sufferhome-lm.(none)>
Date: Tue Oct 26 16:59:04 2010 -0700
from
Modified:
hadoop/common/branches/yahoo-merge/CHANGES.txt
hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/Options.java
hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
Modified: hadoop/common/branches/yahoo-merge/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/CHANGES.txt?rev=1079108&r1=1079107&r2=1079108&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/common/branches/yahoo-merge/CHANGES.txt Tue Mar 8 04:36:18 2011
@@ -38,12 +38,15 @@ Trunk (unreleased changes)
HADOOP-6996. Allow CodecFactory to return a codec object given a codec'
class name. (hairong)
- HADOOP-7171. Support Ugi in the FileContext. (jitendra)
+ HADOOP-7171. Support UGI in the FileContext. (jitendra)
+
+ HADOOP-6854. Options.createOpts should provide API to access Progress.
+ (Krishna Ramachandran via jitendra)
IMPROVEMENTS
HADOOP-6644. util.Shell getGROUPS_FOR_USER_COMMAND method name
- - should use common naming convention (boryas)
+ should use common naming convention (boryas)
HADOOP-6778. add isRunning() method to
AbstractDelegationTokenSecretManager (for HDFS-1044) (boryas)
Modified: hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/Options.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/Options.java?rev=1079108&r1=1079107&r2=1079108&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/Options.java (original)
+++ hadoop/common/branches/yahoo-merge/src/java/org/apache/hadoop/fs/Options.java Tue Mar 8 04:36:18 2011
@@ -55,7 +55,11 @@ public final class Options {
public static CreateParent donotCreateParent() {
return new CreateParent(false);
}
-
+
+ public static Progress progress(Progressable progress) {
+ return new Progress(progress);
+ }
+
public static class BlockSize extends CreateOpts {
private final long blockSize;
protected BlockSize(long bs) {
Modified: hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java?rev=1079108&r1=1079107&r2=1079108&view=diff
==============================================================================
--- hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java (original)
+++ hadoop/common/branches/yahoo-merge/src/test/core/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java Tue Mar 8 04:36:18 2011
@@ -30,6 +30,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.apache.hadoop.util.Progressable;
import static org.apache.hadoop.fs.FileContextTestHelper.*;
@@ -71,6 +72,10 @@ public abstract class FileContextMainOpe
}
};
+ static class TestProgress implements Progressable {
+ public void progress() { }
+ }
+
//A test filter with returns any path containing a "b"
final private static PathFilter TEST_X_FILTER = new PathFilter() {
public boolean accept(Path file) {
@@ -1052,8 +1057,10 @@ public abstract class FileContextMainOpe
//HADOOP-4760 according to Closeable#close() closing already-closed
//streams should have no effect.
Path src = getTestRootPath(fc, "test/hadoop/file");
+ Progressable prog = new TestProgress();
FSDataOutputStream out = fc.create(src, EnumSet.of(CreateFlag.CREATE),
- Options.CreateOpts.createParent());
+ Options.CreateOpts.createParent(),
+ Options.CreateOpts.Progress.progress(prog));
out.writeChar('H'); //write some data
out.close();