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:30 UTC

svn commit: r1076965 - /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:30 2011
New Revision: 1076965

URL: http://svn.apache.org/viewvc?rev=1076965&view=rev
Log:
commit e12167e6f9394d0a008592014e2d1d71709c01e7
Author: Yahoo\! <lt...@yahoo-inc.com>
Date:   Tue Aug 11 10:06:56 2009 -0700

    Walk back the 0.20 branch to the correct point
    Revert "HADOOP-6150. Users should be able to instantiate comparator using TFile"
    
    This reverts commit b30691023ba67c28584a60b1ddfa3114a7c45591.

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=1076965&r1=1076964&r2=1076965&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:30 2011
@@ -161,17 +161,6 @@ 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
@@ -1955,7 +1944,7 @@ public class TFile {
     }
 
     @SuppressWarnings("unchecked")
-    static BytesComparator makeComparator(String comparator) {
+    private static BytesComparator makeComparator(String comparator) {
       if (comparator.length() == 0) {
         // unsorted keys
         return null;