Return-Path: X-Original-To: apmail-phoenix-commits-archive@minotaur.apache.org Delivered-To: apmail-phoenix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D7B519BD0 for ; Fri, 8 Apr 2016 15:51:03 +0000 (UTC) Received: (qmail 67076 invoked by uid 500); 8 Apr 2016 15:51:03 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 67036 invoked by uid 500); 8 Apr 2016 15:51:03 -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 67027 invoked by uid 99); 8 Apr 2016 15:51:02 -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; Fri, 08 Apr 2016 15:51:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D6230DFC73; Fri, 8 Apr 2016 15:51:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: maryannxue@apache.org To: commits@phoenix.apache.org Message-Id: <68b1771d3a86477a80d85eb5d7876ee7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: phoenix git commit: PHOENIX-2828 Ordinality should be 1-based in UNNEST WITH ORDINALITY Date: Fri, 8 Apr 2016 15:51:02 +0000 (UTC) Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 f65d0481d -> caea1a514 PHOENIX-2828 Ordinality should be 1-based in UNNEST WITH ORDINALITY Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/caea1a51 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/caea1a51 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/caea1a51 Branch: refs/heads/4.x-HBase-0.98 Commit: caea1a514d804c70ceac158ccb33956c7090f81a Parents: f65d048 Author: maryannxue Authored: Fri Apr 8 11:50:49 2016 -0400 Committer: maryannxue Committed: Fri Apr 8 11:50:49 2016 -0400 ---------------------------------------------------------------------- .../src/main/java/org/apache/phoenix/execute/UnnestArrayPlan.java | 2 +- .../test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/caea1a51/phoenix-core/src/main/java/org/apache/phoenix/execute/UnnestArrayPlan.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/UnnestArrayPlan.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/UnnestArrayPlan.java index c8fef3f..8905eef 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/UnnestArrayPlan.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/UnnestArrayPlan.java @@ -170,7 +170,7 @@ public class UnnestArrayPlan extends DelegateQueryPlan { @Override public boolean evaluate(Tuple tuple, ImmutableBytesWritable ptr) { byte[] lengthBuf = new byte[PInteger.INSTANCE.getByteSize()]; - PInteger.INSTANCE.getCodec().encodeInt(index, lengthBuf, 0); + PInteger.INSTANCE.getCodec().encodeInt(index + 1, lengthBuf, 0); ptr.set(lengthBuf); return true; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/caea1a51/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java b/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java index 51b8868..50e2721 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java @@ -143,7 +143,7 @@ public class UnnestArrayPlanTest { List ret = Lists.newArrayList(); for (Object[] array : arrays) { for (int i = 0; i < array.length; i++) { - ret.add(new Object[] {array[i], i}); + ret.add(new Object[] {array[i], i + 1}); } } return ret;