svn commit: r1200625 - in /incubator/oozie/trunk: core/src/main/java/org/apache/oozie/util/XLogStreamer.java release-log.txt

[an...@apache.org]

Author: angeloh
Date: Thu Nov 10 23:33:45 2011
New Revision: 1200625

URL: http://svn.apache.org/viewvc?rev=1200625&view=rev
Log:
OOZIE-590 Log Retrieval from multiple .gz archive files (Kiran Nagasubramanian via angeloh)

Modified:
    incubator/oozie/trunk/core/src/main/java/org/apache/oozie/util/XLogStreamer.java
    incubator/oozie/trunk/release-log.txt

Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/util/XLogStreamer.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/util/XLogStreamer.java?rev=1200625&r1=1200624&r2=1200625&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/util/XLogStreamer.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/util/XLogStreamer.java Thu Nov 10 23:33:45 2011
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -335,8 +335,13 @@ public class XLogStreamer {
         long logFileStartTime = calendarEntry.getTimeInMillis();
         long milliSecondsPerHour = 3600000;
         long logFileEndTime = logFileStartTime + milliSecondsPerHour;
+        /*  To check whether the log content is there in the initial or later part of the log file or
+            the log content is contained entirely within this log file or
+            the entire log file contains the event log where the event spans across hours
+        */
         if ((startTime >= logFileStartTime && startTime <= logFileEndTime)
-                || (endTime >= logFileStartTime && endTime <= logFileEndTime)) {
+                || (endTime >= logFileStartTime && endTime <= logFileEndTime)
+                || (startTime <= logFileStartTime && endTime >= logFileEndTime)) {
             returnVal = logFileStartTime;
         }
         return returnVal;

Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1200625&r1=1200624&r2=1200625&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Thu Nov 10 23:33:45 2011
@@ -1,5 +1,6 @@
 -- Oozie 3.1.2 release
 
+OOZIE-590 Log Retrieval from multiple .gz archive files
 OOZIE-38 LocalOozie example and improvement
 OOZIE-580 use xml element to handle string escape when configure evaluator
 OOZIE-585 Coordinator job fail to retrieve log with date range and action range.