From cdee24d335916a7fb773218a10a681891bae65ad Mon Sep 17 00:00:00 2001 From: Istvan Toth Date: Mon, 18 Jan 2021 07:49:47 +0100 Subject: [PATCH] PHOENIX-6323 isRawFilterSupported() returns true for HBase 2.1 comapt module --- .../phoenix/compat/hbase/HbaseCompatCapabilities.java | 2 -- .../phoenix/compat/hbase/HbaseCompatCapabilities.java | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java index 6ec95d6ac49..6931eb4ed4d 100644 --- a/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java +++ b/phoenix-hbase-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java @@ -18,8 +18,6 @@ package org.apache.phoenix.compat.hbase; -import org.apache.hadoop.conf.Configuration; - public class HbaseCompatCapabilities { public static boolean isMaxLookbackTimeSupported() { diff --git a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java b/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java index 36713cf0386..8b40018a329 100644 --- a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java +++ b/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java @@ -18,8 +18,6 @@ package org.apache.phoenix.compat.hbase; -import org.apache.hadoop.conf.Configuration; - public class HbaseCompatCapabilities { public static boolean isMaxLookbackTimeSupported() { @@ -32,7 +30,9 @@ public static boolean isMaxLookbackTimeSupported() { //HBase 2.1 does not have HBASE-22710, which is necessary for raw scan skip scan and // AllVersionsIndexRebuild filters to // show all versions properly. HBase 2.2.5+ and HBase 2.3.0+ have this fix. - public static boolean isRawFilterSupported() { return true; } + // Since we support 2.2.1+, and this is of limited value without + // isLookbackBeyondDeletesSupported, we return false for all HBase 2.2.x versions + public static boolean isRawFilterSupported() { return false; } //HBase 2.3+ has preWALAppend() on RegionObserver (HBASE-22623) public static boolean hasPreWALAppend() { return false; }