You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by je...@apache.org on 2014/03/05 23:55:03 UTC

[17/50] [abbrv] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/77c2a040
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/77c2a040
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/77c2a040

Branch: refs/heads/4.0
Commit: 77c2a040d3ade1d0162c575d8c7b7b21aa220ccf
Parents: 08cd658 1190a54
Author: maryannxue <ma...@apache.org>
Authored: Mon Mar 3 16:04:06 2014 -0500
Committer: maryannxue <ma...@apache.org>
Committed: Mon Mar 3 16:04:06 2014 -0500

----------------------------------------------------------------------
 .../phoenix/schema/MetaDataSplitPolicy.java     |  30 ++
 .../coprocessor/MetaDataEndpointImpl.java       |  17 +-
 .../apache/phoenix/index/IndexMaintainer.java   |   4 +-
 .../index/PhoenixIndexFailurePolicy.java        |   2 +-
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   2 +-
 .../query/ConnectionQueryServicesImpl.java      | 408 ++++++++++++++++++-
 .../apache/phoenix/query/QueryConstants.java    |  39 +-
 .../org/apache/phoenix/query/QueryServices.java |   1 +
 .../org/apache/phoenix/schema/PNameFactory.java |   9 +
 .../org/apache/phoenix/schema/PTableImpl.java   |   7 +-
 .../org/apache/phoenix/util/MetaDataUtil.java   |  29 +-
 .../java/org/apache/phoenix/util/QueryUtil.java |   2 +-
 .../org/apache/phoenix/util/SchemaUtil.java     |   7 +-
 .../apache/phoenix/util/MetaDataUtilTest.java   |  14 +-
 .../java/org/apache/phoenix/util/TestUtil.java  |   2 +-
 .../flume/serializer/BaseEventSerializer.java   |   3 +-
 16 files changed, 500 insertions(+), 76 deletions(-)
----------------------------------------------------------------------