You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2016/09/22 22:04:51 UTC
[1/2] incubator-carbondata git commit: fix timezone issue
Repository: incubator-carbondata
Updated Branches:
refs/heads/branch-0.1 053d8265d -> 9566c7279
fix timezone issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/ca4b23fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/ca4b23fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/ca4b23fb
Branch: refs/heads/branch-0.1
Commit: ca4b23fbfa301786793a116d136cb741d33576b2
Parents: 920b2de
Author: jackylk <ja...@huawei.com>
Authored: Thu Sep 22 14:57:31 2016 -0700
Committer: jackylk <ja...@huawei.com>
Committed: Thu Sep 22 15:01:53 2016 -0700
----------------------------------------------------------------------
.../timestamp/TimeStampDirectDictionaryGeneratorTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ca4b23fb/processing/src/test/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGeneratorTest.java
----------------------------------------------------------------------
diff --git a/processing/src/test/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGeneratorTest.java b/processing/src/test/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGeneratorTest.java
index 0e8d9dc..1a9fe37 100644
--- a/processing/src/test/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGeneratorTest.java
+++ b/processing/src/test/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGeneratorTest.java
@@ -20,6 +20,7 @@ package org.apache.carbondata.core.keygenerator.directdictionary.timestamp;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.TimeZone;
import org.apache.carbondata.core.constants.CarbonCommonConstants;
import org.apache.carbondata.core.util.CarbonProperties;
@@ -86,6 +87,7 @@ public class TimeStampDirectDictionaryGeneratorTest {
.getProperty(CarbonCommonConstants.CARBON_TIMESTAMP_FORMAT,
CarbonCommonConstants.CARBON_TIMESTAMP_DEFAULT_FORMAT));
timeParser.setLenient(false);
+ timeParser.setTimeZone(TimeZone.getTimeZone("IST"));
String actualValue = timeParser.format(date);
Assert.assertEquals("1970-01-01 05:30:00", actualValue);
}
[2/2] incubator-carbondata git commit: Merge branch 'branch-0.1' of
https://github.com/apache/incubator-carbondata into branch-0.1
Posted by ja...@apache.org.
Merge branch 'branch-0.1' of https://github.com/apache/incubator-carbondata into branch-0.1
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/9566c727
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/9566c727
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/9566c727
Branch: refs/heads/branch-0.1
Commit: 9566c7279a474cc43ff061263defacb00dda098d
Parents: ca4b23f 053d826
Author: jackylk <ja...@huawei.com>
Authored: Thu Sep 22 15:03:50 2016 -0700
Committer: jackylk <ja...@huawei.com>
Committed: Thu Sep 22 15:03:50 2016 -0700
----------------------------------------------------------------------
integration-testcases/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------