svn commit: r524659 - in /lucene/hadoop/trunk: CHANGES.txt src/test/org/apache/hadoop/mapred/SortValidator.java

[tomwhite]

Author: tomwhite
Date: Sun Apr  1 12:37:57 2007
New Revision: 524659

URL: http://svn.apache.org/viewvc?view=rev&rev=524659
Log:
HADOOP-1090.  Fix SortValidator's detection of whether the input file belongs 
to the sort-input or sort-output directory.  Contributed by Arun C Murthy.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/SortValidator.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=524659&r1=524658&r2=524659
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Sun Apr  1 12:37:57 2007
@@ -82,6 +82,10 @@
 25. HADOOP-1170.  Improve datanode performance by removing device
     checks from common operations.  (Igor Bolotin via cutting)
 
+26. HADOOP-1090.  Fix SortValidator's detection of whether the input 
+    file belongs to the sort-input or sort-output directory.
+    (Arun C Murthy via tomwhite)
+
 
 Release 0.12.3 (not yet released)
 

Modified: 
lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/SortValidator.java
URL: 
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/SortValidator.java?view=diff&rev=524659&r1=524658&r2=524659
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/SortValidator.java 
(original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/SortValidator.java 
Sun Apr  1 12:37:57 2007
@@ -72,7 +72,7 @@
     }
     
     // value == one for sort-input; value == two for sort-output
-    return (inputFile.toString().startsWith(inputPaths[0].toString())) ? 
+    return (inputFile.startsWith(inputPaths[0].toString()+"/")) ? 
             sortInput : sortOutput;
   }