You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by vj...@apache.org on 2022/07/26 23:12:52 UTC
[phoenix] branch 5.1 updated: PHOENIX-6755 SystemCatalogRegionObserver extends BaseRegionObserver which doesn't exist in hbase-2.4 branch (#1472)
This is an automated email from the ASF dual-hosted git repository.
vjasani pushed a commit to branch 5.1
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/5.1 by this push:
new c4844580c4 PHOENIX-6755 SystemCatalogRegionObserver extends BaseRegionObserver which doesn't exist in hbase-2.4 branch (#1472)
c4844580c4 is described below
commit c4844580c41ec7da78c18487a2f7c03076694f0e
Author: Rushabh Shah <sh...@gmail.com>
AuthorDate: Tue Jul 26 16:11:08 2022 -0700
PHOENIX-6755 SystemCatalogRegionObserver extends BaseRegionObserver which doesn't exist in hbase-2.4 branch (#1472)
Signed-off-by: Istvan Toth <st...@apache.org>
Signed-off-by: Viraj Jasani <vj...@apache.org>
---
.../end2end/IndexToolForNonTxGlobalIndexIT.java | 10 ++++++++--
.../coprocessor/SystemCatalogRegionObserver.java | 21 +++++++++------------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexIT.java
index d6f2d08f92..bca3e6d5fc 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolForNonTxGlobalIndexIT.java
@@ -17,6 +17,8 @@
*/
package org.apache.phoenix.end2end;
+import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
+import org.apache.hadoop.hbase.coprocessor.RegionObserver;
import org.apache.phoenix.thirdparty.com.google.common.collect.Maps;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
@@ -36,7 +38,6 @@ import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.client.TableDescriptor;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
-import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.regionserver.RegionScanner;
@@ -86,6 +87,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.Properties;
import static org.apache.phoenix.mapreduce.PhoenixJobCounters.INPUT_RECORDS;
@@ -1573,12 +1575,16 @@ public class IndexToolForNonTxGlobalIndexIT extends BaseTest {
return output;
}
- public static class FastFailRegionObserver extends BaseRegionObserver {
+ public static class FastFailRegionObserver implements RegionObserver, RegionCoprocessor {
@Override
public RegionScanner postScannerOpen(final ObserverContext<RegionCoprocessorEnvironment> c,
final Scan scan,
final RegionScanner s) throws IOException {
throw new DoNotRetryIOException("I'm just a coproc that's designed to fail fast");
}
+ @Override
+ public Optional<RegionObserver> getRegionObserver() {
+ return Optional.of(this);
+ }
}
}
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SystemCatalogRegionObserver.java b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SystemCatalogRegionObserver.java
index 19ebe4ac9e..848e7ea851 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SystemCatalogRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SystemCatalogRegionObserver.java
@@ -17,31 +17,23 @@
*/
package org.apache.phoenix.coprocessor;
-import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.client.Scan;
-import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver;
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.regionserver.RegionScanner;
+import org.apache.hadoop.hbase.coprocessor.RegionObserver;
import org.apache.phoenix.filter.SystemCatalogViewIndexIdFilter;
import org.apache.phoenix.util.ScanUtil;
import java.io.IOException;
+import java.util.Optional;
import static org.apache.phoenix.util.ScanUtil.UNKNOWN_CLIENT_VERSION;
/**
* Coprocessor that checks whether the VIEW_INDEX_ID needs to retrieve.
*/
-public class SystemCatalogRegionObserver extends BaseRegionObserver {
- @Override public void start(CoprocessorEnvironment e) throws IOException {
- super.start(e);
- }
-
- @Override public void stop(CoprocessorEnvironment e) throws IOException {
- super.stop(e);
- }
-
+public class SystemCatalogRegionObserver implements RegionObserver, RegionCoprocessor {
@Override
public void preScannerOpen(ObserverContext<RegionCoprocessorEnvironment> e, Scan scan)
throws IOException {
@@ -55,4 +47,9 @@ public class SystemCatalogRegionObserver extends BaseRegionObserver {
ScanUtil.andFilterAtBeginning(scan, new SystemCatalogViewIndexIdFilter(clientVersion));
}
}
+
+ @Override
+ public Optional<RegionObserver> getRegionObserver() {
+ return Optional.of(this);
+ }
}
\ No newline at end of file