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 8459B1087C for ; Sat, 1 Mar 2014 02:10:08 +0000 (UTC) Received: (qmail 50189 invoked by uid 500); 1 Mar 2014 02:10:06 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 50138 invoked by uid 500); 1 Mar 2014 02:10:06 -0000 Mailing-List: contact commits-help@phoenix.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@phoenix.incubator.apache.org Delivered-To: mailing list commits@phoenix.incubator.apache.org Received: (qmail 50131 invoked by uid 99); 1 Mar 2014 02:10:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Mar 2014 02:10:06 +0000 X-ASF-Spam-Status: No, hits=-2000.5 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 01 Mar 2014 02:10:05 +0000 Received: (qmail 50065 invoked by uid 99); 1 Mar 2014 02:09:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Mar 2014 02:09:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 58FE1931E20; Sat, 1 Mar 2014 02:09:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: maryannxue@apache.org To: commits@phoenix.incubator.apache.org Date: Sat, 01 Mar 2014 02:09:45 -0000 Message-Id: <02b984a4d21c447ba9338a57d1aa310d@git.apache.org> In-Reply-To: <64dd7ad3d6ff4bbc83291b088721be96@git.apache.org> References: <64dd7ad3d6ff4bbc83291b088721be96@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/c692e71e Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/c692e71e Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/c692e71e Branch: refs/heads/master Commit: c692e71efdf8cfb28ebf6264df119a1c46dafd80 Parents: 44744bf 6cfd897 Author: maryannxue Authored: Fri Feb 28 21:06:55 2014 -0500 Committer: maryannxue Committed: Fri Feb 28 21:06:55 2014 -0500 ---------------------------------------------------------------------- .../expression/ArrayConstructorExpression.java | 120 +++- .../expression/function/ArrayIndexFunction.java | 14 +- .../apache/phoenix/schema/PArrayDataType.java | 671 ++++++++++++------- .../org/apache/phoenix/schema/PDataType.java | 56 +- .../org/apache/phoenix/schema/PhoenixArray.java | 16 + .../org/apache/phoenix/schema/ValueSchema.java | 4 +- .../org/apache/phoenix/end2end/ArrayTest.java | 176 ++++- .../phoenix/schema/PDataTypeForArraysTest.java | 613 ++++++++++++++++- 8 files changed, 1343 insertions(+), 327 deletions(-) ----------------------------------------------------------------------