Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.0 4450cd9ca -> fd52a88bd
PHOENIX-1769 Exception thrown when TO_DATE function used as LHS in WHERE-clause Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fd52a88b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fd52a88b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fd52a88b Branch: refs/heads/4.x-HBase-1.0 Commit: fd52a88bd850cc51c60e8ad75041066aeba7bfad Parents: 4450cd9 Author: Thomas D'Silva <[email protected]> Authored: Tue Feb 2 17:39:29 2016 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Tue Feb 2 17:39:29 2016 -0800 ---------------------------------------------------------------------- phoenix-core/src/main/java/org/apache/phoenix/util/DateUtil.java | 2 +- pom.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fd52a88b/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 45c3cef..4d7c27c 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 @@ -285,7 +285,7 @@ public class DateUtil { return INSTANCE; } - private final DateTimeFormatter formatter = ISO_DATE_TIME_FORMATTER.withZoneUTC(); + private final DateTimeFormatter formatter = ISO_DATE_TIME_FORMATTER.withZone(DateTimeZone.UTC); private ISODateFormatParser() {} http://git-wip-us.apache.org/repos/asf/phoenix/blob/fd52a88b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 429eff0..4d94682 100644 --- a/pom.xml +++ b/pom.xml @@ -107,7 +107,8 @@ <commons-codec.version>1.7</commons-codec.version> <htrace.version>3.1.0-incubating</htrace.version> <collections.version>3.2.1</collections.version> - <jodatime.version>2.7</jodatime.version> + <!-- Do not change jodatime.version until HBASE-15199 is fixed --> + <jodatime.version>1.6</jodatime.version> <joni.version>2.1.2</joni.version> <calcite.version>1.6.0</calcite.version> <jettyVersion>8.1.7.v20120910</jettyVersion>
