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 AFF3517C95 for ; Sat, 1 Nov 2014 19:00:23 +0000 (UTC) Received: (qmail 77562 invoked by uid 500); 1 Nov 2014 19:00:23 -0000 Delivered-To: apmail-phoenix-commits-archive@phoenix.apache.org Received: (qmail 77457 invoked by uid 500); 1 Nov 2014 19:00:23 -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 77335 invoked by uid 99); 1 Nov 2014 19:00:23 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Nov 2014 19:00:23 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3047A816391; Sat, 1 Nov 2014 19:00:23 +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: Sat, 01 Nov 2014 19:00:26 -0000 Message-Id: <8263e2a0f5c1474b9dfc2e51390599ba@git.apache.org> In-Reply-To: <5789b4ac9a49452f98c9debc9571e19a@git.apache.org> References: <5789b4ac9a49452f98c9debc9571e19a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] git commit: Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0 Merge branch '4.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.0 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e1377116 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e1377116 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e1377116 Branch: refs/heads/4.0 Commit: e13771165b9cf445a932e83d955055be24edcc5d Parents: 301f87e 77f2405 Author: maryannxue Authored: Sat Nov 1 14:49:43 2014 -0400 Committer: maryannxue Committed: Sat Nov 1 14:49:43 2014 -0400 ---------------------------------------------------------------------- CHANGES | 14 + bin/phoenix_utils.py | 2 +- bin/psql.py | 8 +- phoenix-assembly/pom.xml | 10 +- phoenix-core/pom.xml | 23 +- .../apache/phoenix/end2end/AlterTableIT.java | 22 +- .../end2end/BaseClientManagedTimeIT.java | 15 +- .../org/apache/phoenix/end2end/BaseQueryIT.java | 3 +- .../end2end/ClientTimeArithmeticQueryIT.java | 43 +++ .../phoenix/end2end/InMemoryOrderByIT.java | 4 +- .../org/apache/phoenix/end2end/QueryIT.java | 44 ++- .../apache/phoenix/end2end/ReverseScanIT.java | 2 +- .../org/apache/phoenix/end2end/SequenceIT.java | 7 +- .../end2end/SkipScanAfterManualSplitIT.java | 2 +- .../phoenix/end2end/SpooledOrderByIT.java | 4 +- .../phoenix/end2end/StatsCollectorIT.java | 55 ++- .../end2end/TenantSpecificTablesDDLIT.java | 23 +- .../apache/phoenix/end2end/UpsertSelectIT.java | 4 +- .../phoenix/end2end/index/LocalIndexIT.java | 176 +++++++++- .../phoenix/end2end/index/MutableIndexIT.java | 15 +- .../apache/phoenix/trace/BaseTracingTestIT.java | 100 +++--- .../phoenix/trace/DisableableMetricsWriter.java | 27 +- .../trace/Hadoop1TracingTestEnabler.java | 84 ----- .../apache/phoenix/trace/PhoenixMetricImpl.java | 44 --- .../phoenix/trace/PhoenixMetricRecordImpl.java | 71 ---- .../trace/PhoenixTableMetricsWriterIT.java | 28 +- .../apache/phoenix/trace/PhoenixTagImpl.java | 29 +- .../phoenix/trace/PhoenixTraceReaderIT.java | 61 ++-- .../phoenix/trace/PhoenixTracingEndToEndIT.java | 59 ++-- .../apache/phoenix/trace/TracingTestUtil.java | 31 ++ .../IndexHalfStoreFileReaderGenerator.java | 63 ++++ .../hbase/regionserver/LocalIndexSplitter.java | 40 +++ .../phoenix/compile/ExpressionCompiler.java | 2 +- .../phoenix/compile/ProjectionCompiler.java | 50 ++- .../coprocessor/MetaDataEndpointImpl.java | 43 +-- .../phoenix/coprocessor/MetaDataProtocol.java | 2 +- .../UngroupedAggregateRegionObserver.java | 21 +- .../coprocessor/generated/MetaDataProtos.java | 351 +++++++++---------- .../coprocessor/generated/PTableProtos.java | 103 +++++- .../apache/phoenix/execute/BaseQueryPlan.java | 6 + .../phoenix/filter/BooleanExpressionFilter.java | 6 + .../org/apache/phoenix/hbase/index/Indexer.java | 4 +- .../hbase/index/wal/IndexedKeyValue.java | 46 ++- .../TrackingParallelWriterIndexCommitter.java | 2 +- .../apache/phoenix/iterate/ExplainTable.java | 17 +- .../phoenix/iterate/ParallelIterators.java | 2 +- .../apache/phoenix/jdbc/PhoenixConnection.java | 8 +- .../phoenix/jdbc/PhoenixDatabaseMetaData.java | 55 ++- .../apache/phoenix/jdbc/PhoenixResultSet.java | 5 - .../org/apache/phoenix/metrics/MetricInfo.java | 51 +++ .../org/apache/phoenix/metrics/Metrics.java | 66 ++++ .../java/org/apache/phoenix/parse/HintNode.java | 9 +- .../phoenix/query/ConnectionQueryServices.java | 2 +- .../query/ConnectionQueryServicesImpl.java | 20 +- .../query/ConnectionlessQueryServicesImpl.java | 8 +- .../query/DelegateConnectionQueryServices.java | 10 +- .../apache/phoenix/query/MetaDataMutated.java | 2 +- .../org/apache/phoenix/query/QueryServices.java | 1 + .../phoenix/query/QueryServicesOptions.java | 5 +- .../apache/phoenix/schema/MetaDataClient.java | 12 +- .../apache/phoenix/schema/PMetaDataImpl.java | 53 +-- .../org/apache/phoenix/schema/PTableImpl.java | 5 +- .../phoenix/schema/stats/PTableStats.java | 7 + .../phoenix/schema/stats/PTableStatsImpl.java | 12 +- .../schema/stats/StatisticsCollector.java | 79 +++-- .../phoenix/schema/stats/StatisticsScanner.java | 1 - .../phoenix/schema/stats/StatisticsUtil.java | 6 +- .../phoenix/schema/stats/StatisticsWriter.java | 39 ++- .../phoenix/schema/tuple/ResultTuple.java | 2 +- .../apache/phoenix/trace/MetricsInfoImpl.java | 63 ++++ .../phoenix/trace/PhoenixMetricsSink.java | 298 ++++++++++++++++ .../trace/PhoenixTableMetricsWriter.java | 278 --------------- .../apache/phoenix/trace/TraceMetricSource.java | 188 ++++++++++ .../org/apache/phoenix/trace/TraceReader.java | 12 +- .../org/apache/phoenix/trace/TracingUtils.java | 58 +++ .../org/apache/phoenix/trace/util/Tracing.java | 5 +- .../metrics2/impl/ExposedMetricCounterLong.java | 36 ++ .../metrics2/impl/ExposedMetricsRecordImpl.java | 42 +++ .../metrics2/lib/ExposedMetricsInfoImpl.java | 34 ++ .../org/apache/phoenix/metrics/LoggingSink.java | 60 ++++ .../query/BaseConnectionlessQueryTest.java | 2 + .../java/org/apache/phoenix/query/BaseTest.java | 1 + .../org/apache/phoenix/query/QueryPlanTest.java | 8 + .../phoenix/trace/TraceMetricsSourceTest.java | 96 +++++ phoenix-hadoop-compat/pom.xml | 89 ----- .../org/apache/phoenix/metrics/MetricInfo.java | 51 --- .../org/apache/phoenix/metrics/Metrics.java | 80 ----- .../apache/phoenix/metrics/MetricsManager.java | 58 --- .../apache/phoenix/metrics/MetricsWriter.java | 31 -- .../phoenix/metrics/PhoenixAbstractMetric.java | 30 -- .../phoenix/metrics/PhoenixMetricTag.java | 27 -- .../phoenix/metrics/PhoenixMetricsRecord.java | 35 -- .../phoenix/trace/PhoenixSpanReceiver.java | 26 -- .../phoenix/trace/TestableMetricsWriter.java | 30 -- .../org/apache/phoenix/trace/TracingCompat.java | 89 ----- .../org/apache/phoenix/metrics/LoggingSink.java | 56 --- .../phoenix/metrics/TracingTestCompat.java | 45 --- phoenix-hadoop2-compat/pom.xml | 77 ---- .../phoenix/metrics/MetricsManagerImpl.java | 71 ---- .../apache/phoenix/trace/MetricsInfoImpl.java | 63 ---- .../phoenix/trace/PhoenixMetricsSink.java | 191 ---------- .../apache/phoenix/trace/TraceMetricSource.java | 197 ----------- .../org.apache.phoenix.metrics.MetricsManager | 1 - ...org.apache.phoenix.trace.PhoenixSpanReceiver | 1 - ...g.apache.phoenix.trace.TestableMetricsWriter | 1 - .../metrics2/impl/ExposedMetricCounterLong.java | 35 -- .../metrics2/impl/ExposedMetricsRecordImpl.java | 43 --- .../metrics2/lib/ExposedMetricsInfoImpl.java | 32 -- .../phoenix/trace/PhoenixMetricsWriterTest.java | 142 -------- .../phoenix/trace/TraceMetricsSourceTest.java | 96 ----- .../org/apache/phoenix/trace/TracingTest.java | 34 -- phoenix-protocol/src/main/MetaDataService.proto | 8 +- phoenix-protocol/src/main/PTable.proto | 1 + pom.xml | 27 -- 114 files changed, 2278 insertions(+), 2796 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e1377116/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java ---------------------------------------------------------------------- diff --cc phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java index d915948,aba35fe..5131bbc --- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java @@@ -71,7 -70,9 +71,8 @@@ import org.apache.phoenix.index.IndexMa import org.apache.phoenix.index.PhoenixIndexCodec; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; import org.apache.phoenix.join.HashJoinInfo; -import org.apache.phoenix.join.TupleProjector; import org.apache.phoenix.query.QueryConstants; + import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.schema.ConstraintViolationException; import org.apache.phoenix.schema.PColumn;