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

HADOOP-16196. Path Parameterize Comparable. 

Author:    David Mollitor <david.mollitor@cloudera.com>

(cherry picked from commit 246ab77f28)
This commit is contained in:
David Mollitor 2019-03-22 10:27:17 +00:00 committed by Steve Loughran
parent 39f60faa60
commit 9a449ac075
No known key found for this signature in database
GPG Key ID: D22CF846DBB162A0
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,8 @@ import org.apache.hadoop.conf.Configuration;
@Stringable @Stringable
@InterfaceAudience.Public @InterfaceAudience.Public
@InterfaceStability.Stable @InterfaceStability.Stable
public class Path implements Comparable, Serializable, ObjectInputValidation { public class Path
implements Comparable<Path>, Serializable, ObjectInputValidation {
/** /**
* The directory separator, a slash. * The directory separator, a slash.
@ -490,9 +491,8 @@ public class Path implements Comparable, Serializable, ObjectInputValidation {
} }
@Override @Override
public int compareTo(Object o) { public int compareTo(Path o) {
Path that = (Path)o; return this.uri.compareTo(o.uri);
return this.uri.compareTo(that.uri);
} }
/** /**

11
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
View File

@ -860,16 +860,15 @@ public class MergeManagerImpl<K, V> implements MergeManager<K, V> {
} }
@Override @Override
public int compareTo(Object obj) { public int compareTo(Path obj) {
if (obj instanceof CompressAwarePath) { if (obj instanceof CompressAwarePath) {
CompressAwarePath compPath = (CompressAwarePath) obj; CompressAwarePath compPath = (CompressAwarePath) obj;
if(this.compressedSize < compPath.getCompressedSize()) { int c = Long.compare(this.compressedSize, compPath.compressedSize);
return -1;
} else if (this.getCompressedSize() > compPath.getCompressedSize()) {
return 1;
}
// Not returning 0 here so that objects with the same size (but // Not returning 0 here so that objects with the same size (but
// different paths) are still added to the TreeSet. // different paths) are still added to the TreeSet.
if (c != 0) {
return c;
}
} }
return super.compareTo(obj); return super.compareTo(obj);
} }