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 2017/05/30 23:09:54 UTC
[2/2] phoenix git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/phoenix
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cd708bbf
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cd708bbf
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cd708bbf
Branch: refs/heads/master
Commit: cd708bbfa589771730ace12026d755aee58e1c9e
Parents: 6d7899c ecd287f
Author: James Taylor <ja...@apache.org>
Authored: Tue May 30 16:09:34 2017 -0700
Committer: James Taylor <ja...@apache.org>
Committed: Tue May 30 16:09:34 2017 -0700
----------------------------------------------------------------------
.../end2end/ExplainPlanWithStatsEnabledIT.java | 12 ++-
.../apache/phoenix/compile/JoinCompiler.java | 2 +-
.../compile/TupleProjectionCompiler.java | 4 +-
.../coprocessor/MetaDataEndpointImpl.java | 14 +--
.../coprocessor/generated/PTableProtos.java | 100 +++++++++----------
.../phoenix/iterate/BaseResultIterators.java | 10 +-
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 4 +-
.../query/ConnectionQueryServicesImpl.java | 2 +-
.../apache/phoenix/query/QueryConstants.java | 4 +-
.../phoenix/query/QueryServicesOptions.java | 6 +-
.../apache/phoenix/schema/DelegateTable.java | 4 +-
.../apache/phoenix/schema/MetaDataClient.java | 48 ++++-----
.../java/org/apache/phoenix/schema/PTable.java | 2 +-
.../org/apache/phoenix/schema/PTableImpl.java | 60 +++++------
.../apache/phoenix/schema/TableProperty.java | 6 +-
phoenix-protocol/src/main/PTable.proto | 2 +-
16 files changed, 141 insertions(+), 139 deletions(-)
----------------------------------------------------------------------