You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by om...@apache.org on 2011/03/08 07:00:07 UTC

svn commit: r1079247 - /hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java

Author: omalley
Date: Tue Mar  8 06:00:07 2011
New Revision: 1079247

URL: http://svn.apache.org/viewvc?rev=1079247&view=rev
Log:
commit 00f0bdb0439cc8220685d65c937d16a89eb2442a
Author: Richard King <dk...@yahoo-inc.com>
Date:   Tue Jan 18 21:08:20 2011 +0000

    names the directories for the job history files on a 24-hour clock.
    
    +++ b/YAHOO-CHANGES.txt
    +   names the directories on a 24-hour clock.  See  .
    +  From
    +

Modified:
    hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java

Modified: hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java?rev=1079247&r1=1079246&r2=1079247&view=diff
==============================================================================
--- hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java (original)
+++ hadoop/mapreduce/branches/yahoo-merge/src/java/org/apache/hadoop/mapreduce/jobhistory/JobHistory.java Tue Mar  8 06:00:07 2011
@@ -932,9 +932,9 @@ public class JobHistory {
         dateString = String.format
           ("%04d/%02d/%02d/%02d",
            timestamp.get(Calendar.YEAR),
-           timestamp.get(DEBUG_MODE ? Calendar.HOUR : Calendar.MONTH) + 1,
+           timestamp.get(DEBUG_MODE ? Calendar.HOUR_OF_DAY : Calendar.MONTH) + 1,
            timestamp.get(DEBUG_MODE ? Calendar.MINUTE : Calendar.DAY_OF_MONTH),
-           timestamp.get(DEBUG_MODE ? Calendar.SECOND : Calendar.HOUR));
+           timestamp.get(DEBUG_MODE ? Calendar.SECOND : Calendar.HOUR_OF_DAY));
 
         dateString = dateString.intern();
 
@@ -1478,11 +1478,11 @@ public class JobHistory {
       --seg2int;
     }
 
-    result.set(DEBUG_MODE ? Calendar.HOUR : Calendar.MONTH,
+    result.set(DEBUG_MODE ? Calendar.HOUR_OF_DAY : Calendar.MONTH,
                seg2int);
     result.set(DEBUG_MODE ? Calendar.MINUTE : Calendar.DAY_OF_MONTH,
                Integer.parseInt(seg3));
-    result.set(DEBUG_MODE ? Calendar.SECOND : Calendar.HOUR,
+    result.set(DEBUG_MODE ? Calendar.SECOND : Calendar.HOUR_OF_DAY,
                Integer.parseInt(seg4));
 
     return result.getTimeInMillis();