HADOOP-13534. Remove unused TrashPolicy#getInstance and initialize code. Contributed by Yiqun Lin.
This commit is contained in:
parent
5a6fc5f483
commit
ab3b727b5f
@ -36,17 +36,6 @@ public abstract class TrashPolicy extends Configured {
|
||||
protected Path trash; // path to trash directory
|
||||
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
|
||||
* implementations. Different from initialize(conf, fs, home), this one does
|
||||
@ -110,25 +99,6 @@ public Path getCurrentTrashDir(Path path) 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
|
||||
* of the configuration parameter fs.trash.classname.
|
||||
|
@ -75,21 +75,6 @@ private TrashPolicyDefault(FileSystem fs, Configuration conf)
|
||||
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
|
||||
public void initialize(Configuration conf, FileSystem fs) {
|
||||
this.fs = fs;
|
||||
|
@ -691,10 +691,6 @@ public static void main(String [] arg) throws IOException{
|
||||
public static class TestTrashPolicy extends TrashPolicy {
|
||||
public TestTrashPolicy() { }
|
||||
|
||||
@Override
|
||||
public void initialize(Configuration conf, FileSystem fs, Path home) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(Configuration conf, FileSystem fs) {
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user