Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 354bdbe11 -> b4d588902
PHOENIX-3221 'LOCAL' keyword is not adhered for 'phoenix.query.dateFormatTimeZone' Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b4d58890 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b4d58890 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b4d58890 Branch: refs/heads/4.x-HBase-1.1 Commit: b4d588902e7cd47c42e31e4cbab4f644ddf33886 Parents: 354bdbe Author: Ankit Singhal <ankitsingha...@gmail.com> Authored: Thu Sep 29 15:30:51 2016 +0530 Committer: Ankit Singhal <ankitsingha...@gmail.com> Committed: Thu Sep 29 15:30:51 2016 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/compile/StatementContext.java | 2 +- phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b4d58890/phoenix-core/src/main/java/org/apache/phoenix/compile/StatementContext.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/StatementContext.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/StatementContext.java index 8ced589..ae07a9a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/StatementContext.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/StatementContext.java @@ -123,7 +123,7 @@ public class StatementContext { this.timeFormatter = DateUtil.getTimeFormatter(timeFormat); this.timestampFormat = props.get(QueryServices.TIMESTAMP_FORMAT_ATTRIB, DateUtil.DEFAULT_TIMESTAMP_FORMAT); this.timestampFormatter = DateUtil.getTimestampFormatter(timestampFormat); - this.dateFormatTimeZone = TimeZone.getTimeZone(props.get(QueryServices.DATE_FORMAT_TIMEZONE_ATTRIB, + this.dateFormatTimeZone = DateUtil.getTimeZone(props.get(QueryServices.DATE_FORMAT_TIMEZONE_ATTRIB, DateUtil.DEFAULT_TIME_ZONE_ID)); this.numberFormat = props.get(QueryServices.NUMBER_FORMAT_ATTRIB, NumberUtil.DEFAULT_NUMBER_FORMAT); this.tempPtr = new ImmutableBytesWritable(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/b4d58890/phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java index 7f62797..9e37eca 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java @@ -95,7 +95,7 @@ public class DateUtil { } } - private static TimeZone getTimeZone(String timeZoneId) { + public static TimeZone getTimeZone(String timeZoneId) { TimeZone parserTimeZone; if (timeZoneId == null) { parserTimeZone = DateUtil.DEFAULT_TIME_ZONE;
