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 e74857b PHOENIX-6323 isRawFilterSupported() returns true for HBase
2.2 compat module
e74857b is described below
commit e74857b708a6395a83910eac00e15e7c0a55f720
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Jan 18 07:49:47 2021 +0100
PHOENIX-6323 isRawFilterSupported() returns true for HBase 2.2 compat module
---
phoenix-core/pom.xml | 4 ++--
.../org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java | 2 --
.../pom.xml | 8 ++++----
.../org/apache/phoenix/compat/hbase/CompatDelegateHTable.java | 0
.../apache/phoenix/compat/hbase/CompatOmidTransactionTable.java | 0
.../org/apache/phoenix/compat/hbase/CompatPermissionUtil.java | 0
.../apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java | 0
.../apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java | 0
.../org/apache/phoenix/compat/hbase/CompatStoreFileReader.java | 0
.../src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java | 0
.../org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java | 2 --
.../src/main/java/org/apache/phoenix/compat/hbase/OffsetCell.java | 0
.../compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java | 0
.../compat/hbase/coprocessor/CompatIndexRegionObserver.java | 0
.../java/org/apache/phoenix/compat/hbase/test/DelegateCell.java | 0
pom.xml | 8 ++++----
16 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 9fbbc8f..33a8013 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -64,9 +64,9 @@
("${hbase.compat.version}".equals("2.1.6")
&& hbaseMinor == 1
&& hbasePatch >=6)
- || ("${hbase.compat.version}".equals("2.2.1")
+ || ("${hbase.compat.version}".equals("2.2.5")
&& hbaseMinor == 2
- && hbasePatch >=1)
+ && hbasePatch >=5)
|| ("${hbase.compat.version}".equals("2.3.0")
&& hbaseMinor == 3
&& hbasePatch >=0)
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 6ec95d6..6931eb4 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/pom.xml
b/phoenix-hbase-compat-2.2.5/pom.xml
similarity index 93%
rename from phoenix-hbase-compat-2.2.1/pom.xml
rename to phoenix-hbase-compat-2.2.5/pom.xml
index b5bb8b6..7d07b14 100644
--- a/phoenix-hbase-compat-2.2.1/pom.xml
+++ b/phoenix-hbase-compat-2.2.5/pom.xml
@@ -26,12 +26,12 @@
<version>5.1.0-SNAPSHOT</version>
</parent>
- <artifactId>phoenix-hbase-compat-2.2.1</artifactId>
- <name>Phoenix Hbase 2.2.1 compatibility</name>
- <description>Compatibility module for HBase 2.2.1+</description>
+ <artifactId>phoenix-hbase-compat-2.2.5</artifactId>
+ <name>Phoenix Hbase 2.2.5 compatibility</name>
+ <description>Compatibility module for HBase 2.2.5+</description>
<properties>
- <hbase22.compat.version>2.2.1</hbase22.compat.version>
+ <hbase22.compat.version>2.2.5</hbase22.compat.version>
</properties>
<dependencies>
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPermissionUtil.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatPermissionUtil.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPermissionUtil.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatPermissionUtil.java
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatStoreFileReader.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatStoreFileReader.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatStoreFileReader.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatStoreFileReader.java
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java
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.5/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
similarity index 97%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
index 36713cf..620d4a7 100644
---
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
+++
b/phoenix-hbase-compat-2.2.5/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/OffsetCell.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/OffsetCell.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/OffsetCell.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/OffsetCell.java
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatBaseScannerRegionObserver.java
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/coprocessor/CompatIndexRegionObserver.java
diff --git
a/phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/test/DelegateCell.java
b/phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/test/DelegateCell.java
similarity index 100%
rename from
phoenix-hbase-compat-2.2.1/src/main/java/org/apache/phoenix/compat/hbase/test/DelegateCell.java
rename to
phoenix-hbase-compat-2.2.5/src/main/java/org/apache/phoenix/compat/hbase/test/DelegateCell.java
diff --git a/pom.xml b/pom.xml
index f450c41..8162838 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<modules>
<module>phoenix-hbase-compat-2.4.0</module>
<module>phoenix-hbase-compat-2.3.0</module>
- <module>phoenix-hbase-compat-2.2.1</module>
+ <module>phoenix-hbase-compat-2.2.5</module>
<module>phoenix-hbase-compat-2.1.6</module>
<module>phoenix-core</module>
<module>phoenix-pherf</module>
@@ -671,7 +671,7 @@
</dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-2.2.1</artifactId>
+ <artifactId>phoenix-hbase-compat-2.2.5</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -1549,7 +1549,7 @@
</profile>
<profile>
<!-- PHOENIX-5993 This won't work with the public HBase artifacts -->
- <id>phoenix-hbase-compat-2.2.1</id>
+ <id>phoenix-hbase-compat-2.2.5</id>
<activation>
<property>
<name>hbase.profile</name>
@@ -1558,7 +1558,7 @@
</activation>
<properties>
<hbase.profile>2.2</hbase.profile>
- <hbase.compat.version>2.2.1</hbase.compat.version>
+ <hbase.compat.version>2.2.5</hbase.compat.version>
<hbase.version>${hbase-2.2.runtime.version}</hbase.version>
</properties>
</profile>
