You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by td...@apache.org on 2017/05/10 18:04:43 UTC
[44/46] phoenix git commit: Merge branch 'master' into
ConnectTALtoPhoenix
Merge branch 'master' into ConnectTALtoPhoenix
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c840cc98
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c840cc98
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c840cc98
Branch: refs/heads/omid
Commit: c840cc98fbf067551df4a3d78fa0c40d3629c820
Parents: 46e4b1a cd84de3
Author: Ohad Shacham <oh...@yahoo-inc.com>
Authored: Tue May 9 10:20:42 2017 +0300
Committer: Ohad Shacham <oh...@yahoo-inc.com>
Committed: Tue May 9 10:20:42 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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/c840cc98/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index ea18401,49ef884..79634e8
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@@ -110,9 -110,9 +110,10 @@@ import org.apache.phoenix.schema.types.
import org.apache.phoenix.schema.types.PDouble;
import org.apache.phoenix.schema.types.PFloat;
import org.apache.phoenix.schema.types.PLong;
+import org.apache.phoenix.transaction.PhoenixTransactionContext;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.EncodedColumnsUtil;
+ import org.apache.phoenix.util.ExpressionUtil;
import org.apache.phoenix.util.IndexUtil;
import org.apache.phoenix.util.KeyValueUtil;
import org.apache.phoenix.util.LogUtil;