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 2014/03/01 02:46:17 UTC
[3/3] 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/6cfd897c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/6cfd897c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/6cfd897c
Branch: refs/heads/master
Commit: 6cfd897c00de37df3dc409cb54bea2d2794bc506
Parents: 27e00ae 26dffde
Author: James Taylor <jt...@salesforce.com>
Authored: Fri Feb 28 17:45:59 2014 -0800
Committer: James Taylor <jt...@salesforce.com>
Committed: Fri Feb 28 17:45:59 2014 -0800
----------------------------------------------------------------------
KEYS | 73 ++++++++++++++++++++
.../apache/phoenix/cache/ServerCacheClient.java | 2 +
.../apache/phoenix/cache/TenantCacheImpl.java | 14 +++-
.../coprocessor/HashJoinRegionScanner.java | 8 ++-
.../apache/phoenix/execute/HashJoinPlan.java | 31 ++++++++-
.../phoenix/memory/GlobalMemoryManager.java | 2 +-
6 files changed, 120 insertions(+), 10 deletions(-)
----------------------------------------------------------------------