Merge remote-tracking branch 'origin/master' into txn
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/eb4fedc4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/eb4fedc4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/eb4fedc4 Branch: refs/heads/txn Commit: eb4fedc4e84ef4b341b8fc4eecbb6b0965c9573d Parents: 3c0a56d 787cae5 Author: Thomas D'Silva <[email protected]> Authored: Thu Nov 19 16:30:00 2015 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Thu Nov 19 16:30:00 2015 -0800 ---------------------------------------------------------------------- .../hbase/regionserver/LocalIndexSplitter.java | 12 +++++-- .../phoenix/compile/ProjectionCompiler.java | 6 ++++ .../UngroupedAggregateRegionObserver.java | 31 ++++++++++++------ .../phoenix/exception/SQLExceptionCode.java | 1 + .../java/org/apache/phoenix/query/KeyRange.java | 34 ++++++++++++-------- .../phoenix/compile/QueryCompilerTest.java | 24 ++++++++++++-- 6 files changed, 80 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/eb4fedc4/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/eb4fedc4/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/eb4fedc4/phoenix-core/src/test/java/org/apache/phoenix/compile/QueryCompilerTest.java ----------------------------------------------------------------------
