You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2008/10/23 19:31:20 UTC
svn commit: r707420 - in /incubator/pig/trunk: ./
contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/
contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/
Author: gates
Date: Thu Oct 23 10:31:19 2008
New Revision: 707420
URL: http://svn.apache.org/viewvc?rev=707420&view=rev
Log:
PIG-503: Changed default date format for DateExtractor.
Modified:
incubator/pig/trunk/CHANGES.txt
incubator/pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java
incubator/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestDateExtractor.java
Modified: incubator/pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/pig/trunk/CHANGES.txt?rev=707420&r1=707419&r2=707420&view=diff
==============================================================================
--- incubator/pig/trunk/CHANGES.txt (original)
+++ incubator/pig/trunk/CHANGES.txt Thu Oct 23 10:31:19 2008
@@ -374,3 +374,6 @@
PIG-476: Added DateExtractor, a piggybank eval func that extracts a date
from a string (spackest via gates).
+
+ PIG-503: Changed default date format for DateExtractor (spackest via
+ gates).
Modified: incubator/pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java
URL: http://svn.apache.org/viewvc/incubator/pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java?rev=707420&r1=707419&r2=707420&view=diff
==============================================================================
--- incubator/pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java (original)
+++ incubator/pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/apachelogparser/DateExtractor.java Thu Oct 23 10:31:19 2008
@@ -23,7 +23,7 @@
/**
* DateExtractor has three different constructors which each allow for different functionality. The
- * incomingDateFormat (MM-dd-yyyy by default) is used to match the date string that gets passed in from the
+ * incomingDateFormat (yyyy-MM-dd by default) is used to match the date string that gets passed in from the
* log. The outgoingDateFormat (dd/MMM/yyyy:HH:mm:ss Z by default) is used to format the returned string.
*
* Different constructors exist for each combination; please use the appropriate respective constructor.
@@ -34,13 +34,13 @@
*
* From pig latin you will need to use aliases to use a non-default format, like
*
- * define MyDateExtractor org.apache.pig.piggybank.evaluation.util.apachelogparser.DateExtractor("MM-yyyy");
+ * define MyDateExtractor org.apache.pig.piggybank.evaluation.util.apachelogparser.DateExtractor("yyyy-MM");
*
* A = FOREACH row GENERATE DateExtractor(dayTime);
*/
public class DateExtractor extends EvalFunc<DataAtom> {
private static SimpleDateFormat DEFAULT_INCOMING_DATE_FORMAT = new SimpleDateFormat("dd/MMM/yyyy:HH:mm:ss Z");
- private static SimpleDateFormat DEFAULT_OUTGOING_DATE_FORMAT = new SimpleDateFormat("MM-dd-yyyy");
+ private static SimpleDateFormat DEFAULT_OUTGOING_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
private SimpleDateFormat incomingDateFormat;
private SimpleDateFormat outgoingDateFormat;
@@ -85,8 +85,7 @@
try {
date = incomingDateFormat.parse(incomingDateString);
} catch (ParseException e) {
- System.err.println("Unable to parse incoming date string " +
- incomingDateString + ", " + e.getMessage());
+ System.err.println("Unable to parse incoming date string " + incomingDateString + ", " + e.getMessage());
return;
}
Modified: incubator/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestDateExtractor.java
URL: http://svn.apache.org/viewvc/incubator/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestDateExtractor.java?rev=707420&r1=707419&r2=707420&view=diff
==============================================================================
--- incubator/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestDateExtractor.java (original)
+++ incubator/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/apachelogparser/TestDateExtractor.java Thu Oct 23 10:31:19 2008
@@ -36,7 +36,7 @@
Tuple input = new Tuple(new DataAtom("20/Sep/2008:23:53:04 -0600"));
DataAtom output = new DataAtom();
dayExtractor.exec(input, output);
- assertEquals("09-20-2008", output.toString());
+ assertEquals("2008-09-20", output.toString());
}
@Test
@@ -51,7 +51,7 @@
input = new Tuple(new DataAtom("20/Sep/2008:23:53:04 -0600"));
output = new DataAtom();
dayExtractor.exec(input, output);
- assertEquals("09-20-2008", output.toString());
+ assertEquals("2008-09-20", output.toString());
}
@Test