Fix merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3aecc3d3 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3aecc3d3 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3aecc3d3 Branch: refs/heads/calcite Commit: 3aecc3d34833c8baf21e5196219079d8d56b1d7e Parents: d1678c7 92e728e Author: maryannxue <maryann....@gmail.com> Authored: Thu Apr 6 10:31:59 2017 -0700 Committer: maryannxue <maryann....@gmail.com> Committed: Thu Apr 6 10:31:59 2017 -0700 ---------------------------------------------------------------------- .../apache/phoenix/end2end/AlterTableIT.java | 9 +- .../org/apache/phoenix/end2end/ArrayIT.java | 2 +- .../phoenix/end2end/AutomaticRebuildIT.java | 4 +- .../phoenix/end2end/CoalesceFunctionIT.java | 12 +- .../apache/phoenix/end2end/CreateTableIT.java | 2 +- .../end2end/IndexToolForPartialBuildIT.java | 4 +- .../phoenix/end2end/NthValueFunctionIT.java | 34 +++ .../end2end/SequenceBulkAllocationIT.java | 44 ++-- .../org/apache/phoenix/end2end/SequenceIT.java | 44 ++-- .../phoenix/end2end/SortMergeJoinMoreIT.java | 135 ++++++++++ .../phoenix/end2end/SpillableGroupByIT.java | 2 +- .../phoenix/end2end/StatsCollectorIT.java | 11 +- .../phoenix/end2end/StoreNullsPropIT.java | 2 +- .../end2end/SystemTablePermissionsIT.java | 263 +++++++++++++++++++ .../apache/phoenix/end2end/UpsertSelectIT.java | 18 +- .../apache/phoenix/end2end/index/IndexIT.java | 5 +- .../phoenix/end2end/index/IndexMetadataIT.java | 6 +- .../phoenix/end2end/index/IndexTestUtil.java | 2 +- .../phoenix/end2end/index/LocalIndexIT.java | 2 +- .../org/apache/phoenix/rpc/UpdateCacheIT.java | 2 +- .../phoenix/tx/ParameterizedTransactionIT.java | 8 +- .../apache/phoenix/compile/JoinCompiler.java | 6 +- .../phoenix/compile/SubselectRewriter.java | 137 +++++++++- .../coprocessor/MetaDataEndpointImpl.java | 213 +++++++-------- .../phoenix/coprocessor/MetaDataProtocol.java | 4 +- .../phoenix/exception/SQLExceptionCode.java | 1 + .../phoenix/execute/DelegateQueryPlan.java | 10 +- .../phoenix/execute/SortMergeJoinPlan.java | 8 + .../FirstLastValueServerAggregator.java | 2 - .../phoenix/jdbc/PhoenixDatabaseMetaData.java | 7 +- .../query/ConnectionQueryServicesImpl.java | 60 ++++- .../apache/phoenix/schema/MetaDataClient.java | 24 +- .../java/org/apache/phoenix/schema/PTable.java | 10 +- .../org/apache/phoenix/util/MetaDataUtil.java | 17 ++ .../org/apache/phoenix/util/UpgradeUtil.java | 75 +++++- .../phoenix/compile/QueryCompilerTest.java | 187 +++++++++++++ .../query/ConnectionQueryServicesImplTest.java | 73 +++++ pom.xml | 2 +- 38 files changed, 1205 insertions(+), 242 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3aecc3d3/phoenix-core/src/it/java/org/apache/phoenix/end2end/SequenceIT.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3aecc3d3/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateQueryPlan.java ---------------------------------------------------------------------- diff --cc phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateQueryPlan.java index 4300245,015b8f9..b46a173 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateQueryPlan.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateQueryPlan.java @@@ -132,13 -128,17 +128,17 @@@ public abstract class DelegateQueryPla return delegate.getOffset(); } - @Override - public ResultIterator iterator() throws SQLException { - return iterator(DefaultParallelScanGrouper.getInstance()); - } - - @Override - public ResultIterator iterator(ParallelScanGrouper scanGrouper) throws SQLException { - return iterator(scanGrouper, null); - } + @Override + public ResultIterator iterator() throws SQLException { + return iterator(DefaultParallelScanGrouper.getInstance()); + } - ++ + @Override + public ResultIterator iterator(ParallelScanGrouper scanGrouper) throws SQLException { + return iterator(scanGrouper, null); + } + + public QueryPlan getDelegate() { + return delegate; + } -} +} http://git-wip-us.apache.org/repos/asf/phoenix/blob/3aecc3d3/phoenix-core/src/main/java/org/apache/phoenix/execute/SortMergeJoinPlan.java ---------------------------------------------------------------------- diff --cc phoenix-core/src/main/java/org/apache/phoenix/execute/SortMergeJoinPlan.java index db6e41a,75bd11c..a6e027f --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/SortMergeJoinPlan.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/SortMergeJoinPlan.java @@@ -680,5 -671,12 +680,13 @@@ public class SortMergeJoinPlan implemen public Set<TableRef> getSourceRefs() { return tableRefs; } + + public QueryPlan getLhsPlan() { + return lhsPlan; + } + + public QueryPlan getRhsPlan() { + return rhsPlan; + } } + http://git-wip-us.apache.org/repos/asf/phoenix/blob/3aecc3d3/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3aecc3d3/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 95dfe12,248a244..5ec7d88 --- a/pom.xml +++ b/pom.xml @@@ -99,9 -99,8 +99,9 @@@ <jodatime.version>1.6</jodatime.version> <joni.version>2.1.2</joni.version> <avatica.version>1.9.0</avatica.version> + <calcite.version>1.13.0-SNAPSHOT</calcite.version> <jettyVersion>8.1.7.v20120910</jettyVersion> - <tephra.version>0.9.0-incubating</tephra.version> + <tephra.version>0.11.0-incubating</tephra.version> <spark.version>2.0.2</spark.version> <scala.version>2.11.8</scala.version> <scala.binary.version>2.11</scala.binary.version>