You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2018/06/12 04:48:54 UTC
[09/23] phoenix git commit: Merge commit
'2015345a023f0adb59174443ec1328bb1399f11b' into 4.x-HBase-1.3-Omid-2
Merge commit '2015345a023f0adb59174443ec1328bb1399f11b' into 4.x-HBase-1.3-Omid-2
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/dc6de3ab
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/dc6de3ab
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/dc6de3ab
Branch: refs/heads/omid2
Commit: dc6de3ab12ad18e9dc5622521bfaf5a662e4d409
Parents: 7c83499 2015345
Author: Ohad Shacham <oh...@yahoo-inc.com>
Authored: Tue May 22 21:32:35 2018 +0300
Committer: Ohad Shacham <oh...@yahoo-inc.com>
Committed: Tue May 22 21:32:35 2018 +0300
----------------------------------------------------------------------
bin/hbase-site.xml | 4 +
.../org/apache/phoenix/end2end/BaseViewIT.java | 7 +-
.../end2end/ColumnEncodedBytesPropIT.java | 60 ++++++++
.../apache/phoenix/end2end/QueryLoggerIT.java | 76 ++++++----
.../phoenix/end2end/QueryWithLimitIT.java | 4 +-
.../phoenix/end2end/RowValueConstructorIT.java | 120 ++++++++++++++++
.../apache/phoenix/end2end/UpsertSelectIT.java | 19 +++
.../java/org/apache/phoenix/end2end/ViewIT.java | 2 +-
.../phoenix/monitoring/PhoenixMetricsIT.java | 27 ++--
.../phoenix/schema/stats/StatsCollectorIT.java | 3 +-
.../org/apache/phoenix/compile/ScanRanges.java | 5 +
.../phoenix/compile/StatementContext.java | 13 +-
.../apache/phoenix/compile/UpsertCompiler.java | 1 +
.../coprocessor/MetaDataEndpointImpl.java | 9 +-
.../apache/phoenix/execute/MutationState.java | 4 +-
.../phoenix/iterate/ChunkedResultIterator.java | 2 +-
.../phoenix/iterate/ParallelIterators.java | 3 +-
.../apache/phoenix/iterate/SerialIterators.java | 3 +-
.../phoenix/iterate/TableResultIterator.java | 69 +++++----
.../apache/phoenix/jdbc/PhoenixConnection.java | 10 +-
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 1 +
.../apache/phoenix/jdbc/PhoenixResultSet.java | 54 ++++---
.../apache/phoenix/jdbc/PhoenixStatement.java | 21 ++-
.../java/org/apache/phoenix/log/LogLevel.java | 2 +-
.../java/org/apache/phoenix/log/LogWriter.java | 6 +-
.../org/apache/phoenix/log/QueryLogInfo.java | 38 +++--
.../org/apache/phoenix/log/QueryLogState.java | 22 ---
.../org/apache/phoenix/log/QueryLogger.java | 74 +++++++---
.../org/apache/phoenix/log/QueryLoggerUtil.java | 54 ++++---
.../org/apache/phoenix/log/QueryStatus.java | 22 +++
.../org/apache/phoenix/log/RingBufferEvent.java | 38 +++--
.../phoenix/log/RingBufferEventTranslator.java | 21 ++-
.../org/apache/phoenix/log/TableLogWriter.java | 144 +++++++++++--------
.../phoenix/mapreduce/PhoenixRecordReader.java | 13 +-
.../phoenix/mapreduce/index/IndexTool.java | 6 +-
.../index/automation/PhoenixAsyncIndex.java | 2 +-
.../index/automation/PhoenixMRJobSubmitter.java | 50 ++++++-
.../phoenix/monitoring/CombinableMetric.java | 9 ++
.../monitoring/CombinableMetricImpl.java | 14 +-
.../phoenix/monitoring/MemoryMetricsHolder.java | 1 -
.../apache/phoenix/monitoring/MetricType.java | 123 ++++++++++------
.../apache/phoenix/monitoring/MetricUtil.java | 30 ++++
.../phoenix/monitoring/MutationMetricQueue.java | 4 +-
.../phoenix/monitoring/OverAllQueryMetrics.java | 21 ++-
.../phoenix/monitoring/ReadMetricQueue.java | 35 +++--
.../phoenix/monitoring/ScanMetricsHolder.java | 9 +-
.../monitoring/SpoolingMetricsHolder.java | 3 +-
.../monitoring/TaskExecutionMetricsHolder.java | 4 +-
.../query/ConnectionQueryServicesImpl.java | 7 +-
.../query/ConnectionlessQueryServicesImpl.java | 7 +-
.../apache/phoenix/query/QueryConstants.java | 124 ++--------------
.../org/apache/phoenix/query/QueryServices.java | 1 +
.../phoenix/query/QueryServicesOptions.java | 1 +
.../apache/phoenix/schema/MetaDataClient.java | 30 +++-
.../apache/phoenix/schema/types/PVarchar.java | 10 +-
.../org/apache/phoenix/util/MetaDataUtil.java | 18 +--
.../apache/phoenix/util/PhoenixMRJobUtil.java | 18 +--
.../java/org/apache/phoenix/util/QueryUtil.java | 7 +-
.../org/apache/phoenix/util/SchemaUtil.java | 6 +-
.../org/apache/phoenix/util/ServerUtil.java | 32 +++--
.../org/apache/phoenix/util/UpgradeUtil.java | 2 +-
.../index/automated/MRJobSubmitterTest.java | 30 +++-
.../iterate/SpoolingResultIteratorTest.java | 7 +-
.../java/org/apache/phoenix/query/BaseTest.java | 13 +-
.../hive/mapreduce/PhoenixRecordReader.java | 3 +-
65 files changed, 1004 insertions(+), 574 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/dc6de3ab/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/dc6de3ab/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/dc6de3ab/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
----------------------------------------------------------------------