PHOENIX-6323 isRawFilterSupported() returns true for HBase 2.1 comapt…

… module
apache · Jan 20, 2021 · 2738f0e · 2738f0e
1 parent 772ff2c
commit 2738f0e
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 14 deletions.
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
@@ -64,9 +64,9 @@
                     ("${hbase.compat.version}".equals("2.1.6")
                       &amp;&amp; hbaseMinor == 1
                       &amp;&amp; hbasePatch &gt;=6)
-                    || ("${hbase.compat.version}".equals("2.2.1")
+                    || ("${hbase.compat.version}".equals("2.2.5")
                       &amp;&amp; hbaseMinor == 2
-                      &amp;&amp; hbasePatch &gt;=1)
+                      &amp;&amp; hbasePatch &gt;=5)
                     || ("${hbase.compat.version}".equals("2.3.0")
                       &amp;&amp; hbaseMinor == 3
                       &amp;&amp; hbasePatch &gt;=0)

diff --git a/...e-compat-2.1.6/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java b/...e-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 → phoenix-hbase-compat-2.2.5/pom.xml b/phoenix-hbase-compat-2.2.1/pom.xml → 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/...ix/compat/hbase/CompatDelegateHTable.java → ...ix/compat/hbase/CompatDelegateHTable.java b/...ix/compat/hbase/CompatDelegateHTable.java → ...ix/compat/hbase/CompatDelegateHTable.java
diff --git a/...pat/hbase/CompatOmidTransactionTable.java → ...pat/hbase/CompatOmidTransactionTable.java b/...pat/hbase/CompatOmidTransactionTable.java → ...pat/hbase/CompatOmidTransactionTable.java
diff --git a/...ix/compat/hbase/CompatPermissionUtil.java → ...ix/compat/hbase/CompatPermissionUtil.java b/...ix/compat/hbase/CompatPermissionUtil.java → ...ix/compat/hbase/CompatPermissionUtil.java
diff --git a/...mpat/hbase/CompatPhoenixRpcScheduler.java → ...mpat/hbase/CompatPhoenixRpcScheduler.java b/...mpat/hbase/CompatPhoenixRpcScheduler.java → ...mpat/hbase/CompatPhoenixRpcScheduler.java
diff --git a/...mpat/hbase/CompatSteppingSplitPolicy.java → ...mpat/hbase/CompatSteppingSplitPolicy.java b/...mpat/hbase/CompatSteppingSplitPolicy.java → ...mpat/hbase/CompatSteppingSplitPolicy.java
diff --git a/...x/compat/hbase/CompatStoreFileReader.java → ...x/compat/hbase/CompatStoreFileReader.java b/...x/compat/hbase/CompatStoreFileReader.java → ...x/compat/hbase/CompatStoreFileReader.java
diff --git a/...ache/phoenix/compat/hbase/CompatUtil.java → ...ache/phoenix/compat/hbase/CompatUtil.java b/...ache/phoenix/compat/hbase/CompatUtil.java → ...ache/phoenix/compat/hbase/CompatUtil.java
diff --git a/...compat/hbase/HbaseCompatCapabilities.java → ...compat/hbase/HbaseCompatCapabilities.java b/...compat/hbase/HbaseCompatCapabilities.java → ...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/...ache/phoenix/compat/hbase/OffsetCell.java → ...ache/phoenix/compat/hbase/OffsetCell.java b/...ache/phoenix/compat/hbase/OffsetCell.java → ...ache/phoenix/compat/hbase/OffsetCell.java
diff --git a/...ssor/CompatBaseScannerRegionObserver.java → ...ssor/CompatBaseScannerRegionObserver.java b/...ssor/CompatBaseScannerRegionObserver.java → ...ssor/CompatBaseScannerRegionObserver.java
diff --git a/...oprocessor/CompatIndexRegionObserver.java → ...oprocessor/CompatIndexRegionObserver.java b/...oprocessor/CompatIndexRegionObserver.java → ...oprocessor/CompatIndexRegionObserver.java
diff --git a/...oenix/compat/hbase/test/DelegateCell.java → ...oenix/compat/hbase/test/DelegateCell.java b/...oenix/compat/hbase/test/DelegateCell.java → ...oenix/compat/hbase/test/DelegateCell.java
diff --git 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>