Merge remote-tracking branch 'origin/master' into calcite
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/587a07b6 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/587a07b6 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/587a07b6 Branch: refs/heads/calcite Commit: 587a07b6a4b5aa163acefccd9b1ecfb8d71418cc Parents: 7ca8e4b ad99952 Author: maryannxue <maryann....@gmail.com> Authored: Fri Oct 7 12:01:38 2016 -0700 Committer: maryannxue <maryann....@gmail.com> Committed: Fri Oct 7 12:01:38 2016 -0700 ---------------------------------------------------------------------- .../apache/phoenix/end2end/SortMergeJoinIT.java | 324 ++++++++++++------- .../org/apache/phoenix/end2end/SubqueryIT.java | 99 +++--- .../end2end/SubqueryUsingSortMergeJoinIT.java | 54 ++-- .../expression/ArrayConstructorExpression.java | 5 +- .../ArrayConstructorExpressionTest.java | 63 ++++ 5 files changed, 363 insertions(+), 182 deletions(-) ----------------------------------------------------------------------
