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 2016/05/06 00:25:05 UTC
[3/3] phoenix git commit: Merge branch '4.x-HBase-1.0' of
https://git-wip-us.apache.org/repos/asf/phoenix into 4.x-HBase-1.0
Merge branch '4.x-HBase-1.0' of https://git-wip-us.apache.org/repos/asf/phoenix into 4.x-HBase-1.0
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4900b0b3
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4900b0b3
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4900b0b3
Branch: refs/heads/4.x-HBase-1.0
Commit: 4900b0b3c929396fcf082387a35e67b803ade2ff
Parents: 174fefd 01cc2a0
Author: James Taylor <ja...@apache.org>
Authored: Thu May 5 17:24:32 2016 -0700
Committer: James Taylor <ja...@apache.org>
Committed: Thu May 5 17:24:32 2016 -0700
----------------------------------------------------------------------
.gitignore | 1 +
examples/STOCK_SYMBOL.sql | 1 -
examples/WEB_STAT_QUERIES.sql | 1 -
.../org/apache/phoenix/end2end/ArrayIT.java | 55 ++++++++-
.../end2end/BaseClientManagedTimeIT.java | 2 +-
.../phoenix/end2end/BaseHBaseManagedTimeIT.java | 2 +-
.../BaseHBaseManagedTimeTableReuseIT.java | 44 +++-----
.../BaseOwnClusterClientManagedTimeIT.java | 2 +-
.../BaseOwnClusterHBaseManagedTimeIT.java | 2 +-
.../apache/phoenix/end2end/CreateSchemaIT.java | 2 +-
.../org/apache/phoenix/end2end/DateTimeIT.java | 39 +++++++
.../apache/phoenix/end2end/DistinctCountIT.java | 76 ++++++-------
.../apache/phoenix/end2end/DropSchemaIT.java | 21 +++-
.../apache/phoenix/end2end/DynamicColumnIT.java | 112 +++++++++----------
.../apache/phoenix/end2end/DynamicUpsertIT.java | 11 +-
.../phoenix/end2end/InMemoryOrderByIT.java | 6 +-
.../org/apache/phoenix/end2end/OrderByIT.java | 11 +-
.../apache/phoenix/end2end/PercentileIT.java | 76 +++----------
.../phoenix/end2end/SpooledOrderByIT.java | 4 +-
.../phoenix/end2end/ToCharFunctionIT.java | 28 ++---
.../apache/phoenix/end2end/UpsertValuesIT.java | 1 +
.../phoenix/compile/StatementContext.java | 5 +-
.../phoenix/coprocessor/MetaDataProtocol.java | 2 +-
.../query/ConnectionQueryServicesImpl.java | 6 +-
.../java/org/apache/phoenix/util/DateUtil.java | 16 ++-
.../java/org/apache/phoenix/query/BaseTest.java | 84 +++++++++++++-
.../org/apache/phoenix/util/DateUtilTest.java | 25 +++++
.../phoenix/end2end/QueryServerBasicsIT.java | 41 ++++---
28 files changed, 424 insertions(+), 252 deletions(-)
----------------------------------------------------------------------