You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2021/01/22 08:36:55 UTC
[phoenix] branch master updated: PHOENIX-6322 hasPreWALAppend()
returns false for HBase 2.3 and 2.4
This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/master by this push:
new 11b37e6 PHOENIX-6322 hasPreWALAppend() returns false for HBase 2.3 and 2.4
11b37e6 is described below
commit 11b37e6772ecd7caab0d36d4a2fa0f950d53e050
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Jan 18 07:37:45 2021 +0100
PHOENIX-6322 hasPreWALAppend() returns false for HBase 2.3 and 2.4
---
.../src/it/java/org/apache/phoenix/end2end/WALAnnotationIT.java | 9 ++++++++-
.../org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java | 2 +-
.../org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/WALAnnotationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/WALAnnotationIT.java
index edb3e72..8fcf83f 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/WALAnnotationIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/WALAnnotationIT.java
@@ -22,6 +22,7 @@ import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.RegionInfo;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
+import org.apache.hadoop.hbase.coprocessor.WALCoprocessor;
import org.apache.hadoop.hbase.coprocessor.WALCoprocessorEnvironment;
import org.apache.hadoop.hbase.coprocessor.WALObserver;
import org.apache.hadoop.hbase.regionserver.wal.WALCoprocessorHost;
@@ -64,6 +65,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.Optional;
import java.util.Properties;
import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.CHANGE_DETECTION_ENABLED;
@@ -520,7 +522,7 @@ public class WALAnnotationIT extends BaseUniqueNamesOwnClusterIT {
return DriverManager.getConnection(getUrl(), props);
}
- public static class AnnotatedWALObserver implements WALObserver {
+ public static class AnnotatedWALObserver implements WALCoprocessor, WALObserver {
Map<TableName, List<Map<String, byte[]>>> walAnnotations = new HashMap<>();
public Map<TableName, List<Map<String, byte[]>>> getWalAnnotations() {
@@ -548,5 +550,10 @@ public class WALAnnotationIT extends BaseUniqueNamesOwnClusterIT {
walAnnotations.get(logKey.getTableName()).add(annotationMap);
}
}
+
+ @Override
+ public Optional<WALObserver> getWALObserver() {
+ return Optional.of((WALObserver)this);
+ }
}
}
diff --git a/phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java b/phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
index 47b151a..2cb9cdf 100644
--- a/phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
+++ b/phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
@@ -34,6 +34,6 @@ public class HbaseCompatCapabilities {
public static boolean isRawFilterSupported() { return true; }
//HBase 2.3+ has preWALAppend() on RegionObserver (HBASE-22623)
- public static boolean hasPreWALAppend() { return false; }
+ public static boolean hasPreWALAppend() { return true; }
}
diff --git a/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java b/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
index 47b151a..2cb9cdf 100644
--- a/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
+++ b/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
@@ -34,6 +34,6 @@ public class HbaseCompatCapabilities {
public static boolean isRawFilterSupported() { return true; }
//HBase 2.3+ has preWALAppend() on RegionObserver (HBASE-22623)
- public static boolean hasPreWALAppend() { return false; }
+ public static boolean hasPreWALAppend() { return true; }
}