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 2023/03/05 17:53:16 UTC
[phoenix] branch master updated: PHOENIX-6877 Remove HBase 2.3 support from 5.2
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 25af60b7c4 PHOENIX-6877 Remove HBase 2.3 support from 5.2
25af60b7c4 is described below
commit 25af60b7c4af969f8ea14a311a643d25a7ef48a9
Author: Istvan Toth <st...@apache.org>
AuthorDate: Fri Mar 3 20:43:44 2023 +0100
PHOENIX-6877 Remove HBase 2.3 support from 5.2
---
Jenkinsfile | 2 +-
phoenix-assembly/pom.xml | 5 ---
phoenix-core/pom.xml | 5 +--
.../schema/SplitOnLeadingVarCharColumnsPolicy.java | 4 +--
.../compat/hbase/CompatSteppingSplitPolicy.java | 29 -----------------
.../compat/hbase/CompatSteppingSplitPolicy.java | 24 --------------
.../compat/hbase/CompatSteppingSplitPolicy.java | 24 --------------
.../compat/hbase/CompatSteppingSplitPolicy.java | 24 --------------
pom.xml | 38 ++--------------------
9 files changed, 6 insertions(+), 149 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 2a6a393a43..ae343ecdd0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
axes {
axis {
name 'HBASE_PROFILE'
- values '2.3', '2.4', '2.5'
+ values '2.4', '2.5'
}
}
diff --git a/phoenix-assembly/pom.xml b/phoenix-assembly/pom.xml
index b23e2634b0..d9f3ac3b58 100644
--- a/phoenix-assembly/pom.xml
+++ b/phoenix-assembly/pom.xml
@@ -211,11 +211,6 @@
<artifactId>phoenix-tracing-webapp</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-2.3.0</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-hbase-compat-2.4.0</artifactId>
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 507629ac73..1299653f18 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -57,10 +57,7 @@
hbasePatch = Integer.parseInt(versionMatcher.group(3));
hbaseMajor == 2 && (
- ("${hbase.compat.version}".equals("2.3.0")
- && hbaseMinor == 3
- && hbasePatch >=0)
- || ("${hbase.compat.version}".equals("2.4.0")
+ ("${hbase.compat.version}".equals("2.4.0")
&& hbaseMinor == 4
&& hbasePatch == 0)
|| ("${hbase.compat.version}".equals("2.4.1")
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java
index 8eb22d73f3..80551f5fcd 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/SplitOnLeadingVarCharColumnsPolicy.java
@@ -17,10 +17,10 @@
*/
package org.apache.phoenix.schema;
-import org.apache.phoenix.compat.hbase.CompatSteppingSplitPolicy;
+import org.apache.hadoop.hbase.regionserver.SteppingSplitPolicy;
import org.apache.phoenix.util.SchemaUtil;
-public abstract class SplitOnLeadingVarCharColumnsPolicy extends CompatSteppingSplitPolicy {
+public abstract class SplitOnLeadingVarCharColumnsPolicy extends SteppingSplitPolicy {
abstract protected int getColumnToSplitAt();
protected final byte[] getSplitPoint(byte[] splitPoint) {
diff --git a/phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java b/phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
deleted file mode 100644
index 5f700b01f9..0000000000
--- a/phoenix-hbase-compat-2.3.0/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.phoenix.compat.hbase;
-
-import org.apache.hadoop.hbase.regionserver.SteppingSplitPolicy;
-
-public class CompatSteppingSplitPolicy extends SteppingSplitPolicy {
-
- protected boolean canSplit() {
- //dummy
- return false;
- }
-
-}
diff --git a/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java b/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
deleted file mode 100644
index f185153996..0000000000
--- a/phoenix-hbase-compat-2.4.0/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.phoenix.compat.hbase;
-
-import org.apache.hadoop.hbase.regionserver.SteppingSplitPolicy;
-
-public class CompatSteppingSplitPolicy extends SteppingSplitPolicy {
-
-}
diff --git a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
deleted file mode 100644
index f185153996..0000000000
--- a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.phoenix.compat.hbase;
-
-import org.apache.hadoop.hbase.regionserver.SteppingSplitPolicy;
-
-public class CompatSteppingSplitPolicy extends SteppingSplitPolicy {
-
-}
diff --git a/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java b/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
deleted file mode 100644
index f185153996..0000000000
--- a/phoenix-hbase-compat-2.5.0/src/main/java/org/apache/phoenix/compat/hbase/CompatSteppingSplitPolicy.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.phoenix.compat.hbase;
-
-import org.apache.hadoop.hbase.regionserver.SteppingSplitPolicy;
-
-public class CompatSteppingSplitPolicy extends SteppingSplitPolicy {
-
-}
diff --git a/pom.xml b/pom.xml
index 6fb4b29a66..454b0ded3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,6 @@
<module>phoenix-hbase-compat-2.5.0</module>
<module>phoenix-hbase-compat-2.4.1</module>
<module>phoenix-hbase-compat-2.4.0</module>
- <module>phoenix-hbase-compat-2.3.0</module>
<module>phoenix-core</module>
<module>phoenix-pherf</module>
<module>phoenix-tracing-webapp</module>
@@ -81,9 +80,8 @@
<hbase.suffix>hbase-${hbase.profile}</hbase.suffix>
<!-- This is used by the release script only -->
- <hbase.profile.list>2.3 2.4.0 2.4 2.5</hbase.profile.list>
+ <hbase.profile.list>2.4.0 2.4 2.5</hbase.profile.list>
<!-- The default hbase versions to build with (override with hbase.version) -->
- <hbase-2.3.runtime.version>2.3.7</hbase-2.3.runtime.version>
<hbase-2.4.0.runtime.version>2.4.0</hbase-2.4.0.runtime.version>
<hbase-2.4.runtime.version>2.4.16</hbase-2.4.runtime.version>
<hbase-2.5.runtime.version>2.5.3-hadoop3</hbase-2.5.runtime.version>
@@ -643,11 +641,6 @@
<artifactId>phoenix-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-client-embedded-hbase-2.3</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-embedded-hbase-2.4.0</artifactId>
@@ -663,11 +656,6 @@
<artifactId>phoenix-client-embedded-hbase-2.5</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-server-hbase-2.3</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-server-hbase-2.4.0</artifactId>
@@ -698,11 +686,6 @@
<artifactId>phoenix-shaded-guava</artifactId>
<version>${phoenix.thirdparty.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-2.3.0</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-hbase-compat-2.4.0</artifactId>
@@ -1572,23 +1555,6 @@
<hbase.thirdparty.version>3.4.1</hbase.thirdparty.version>
</properties>
</profile>
- <profile>
- <!-- PHOENIX-5993 This won't work with the public HBase artifacts -->
- <id>phoenix-hbase-compat-2.3.0</id>
- <activation>
- <property>
- <name>hbase.profile</name>
- <value>2.3</value>
- </property>
- </activation>
- <properties>
- <hbase.profile>2.3</hbase.profile>
- <hbase.compat.version>2.3.0</hbase.compat.version>
- <hbase.version>${hbase-2.3.runtime.version}</hbase.version>
- <hbase.thirdparty.version>3.3.0</hbase.thirdparty.version>
- <hadoop.version>3.1.3</hadoop.version>
- </properties>
- </profile>
<profile>
<!-- PHOENIX-5993 This won't work with the public HBase artifacts -->
<id>phoenix-hbase-compat-2.4.0</id>
@@ -1622,7 +1588,7 @@
</properties>
</profile>
<profile>
- <!-- PHOENIX-5993 This won't work with the public HBase artifacts -->
+ <!-- This WILL work with the public -hadoop3 artifacts -->
<id>phoenix-hbase-compat-2.5.0</id>
<activation>
<property>