Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1FE9B200C8E for ; Thu, 8 Jun 2017 22:26:02 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 1E7E6160BE5; Thu, 8 Jun 2017 20:26:02 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 62F85160BD5 for ; Thu, 8 Jun 2017 22:26:01 +0200 (CEST) Received: (qmail 12113 invoked by uid 500); 8 Jun 2017 20:26:00 -0000 Mailing-List: contact commits-help@phoenix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.apache.org Delivered-To: mailing list commits@phoenix.apache.org Received: (qmail 12102 invoked by uid 99); 8 Jun 2017 20:26:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Jun 2017 20:26:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 475E0DFB8A; Thu, 8 Jun 2017 20:26:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jamestaylor@apache.org To: commits@phoenix.apache.org Date: Thu, 08 Jun 2017 20:26:00 -0000 Message-Id: <57db57ead5694af8b02eb1e144973a8c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] phoenix git commit: PHOENIX-3923 TimezoneOffsetFunctionIT failing after PHOENIX-3913 archived-at: Thu, 08 Jun 2017 20:26:02 -0000 Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 a798b0a99 -> 3138ad44b PHOENIX-3923 TimezoneOffsetFunctionIT failing after PHOENIX-3913 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f2be6bbf Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f2be6bbf Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f2be6bbf Branch: refs/heads/4.x-HBase-1.1 Commit: f2be6bbf48139c84eaa9a4d6440406ae3999edd8 Parents: a798b0a Author: James Taylor Authored: Thu Jun 8 11:21:00 2017 -0700 Committer: James Taylor Committed: Thu Jun 8 13:25:01 2017 -0700 ---------------------------------------------------------------------- .../expression/function/TimezoneOffsetFunction.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/f2be6bbf/phoenix-core/src/main/java/org/apache/phoenix/expression/function/TimezoneOffsetFunction.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/TimezoneOffsetFunction.java b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/TimezoneOffsetFunction.java index 8c70346..c61f838 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/expression/function/TimezoneOffsetFunction.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/expression/function/TimezoneOffsetFunction.java @@ -20,15 +20,16 @@ package org.apache.phoenix.expression.function; import java.sql.SQLException; import java.util.List; + import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.phoenix.cache.JodaTimezoneCache; import org.apache.phoenix.expression.Expression; import org.apache.phoenix.parse.FunctionParseNode; +import org.apache.phoenix.schema.tuple.Tuple; +import org.apache.phoenix.schema.types.PDataType; import org.apache.phoenix.schema.types.PDate; import org.apache.phoenix.schema.types.PInteger; -import org.apache.phoenix.schema.types.PDataType; import org.apache.phoenix.schema.types.PVarchar; -import org.apache.phoenix.schema.tuple.Tuple; import org.joda.time.DateTimeZone; /** @@ -59,11 +60,17 @@ public class TimezoneOffsetFunction extends ScalarFunction { if (!children.get(0).evaluate(tuple, ptr)) { return false; } + if (ptr.getLength() == 0) { + return true; + } DateTimeZone timezoneInstance = JodaTimezoneCache.getInstance(ptr); if (!children.get(1).evaluate(tuple, ptr)) { return false; } + if (ptr.getLength() == 0) { + return true; + } long date = PDate.INSTANCE.getCodec().decodeLong(ptr, children.get(1).getSortOrder()); int offset = timezoneInstance.getOffset(date);