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 BB92A181BF for ; Wed, 11 Nov 2015 04:06:11 +0000 (UTC) Received: (qmail 13134 invoked by uid 500); 11 Nov 2015 04:06:11 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 13039 invoked by uid 500); 11 Nov 2015 04:06:11 -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 12962 invoked by uid 99); 11 Nov 2015 04:06:11 -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; Wed, 11 Nov 2015 04:06:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3FA0CE0A42; Wed, 11 Nov 2015 04:06:11 +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 Date: Wed, 11 Nov 2015 04:06:14 -0000 Message-Id: <9c74bccb46f346a38f1f0e07b6f1d34e@git.apache.org> In-Reply-To: <46b2286ef3814db892b16572e133db27@git.apache.org> References: <46b2286ef3814db892b16572e133db27@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] phoenix git commit: PHOENIX-1844, PHOENIX-1879 PHOENIX-1844, PHOENIX-1879 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/50e4406d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/50e4406d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/50e4406d Branch: refs/heads/calcite Commit: 50e4406dbfe33273c656077e984f1c1dcc79e903 Parents: ed39c7d Author: maryannxue Authored: Tue Nov 10 23:05:46 2015 -0500 Committer: maryannxue Committed: Tue Nov 10 23:05:46 2015 -0500 ---------------------------------------------------------------------- .../org/apache/phoenix/calcite/CalciteIT.java | 636 +++++++++---------- .../apache/phoenix/calcite/CalciteUtils.java | 26 + .../apache/phoenix/calcite/PhoenixSchema.java | 46 +- .../apache/phoenix/calcite/PhoenixTable.java | 27 +- .../calcite/jdbc/PhoenixPrepareImpl.java | 34 +- .../calcite/metadata/PhoenixRelMdCollation.java | 6 + .../calcite/rel/PhoenixAbstractAggregate.java | 35 +- .../calcite/rel/PhoenixClientAggregate.java | 4 +- .../phoenix/calcite/rel/PhoenixClientJoin.java | 6 +- .../calcite/rel/PhoenixClientProject.java | 5 +- .../calcite/rel/PhoenixClientSemiJoin.java | 6 +- .../phoenix/calcite/rel/PhoenixClientSort.java | 4 +- .../calcite/rel/PhoenixCompactClientSort.java | 4 +- .../phoenix/calcite/rel/PhoenixConvention.java | 47 ++ .../phoenix/calcite/rel/PhoenixCorrelate.java | 8 +- .../phoenix/calcite/rel/PhoenixFilter.java | 4 +- .../phoenix/calcite/rel/PhoenixLimit.java | 4 +- .../calcite/rel/PhoenixMergeSortUnion.java | 4 +- .../apache/phoenix/calcite/rel/PhoenixRel.java | 7 +- .../calcite/rel/PhoenixServerAggregate.java | 6 +- .../phoenix/calcite/rel/PhoenixServerJoin.java | 6 +- .../calcite/rel/PhoenixServerProject.java | 4 +- .../calcite/rel/PhoenixServerSemiJoin.java | 6 +- .../phoenix/calcite/rel/PhoenixServerSort.java | 6 +- .../phoenix/calcite/rel/PhoenixTableScan.java | 85 ++- .../calcite/rel/PhoenixTemporarySort.java | 43 ++ .../calcite/rel/PhoenixToClientConverter.java | 45 -- .../phoenix/calcite/rel/PhoenixUncollect.java | 4 +- .../phoenix/calcite/rel/PhoenixUnion.java | 4 +- .../phoenix/calcite/rel/PhoenixValues.java | 2 +- .../rules/PhoenixCompactClientSortRule.java | 9 +- .../calcite/rules/PhoenixConverterRules.java | 185 +++--- .../rules/PhoenixFilterScanMergeRule.java | 17 +- .../rules/PhoenixForwardTableScanRule.java | 58 ++ ...hoenixJoinSingleValueAggregateMergeRule.java | 3 +- .../rules/PhoenixOrderedAggregateRule.java | 60 +- .../rules/PhoenixReverseTableScanRule.java | 62 ++ .../PhoenixSortServerJoinTransposeRule.java | 65 ++ .../java/org/apache/phoenix/util/ScanUtil.java | 11 +- .../phoenix/calcite/ToExpressionTest.java | 2 +- pom.xml | 2 +- 41 files changed, 923 insertions(+), 675 deletions(-) ----------------------------------------------------------------------