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/04 04:26:45 UTC
svn commit: r1076968 -
/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/io/file/tfile/TFile.java
Author: omalley
Date: Fri Mar 4 03:26:45 2011
New Revision: 1076968
URL: http://svn.apache.org/viewvc?rev=1076968&view=rev
Log:
commit 0d6705bf94988a343d6ccdbbdcd5cdd2c6c85ce6
Author: Yahoo\! <lt...@yahoo-inc.com>
Date: Tue Aug 11 10:24:34 2009 -0700
Reapply HADOOP-6150
Revert "Walk back the 0.20 branch to the correct point"
This reverts commit 0c97d1f3b49e4612b64fc8dbfb42ae6cba49d09e.
Modified:
hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/io/file/tfile/TFile.java
Modified: hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/io/file/tfile/TFile.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/io/file/tfile/TFile.java?rev=1076968&r1=1076967&r2=1076968&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/io/file/tfile/TFile.java (original)
+++ hadoop/common/branches/branch-0.20-security-patches/src/core/org/apache/hadoop/io/file/tfile/TFile.java Fri Mar 4 03:26:45 2011
@@ -161,6 +161,17 @@ public class TFile {
/** comparator prefix: java class */
public static final String COMPARATOR_JCLASS = "jclass:";
+ /**
+ * Make a raw comparator from a string name.
+ *
+ * @param name
+ * Comparator name
+ * @return A RawComparable comparator.
+ */
+ static public Comparator<RawComparable> makeComparator(String name) {
+ return TFileMeta.makeComparator(name);
+ }
+
// Prevent the instantiation of TFiles
private TFile() {
// nothing
@@ -1944,7 +1955,7 @@ public class TFile {
}
@SuppressWarnings("unchecked")
- private static BytesComparator makeComparator(String comparator) {
+ static BytesComparator makeComparator(String comparator) {
if (comparator.length() == 0) {
// unsorted keys
return null;