Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ade12a78 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ade12a78 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ade12a78 Branch: refs/heads/calcite Commit: ade12a787401d0bc67feb7e9c9dc171ca6cc27fb Parents: df42fa1 be5aba5 Author: maryannxue <[email protected]> Authored: Sat Jul 4 13:11:21 2015 -0400 Committer: maryannxue <[email protected]> Committed: Sat Jul 4 13:11:21 2015 -0400 ---------------------------------------------------------------------- .../org/apache/phoenix/end2end/ArrayIT.java | 119 +++++++++++++++++++ .../expression/ArrayConstructorExpression.java | 19 +-- .../org/apache/phoenix/util/PhoenixRuntime.java | 3 +- .../java/org/apache/phoenix/util/QueryUtil.java | 4 +- .../org/apache/phoenix/util/SchemaUtil.java | 18 ++- .../phoenix/pig/PhoenixHBaseLoaderIT.java | 9 +- .../phoenix/pig/PhoenixHBaseStorerIT.java | 4 +- .../apache/phoenix/pig/PhoenixHBaseStorage.java | 51 ++++---- 8 files changed, 178 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
