Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cd84de33 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cd84de33 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cd84de33 Branch: refs/heads/omid Commit: cd84de335e14b5298028138a8aca6f64ae09dbc5 Parents: 9f38170 37d0a4a Author: Ohad Shacham <[email protected]> Authored: Tue May 9 10:19:06 2017 +0300 Committer: Ohad Shacham <[email protected]> Committed: Tue May 9 10:19:06 2017 +0300 ---------------------------------------------------------------------- .../apache/phoenix/rpc/PhoenixServerRpcIT.java | 93 ++++-- .../apache/phoenix/compile/UpsertCompiler.java | 14 +- .../UngroupedAggregateRegionObserver.java | 14 +- .../hbase/index/covered/data/LocalTable.java | 22 +- .../covered/update/IndexUpdateManager.java | 12 +- .../index/covered/update/SortedCollection.java | 128 -------- .../org/apache/phoenix/query/QueryServices.java | 3 + .../phoenix/query/QueryServicesOptions.java | 4 +- .../org/apache/phoenix/util/ExpressionUtil.java | 14 + .../index/covered/TestNonTxIndexBuilder.java | 317 +++++++++++++++++++ .../index/covered/data/TestLocalTable.java | 63 ++++ 11 files changed, 506 insertions(+), 178 deletions(-) ----------------------------------------------------------------------
