You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by an...@apache.org on 2017/11/28 06:33:39 UTC

phoenix git commit: Fix IT related to group by aggregates

Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 a3d6c774a -> 487a7566d


Fix IT related to group by aggregates


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/487a7566
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/487a7566
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/487a7566

Branch: refs/heads/5.x-HBase-2.0
Commit: 487a7566d3677d67867ec5a0876a3f7a97743c2e
Parents: a3d6c77
Author: Ankit Singhal <an...@gmail.com>
Authored: Tue Nov 28 12:03:31 2017 +0530
Committer: Ankit Singhal <an...@gmail.com>
Committed: Tue Nov 28 12:03:31 2017 +0530

----------------------------------------------------------------------
 .../coprocessor/GroupedAggregateRegionObserver.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/487a7566/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java
index 7c4d06d..a14c5a2 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java
@@ -36,12 +36,15 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
+import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
 import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
+import org.apache.hadoop.hbase.coprocessor.RegionObserver;
 import org.apache.hadoop.hbase.regionserver.Region;
 import org.apache.hadoop.hbase.regionserver.RegionScanner;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -70,8 +73,8 @@ import org.apache.phoenix.schema.types.PInteger;
 import org.apache.phoenix.util.Closeables;
 import org.apache.phoenix.util.EncodedColumnsUtil;
 import org.apache.phoenix.util.IndexUtil;
-import org.apache.phoenix.util.PhoenixKeyValueUtil;
 import org.apache.phoenix.util.LogUtil;
+import org.apache.phoenix.util.PhoenixKeyValueUtil;
 import org.apache.phoenix.util.ScanUtil;
 import org.apache.phoenix.util.SizedUtil;
 import org.apache.phoenix.util.TupleUtil;
@@ -85,10 +88,16 @@ import com.google.common.collect.Maps;
  *
  * @since 0.1
  */
-public class GroupedAggregateRegionObserver extends BaseScannerRegionObserver {
+public class GroupedAggregateRegionObserver extends BaseScannerRegionObserver implements RegionCoprocessor {
     private static final Logger logger = LoggerFactory
             .getLogger(GroupedAggregateRegionObserver.class);
     public static final int MIN_DISTINCT_VALUES = 100;
+    
+    @Override
+    public Optional<RegionObserver> getRegionObserver() {
+      return Optional.of(this);
+    }
+
 
     /**
      * Replaces the RegionScanner s with a RegionScanner that groups by the key formed by the list