Repository: flume Updated Branches: refs/heads/flume-1.6 49101731c -> 159178aa6
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/159178aa Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/159178aa Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/159178aa Branch: refs/heads/flume-1.6 Commit: 159178aa6a38ecc116a504b9f09b8de667a25ba4 Parents: 4910173 Author: Hari Shreedharan <[email protected]> Authored: Thu Dec 18 13:28:20 2014 -0800 Committer: Hari Shreedharan <[email protected]> Committed: Thu Dec 18 13:29:11 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/159178aa/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/159178aa/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";
