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

HADOOP-13534. Remove unused TrashPolicy#getInstance and initialize code. Contributed by Yiqun Lin.

This commit is contained in:
Akira Ajisaka 2016-08-25 13:54:57 +09:00
parent 5a6fc5f483
commit ab3b727b5f
3 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicy.java
View File

@ -36,17 +36,6 @@ public abstract class TrashPolicy extends Configured {
protected Path trash; // path to trash directory protected Path trash; // path to trash directory
protected long deletionInterval; // deletion interval for Emptier protected long deletionInterval; // deletion interval for Emptier
/**
* Used to setup the trash policy. Must be implemented by all TrashPolicy
* implementations.
* @param conf the configuration to be used
* @param fs the filesystem to be used
* @param home the home directory
* @deprecated Use {@link #initialize(Configuration, FileSystem)} instead.
*/
@Deprecated
public abstract void initialize(Configuration conf, FileSystem fs, Path home);
/** /**
* Used to setup the trash policy. Must be implemented by all TrashPolicy * Used to setup the trash policy. Must be implemented by all TrashPolicy
* implementations. Different from initialize(conf, fs, home), this one does * implementations. Different from initialize(conf, fs, home), this one does
@ -110,25 +99,6 @@ public abstract class TrashPolicy extends Configured {
*/ */
public abstract Runnable getEmptier() throws IOException; public abstract Runnable getEmptier() throws IOException;
/**
* Get an instance of the configured TrashPolicy based on the value
* of the configuration parameter fs.trash.classname.
*
* @param conf the configuration to be used
* @param fs the file system to be used
* @param home the home directory
* @return an instance of TrashPolicy
* @deprecated Use {@link #getInstance(Configuration, FileSystem)} instead.
*/
@Deprecated
public static TrashPolicy getInstance(Configuration conf, FileSystem fs, Path home) {
Class<? extends TrashPolicy> trashClass = conf.getClass(
"fs.trash.classname", TrashPolicyDefault.class, TrashPolicy.class);
TrashPolicy trash = ReflectionUtils.newInstance(trashClass, conf);
trash.initialize(conf, fs, home); // initialize TrashPolicy
return trash;
}
/** /**
* Get an instance of the configured TrashPolicy based on the value * Get an instance of the configured TrashPolicy based on the value
* of the configuration parameter fs.trash.classname. * of the configuration parameter fs.trash.classname.

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

@ -75,21 +75,6 @@ public class TrashPolicyDefault extends TrashPolicy {
initialize(conf, fs); initialize(conf, fs);
} }
/**
* @deprecated Use {@link #initialize(Configuration, FileSystem)} instead.
*/
@Override
@Deprecated
public void initialize(Configuration conf, FileSystem fs, Path home) {
this.fs = fs;
this.deletionInterval = (long)(conf.getFloat(
FS_TRASH_INTERVAL_KEY, FS_TRASH_INTERVAL_DEFAULT)
* MSECS_PER_MINUTE);
this.emptierInterval = (long)(conf.getFloat(
FS_TRASH_CHECKPOINT_INTERVAL_KEY, FS_TRASH_CHECKPOINT_INTERVAL_DEFAULT)
* MSECS_PER_MINUTE);
}
@Override @Override
public void initialize(Configuration conf, FileSystem fs) { public void initialize(Configuration conf, FileSystem fs) {
this.fs = fs; this.fs = fs;

4
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestTrash.java
View File

@ -691,10 +691,6 @@ public class TestTrash extends TestCase {
public static class TestTrashPolicy extends TrashPolicy { public static class TestTrashPolicy extends TrashPolicy {
public TestTrashPolicy() { } public TestTrashPolicy() { }
@Override
public void initialize(Configuration conf, FileSystem fs, Path home) {
}
@Override @Override
public void initialize(Configuration conf, FileSystem fs) { public void initialize(Configuration conf, FileSystem fs) {
} }