You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by hs...@apache.org on 2014/12/18 22:29:20 UTC
flume git commit: FLUME-2556. BucketWriter DateFormat test fails
intermittently.
Repository: flume
Updated Branches:
refs/heads/trunk 34e9bda31 -> 84465664c
FLUME-2556. BucketWriter DateFormat test fails intermittently.
(Johny Rufus via Hari)
Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/84465664
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/84465664
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/84465664
Branch: refs/heads/trunk
Commit: 84465664c21ed0a1261f015a010b94a98153c8d7
Parents: 34e9bda
Author: Hari Shreedharan <hs...@apache.org>
Authored: Thu Dec 18 13:28:20 2014 -0800
Committer: Hari Shreedharan <hs...@apache.org>
Committed: Thu Dec 18 13:28:20 2014 -0800
----------------------------------------------------------------------
.../apache/flume/formatter/output/BucketPath.java | 2 ++
.../flume/formatter/output/TestBucketPath.java | 17 +++++++++++++++++
2 files changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flume/blob/84465664/flume-ng-core/src/main/java/org/apache/flume/formatter/output/BucketPath.java
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/main/java/org/apache/flume/formatter/output/BucketPath.java b/flume-ng-core/src/main/java/org/apache/flume/formatter/output/BucketPath.java
index fe38d2c..afe095c 100644
--- a/flume-ng-core/src/main/java/org/apache/flume/formatter/output/BucketPath.java
+++ b/flume-ng-core/src/main/java/org/apache/flume/formatter/output/BucketPath.java
@@ -314,6 +314,8 @@ public class BucketPath {
SimpleDateFormat format = getSimpleDateFormat(formatString);
if (timeZone != null) {
format.setTimeZone(timeZone);
+ } else {
+ format.setTimeZone(TimeZone.getDefault());
}
Date date = new Date(ts);
http://git-wip-us.apache.org/repos/asf/flume/blob/84465664/flume-ng-core/src/test/java/org/apache/flume/formatter/output/TestBucketPath.java
----------------------------------------------------------------------
diff --git a/flume-ng-core/src/test/java/org/apache/flume/formatter/output/TestBucketPath.java b/flume-ng-core/src/test/java/org/apache/flume/formatter/output/TestBucketPath.java
index c441c4a..8d1da12 100644
--- a/flume-ng-core/src/test/java/org/apache/flume/formatter/output/TestBucketPath.java
+++ b/flume-ng-core/src/test/java/org/apache/flume/formatter/output/TestBucketPath.java
@@ -47,6 +47,23 @@ public class TestBucketPath {
headers = new HashMap<String, String>();
headers.put("timestamp", String.valueOf(cal.getTimeInMillis()));
}
+
+ @Test
+ public void testDateFormatCache(){
+ TimeZone utcTimeZone = TimeZone.getTimeZone("UTC");
+ String test = "%c";
+ BucketPath.escapeString(
+ test, headers, utcTimeZone, false, Calendar.HOUR_OF_DAY, 12, false);
+ String escapedString = BucketPath.escapeString(
+ test, headers, false, Calendar.HOUR_OF_DAY, 12);
+ System.out.println("Escaped String: " + escapedString);
+ SimpleDateFormat format = new SimpleDateFormat("EEE MMM d HH:mm:ss yyyy");
+ Date d = new Date(cal.getTimeInMillis());
+ String expectedString = format.format(d);
+ System.out.println("Expected String: "+ expectedString);
+ Assert.assertEquals(expectedString, escapedString);
+ }
+
@Test
public void testDateFormatHours() {
String test = "%c";