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:56:55 UTC

phoenix git commit: PHOENIX-4410 Fix IT related to group by aggregates(addendum)

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


PHOENIX-4410 Fix IT related to group by aggregates(addendum)


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 476e292005c1a184e7e4a850e2a30d23de09de56
Parents: 487a756
Author: Ankit Singhal <an...@gmail.com>
Authored: Tue Nov 28 12:26:48 2017 +0530
Committer: Ankit Singhal <an...@gmail.com>
Committed: Tue Nov 28 12:26:48 2017 +0530

----------------------------------------------------------------------
 .../apache/phoenix/coprocessor/ScanRegionObserver.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/476e2920/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/ScanRegionObserver.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/ScanRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/ScanRegionObserver.java
index b006ef6..a995f45 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/ScanRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/ScanRegionObserver.java
@@ -21,11 +21,13 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.List;
+import java.util.Optional;
 
 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.RegionScanner;
 import org.apache.hadoop.io.WritableUtils;
 import org.apache.phoenix.expression.OrderByExpression;
@@ -41,7 +43,12 @@ import org.apache.phoenix.iterate.NonAggregateRegionScannerFactory;
  *
  * @since 0.1
  */
-public class ScanRegionObserver extends BaseScannerRegionObserver {
+public class ScanRegionObserver extends BaseScannerRegionObserver implements RegionCoprocessor {
+    
+    @Override
+    public Optional<RegionObserver> getRegionObserver() {
+      return Optional.of(this);
+    }
 
     public static void serializeIntoScan(Scan scan, int thresholdBytes, int limit, List<OrderByExpression> orderByExpressions, int estimatedRowSize) {
         ByteArrayOutputStream stream = new ByteArrayOutputStream(); // TODO: size?