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/06fd5812 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/06fd5812 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/06fd5812 Branch: refs/heads/calcite Commit: 06fd581296bc58390ebf7f8e738af19a6634a66e Parents: 87e8f29 29ca38b Author: maryannxue <maryann....@gmail.com> Authored: Thu Feb 25 15:23:38 2016 -0500 Committer: maryannxue <maryann....@gmail.com> Committed: Thu Feb 25 15:23:38 2016 -0500 ---------------------------------------------------------------------- phoenix-assembly/src/build/server.xml | 1 + .../org/apache/phoenix/end2end/IndexToolIT.java | 3 +- .../phoenix/end2end/MutableIndexToolIT.java | 1 + .../end2end/StatsCollectionDisabledIT.java | 21 ++- .../phoenix/end2end/StatsCollectorIT.java | 57 +++++++- .../phoenix/coprocessor/MetaDataProtocol.java | 2 +- .../UngroupedAggregateRegionObserver.java | 4 +- .../apache/phoenix/execute/AggregatePlan.java | 6 +- .../apache/phoenix/execute/BaseQueryPlan.java | 11 ++ .../org/apache/phoenix/execute/ScanPlan.java | 7 +- .../phoenix/iterate/BaseResultIterators.java | 140 +++++++++++-------- .../query/ConnectionQueryServicesImpl.java | 86 ++++++++++-- .../apache/phoenix/query/QueryConstants.java | 2 +- .../org/apache/phoenix/query/QueryServices.java | 1 + .../phoenix/query/QueryServicesOptions.java | 7 + .../stats/DefaultStatisticsCollector.java | 33 ++--- .../phoenix/schema/stats/GuidePostsInfo.java | 2 +- .../schema/stats/GuidePostsInfoBuilder.java | 6 - .../phoenix/schema/stats/PTableStatsImpl.java | 5 +- .../stats/StatisticsCollectorFactory.java | 17 ++- .../phoenix/schema/stats/StatisticsUtil.java | 23 +-- .../phoenix/schema/stats/StatisticsWriter.java | 60 ++++---- .../apache/phoenix/util/PrefixByteCodec.java | 37 ++--- .../phoenix/query/QueryServicesTestImpl.java | 2 + 24 files changed, 360 insertions(+), 174 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/06fd5812/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/06fd5812/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/06fd5812/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsUtil.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/06fd5812/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java ----------------------------------------------------------------------
