You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2017/02/03 22:32:26 UTC

[3/3] phoenix git commit: Fix merge conflicts

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/229f4c70
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/229f4c70
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/229f4c70

Branch: refs/heads/calcite
Commit: 229f4c706d702bc48bc316290102cca12ca86f58
Parents: f6d836a 58ae666
Author: maryannxue <ma...@gmail.com>
Authored: Fri Feb 3 14:32:16 2017 -0800
Committer: maryannxue <ma...@gmail.com>
Committed: Fri Feb 3 14:32:16 2017 -0800

----------------------------------------------------------------------
 .../phoenix/end2end/ExecuteStatementsIT.java    |  4 +-
 .../phoenix/end2end/ParallelIteratorsIT.java    | 15 +--
 .../apache/phoenix/end2end/SkipScanQueryIT.java | 17 ++--
 .../end2end/index/IndexExpressionIT.java        | 36 +++-----
 .../apache/phoenix/end2end/index/IndexIT.java   |  9 +-
 .../phoenix/end2end/index/IndexMetadataIT.java  | 57 ++++--------
 .../phoenix/end2end/index/MutableIndexIT.java   |  5 +-
 .../phoenix/monitoring/PhoenixMetricsIT.java    | 56 ++++-------
 .../apache/phoenix/rpc/PhoenixServerRpcIT.java  |  6 ++
 .../apache/phoenix/compile/UpsertCompiler.java  | 38 ++++----
 .../UngroupedAggregateRegionObserver.java       | 97 ++++++++++++++++++--
 .../org/apache/phoenix/schema/PTableImpl.java   | 10 ++
 .../phoenix/compile/QueryCompilerTest.java      |  6 +-
 .../phoenix/compile/QueryMetaDataTest.java      | 11 ---
 .../jdbc/PhoenixPreparedStatementTest.java      | 24 -----
 .../java/org/apache/phoenix/query/BaseTest.java |  8 +-
 16 files changed, 198 insertions(+), 201 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/229f4c70/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------