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 44892c166f PHOENIX-7606 Remove HBase 2.4 support from master branch
(#2249)
44892c166f is described below
commit 44892c166fed8c73d878afa4498693b6dcbeb891
Author: Istvan Toth <[email protected]>
AuthorDate: Tue Jul 29 05:57:53 2025 +0200
PHOENIX-7606 Remove HBase 2.4 support from master branch (#2249)
---
Jenkinsfile | 2 +-
phoenix-hbase-compat-2.4.1/pom.xml | 110 ---------------
.../apache/phoenix/compat/hbase/ByteStringer.java | 32 -----
.../phoenix/compat/hbase/CompatDelegateFilter.java | 37 ------
.../phoenix/compat/hbase/CompatDelegateHTable.java | 147 ---------------------
.../hbase/CompatIndexHalfStoreFileReader.java | 38 ------
.../compat/hbase/CompatIndexedHLogReader.java | 31 -----
.../hbase/CompatLocalIndexStoreFileScanner.java | 31 -----
.../compat/hbase/CompatOmidTransactionTable.java | 57 --------
.../phoenix/compat/hbase/CompatPagingFilter.java | 40 ------
.../compat/hbase/CompatPhoenixRpcScheduler.java | 37 ------
.../apache/phoenix/compat/hbase/CompatUtil.java | 79 -----------
.../compat/hbase/HbaseCompatCapabilities.java | 23 ----
.../hbase/ReplicationSinkCompatEndpoint.java | 61 ---------
.../apache/phoenix/compat/hbase/package-info.java | 23 ----
pom.xml | 45 +------
16 files changed, 2 insertions(+), 791 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c03afad1a1..46a0628388 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -39,7 +39,7 @@ pipeline {
axes {
axis {
name 'HBASE_PROFILE'
- values '2.4', '2.5', '2.6'
+ values '2.5', '2.6'
}
}
diff --git a/phoenix-hbase-compat-2.4.1/pom.xml
b/phoenix-hbase-compat-2.4.1/pom.xml
deleted file mode 100644
index fdf5899a25..0000000000
--- a/phoenix-hbase-compat-2.4.1/pom.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix</artifactId>
- <version>5.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>phoenix-hbase-compat-2.4.1</artifactId>
- <name>Phoenix Hbase 2.4.1 compatibility</name>
- <description>Compatibility module for HBase 2.4.1+</description>
-
- <properties>
- <hbase24.compat.version>2.4.16</hbase24.compat.version>
- </properties>
-
- <dependencies>
- <!-- HBase dependencies -->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>${hbase24.compat.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <version>${hbase24.compat.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <version>${hbase24.compat.version}</version>
- <scope>provided</scope>
- </dependency>
- <!-- Override parent dependencyManagement for transitive HBase
dependencies -->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop-compat</artifactId>
- <version>${hbase24.compat.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-hadoop2-compat</artifactId>
- <version>${hbase24.compat.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-protocol</artifactId>
- <version>${hbase24.compat.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-protocol-shaded</artifactId>
- <version>${hbase24.compat.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-zookeeper</artifactId>
- <version>${hbase24.compat.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-metrics</artifactId>
- <version>${hbase24.compat.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-metrics-api</artifactId>
- <version>${hbase24.compat.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/ByteStringer.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/ByteStringer.java
deleted file mode 100644
index e8c3f2fff8..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/ByteStringer.java
+++ /dev/null
@@ -1,32 +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 com.google.protobuf.ByteString;
-
-// This has different signature in the HBase 2 and 3 modules
-// This only comes together after the maven-replacer plugin relocates all
protobuf code.
-public class ByteStringer {
-
- private ByteStringer() {
- }
-
- public static ByteString wrap(final byte[] array) {
- return org.apache.hadoop.hbase.util.ByteStringer.wrap(array);
- }
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateFilter.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateFilter.java
deleted file mode 100644
index c1fb96f4f0..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateFilter.java
+++ /dev/null
@@ -1,37 +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 java.io.IOException;
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.filter.Filter;
-import org.apache.hadoop.hbase.filter.FilterBase;
-
-public class CompatDelegateFilter extends FilterBase {
- protected Filter delegate = null;
-
- public CompatDelegateFilter(Filter delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public ReturnCode filterKeyValue(Cell v) throws IOException {
- return delegate.filterKeyValue(v);
- }
-
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
deleted file mode 100644
index c94656288d..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatDelegateHTable.java
+++ /dev/null
@@ -1,147 +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 java.io.IOException;
-import java.util.List;
-import org.apache.hadoop.hbase.CompareOperator;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.RowMutations;
-import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
-
-public abstract class CompatDelegateHTable implements Table {
-
- protected final Table delegate;
-
- public CompatDelegateHTable(Table delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public Result mutateRow(RowMutations rm) throws IOException {
- return delegate.mutateRow(rm);
- }
-
- @Override
- public HTableDescriptor getTableDescriptor() throws IOException {
- return delegate.getTableDescriptor();
- }
-
- @Override
- public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier,
CompareOp compareOp,
- byte[] value, Put put) throws IOException {
- return delegate.checkAndPut(row, family, qualifier, compareOp, value, put);
- }
-
- @Override
- public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier,
CompareOp compareOp,
- byte[] value, Delete delete) throws IOException {
- return delegate.checkAndDelete(row, family, qualifier, compareOp, value,
delete);
- }
-
- @Override
- public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier,
CompareOp compareOp,
- byte[] value, RowMutations mutation) throws IOException {
- return delegate.checkAndMutate(row, family, qualifier, compareOp, value,
mutation);
- }
-
- @Override
- public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier,
byte[] value, Put put)
- throws IOException {
- return delegate.checkAndPut(row, family, qualifier, value, put);
- }
-
- @Override
- public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier,
byte[] value,
- Delete delete) throws IOException {
- return delegate.checkAndDelete(row, family, qualifier, value, delete);
- }
-
- @Override
- public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier,
CompareOperator op,
- byte[] value, Put put) throws IOException {
- return delegate.checkAndPut(row, family, qualifier, op, value, put);
- }
-
- @Override
- public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier,
CompareOperator op,
- byte[] value, Delete delete) throws IOException {
- return delegate.checkAndDelete(row, family, qualifier, op, value, delete);
- }
-
- @Override
- public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier,
CompareOperator op,
- byte[] value, RowMutations mutation) throws IOException {
- return delegate.checkAndMutate(row, family, qualifier, op, value,
mutation);
- }
-
- @Override
- public CheckAndMutateBuilder checkAndMutate(byte[] row, byte[] family) {
- return delegate.checkAndMutate(row, family);
- }
-
- @Override
- public void setOperationTimeout(int operationTimeout) {
- delegate.setOperationTimeout(operationTimeout);
- }
-
- @Override
- public int getOperationTimeout() {
- return delegate.getOperationTimeout();
- }
-
- @Override
- public int getRpcTimeout() {
- return delegate.getRpcTimeout();
- }
-
- @Override
- public void setRpcTimeout(int rpcTimeout) {
- delegate.setRpcTimeout(rpcTimeout);
- }
-
- @Override
- public int getReadRpcTimeout() {
- return delegate.getReadRpcTimeout();
- }
-
- @Override
- public void setReadRpcTimeout(int readRpcTimeout) {
- delegate.setReadRpcTimeout(readRpcTimeout);
- }
-
- @Override
- public int getWriteRpcTimeout() {
- return delegate.getWriteRpcTimeout();
- }
-
- @Override
- public void setWriteRpcTimeout(int writeRpcTimeout) {
- delegate.setWriteRpcTimeout(writeRpcTimeout);
- }
-
- @Override
- public boolean[] existsAll(List<Get> gets) throws IOException {
- return delegate.existsAll(gets);
- }
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatIndexHalfStoreFileReader.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatIndexHalfStoreFileReader.java
deleted file mode 100644
index 58225bdd7a..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatIndexHalfStoreFileReader.java
+++ /dev/null
@@ -1,38 +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 java.io.IOException;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.io.hfile.CacheConfig;
-import org.apache.hadoop.hbase.io.hfile.HFileInfo;
-import org.apache.hadoop.hbase.io.hfile.ReaderContext;
-import org.apache.hadoop.hbase.regionserver.StoreFileReader;
-
-public class CompatIndexHalfStoreFileReader extends StoreFileReader {
-
- public CompatIndexHalfStoreFileReader(final FileSystem fs, final CacheConfig
cacheConf,
- final Configuration conf, final ReaderContext readerContext, final
HFileInfo hFileInfo, Path p)
- throws IOException {
- super(readerContext, hFileInfo, cacheConf, new AtomicInteger(0), conf);
- }
-
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatIndexedHLogReader.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatIndexedHLogReader.java
deleted file mode 100644
index 370cbcc2ef..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatIndexedHLogReader.java
+++ /dev/null
@@ -1,31 +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 java.io.IOException;
-import org.apache.hadoop.hbase.regionserver.wal.ProtobufLogReader;
-import org.apache.hadoop.hbase.regionserver.wal.WALCellCodec;
-
-public abstract class CompatIndexedHLogReader extends ProtobufLogReader {
- @Override
- protected void initAfterCompression() throws IOException {
- conf.set(WALCellCodec.WAL_CELL_CODEC_CLASS_KEY,
- "org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec");
- super.initAfterCompression();
- }
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatLocalIndexStoreFileScanner.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatLocalIndexStoreFileScanner.java
deleted file mode 100644
index a9f9427c6a..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatLocalIndexStoreFileScanner.java
+++ /dev/null
@@ -1,31 +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.StoreFileScanner;
-
-public class CompatLocalIndexStoreFileScanner extends StoreFileScanner {
-
- public CompatLocalIndexStoreFileScanner(CompatIndexHalfStoreFileReader
reader,
- boolean cacheBlocks, boolean pread, boolean isCompaction, long readPt,
long scannerOrder,
- boolean canOptimizeForNonNullColumn) {
- super(reader, reader.getScanner(cacheBlocks, pread, isCompaction),
!isCompaction,
- reader.getHFileReader().hasMVCCInfo(), readPt, scannerOrder,
canOptimizeForNonNullColumn);
- }
-
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
deleted file mode 100644
index 76ec835268..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatOmidTransactionTable.java
+++ /dev/null
@@ -1,57 +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 java.io.IOException;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.client.RowMutations;
-import org.apache.hadoop.hbase.client.Table;
-import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;
-
-public abstract class CompatOmidTransactionTable implements Table {
-
- @Override
- public Result mutateRow(RowMutations rm) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean checkAndPut(byte[] row, byte[] family, byte[] qualifier,
CompareOp compareOp,
- byte[] value, Put put) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean checkAndDelete(byte[] row, byte[] family, byte[] qualifier,
CompareOp compareOp,
- byte[] value, Delete delete) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public boolean checkAndMutate(byte[] row, byte[] family, byte[] qualifier,
CompareOp compareOp,
- byte[] value, RowMutations mutation) throws IOException {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public CheckAndMutateBuilder checkAndMutate(byte[] row, byte[] family) {
- throw new UnsupportedOperationException();
- }
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPagingFilter.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPagingFilter.java
deleted file mode 100644
index 84108750fc..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPagingFilter.java
+++ /dev/null
@@ -1,40 +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 java.io.IOException;
-import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.filter.Filter;
-import org.apache.hadoop.hbase.filter.FilterBase;
-
-public abstract class CompatPagingFilter extends FilterBase {
- protected Filter delegate = null;
-
- public CompatPagingFilter(Filter delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public ReturnCode filterKeyValue(Cell v) throws IOException {
-
- if (delegate != null) {
- return delegate.filterKeyValue(v);
- }
- return super.filterKeyValue(v);
- }
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java
deleted file mode 100644
index 2adb09eed5..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatPhoenixRpcScheduler.java
+++ /dev/null
@@ -1,37 +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 java.io.IOException;
-import org.apache.hadoop.hbase.ipc.CallRunner;
-import org.apache.hadoop.hbase.ipc.RpcScheduler;
-
-/**
- * {@link RpcScheduler} that first checks to see if this is an index or
metadata update before
- * passing off the call to the delegate {@link RpcScheduler}.
- */
-public abstract class CompatPhoenixRpcScheduler extends RpcScheduler {
- protected RpcScheduler delegate;
-
- @Override
- public boolean dispatch(CallRunner task) throws IOException,
InterruptedException {
- return compatDispatch(task);
- }
-
- public abstract boolean compatDispatch(CallRunner task) throws IOException,
InterruptedException;
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java
deleted file mode 100644
index 5752e98992..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/CompatUtil.java
+++ /dev/null
@@ -1,79 +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 java.io.IOException;
-import java.util.List;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.CellComparator;
-import org.apache.hadoop.hbase.MetaTableAccessor;
-import org.apache.hadoop.hbase.client.Connection;
-import org.apache.hadoop.hbase.client.RegionInfo;
-import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
-import org.apache.hadoop.hbase.io.compress.Compression.Algorithm;
-import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
-import org.apache.hadoop.hbase.io.hfile.HFileContext;
-import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder;
-import org.apache.hadoop.hbase.regionserver.StoreUtils;
-import org.apache.hadoop.hbase.util.ChecksumType;
-import org.apache.hadoop.hbase.util.VersionInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class CompatUtil {
-
- private static final Logger LOGGER =
LoggerFactory.getLogger(CompatUtil.class);
-
- private static boolean hasFixedShortCircuitConnection =
- VersionInfo.compareVersion(VersionInfo.getVersion(), "2.4.12") >= 0;
-
- private CompatUtil() {
- // Not to be instantiated
- }
-
- public static HFileContext createHFileContext(Configuration conf, Algorithm
compression,
- Integer blockSize, DataBlockEncoding encoding, CellComparator comparator) {
-
- return new HFileContextBuilder().withCompression(compression)
- .withChecksumType(StoreUtils.getChecksumType(conf))
-
.withBytesPerCheckSum(StoreUtils.getBytesPerChecksum(conf)).withBlockSize(blockSize)
- .withDataBlockEncoding(encoding).build();
- }
-
- public static List<RegionInfo> getMergeRegions(Connection conn, RegionInfo
regionInfo)
- throws IOException {
- return MetaTableAccessor.getMergeRegions(conn, regionInfo.getRegionName());
- }
-
- public static ChecksumType getChecksumType(Configuration conf) {
- return StoreUtils.getChecksumType(conf);
- }
-
- public static int getBytesPerChecksum(Configuration conf) {
- return StoreUtils.getBytesPerChecksum(conf);
- }
-
- public static Connection createShortCircuitConnection(final Configuration
configuration,
- final RegionCoprocessorEnvironment env) throws IOException {
- if (hasFixedShortCircuitConnection) {
- return env.createConnection(configuration);
- } else {
- return
org.apache.hadoop.hbase.client.ConnectionFactory.createConnection(configuration);
- }
- }
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
deleted file mode 100644
index ccd416a914..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/HbaseCompatCapabilities.java
+++ /dev/null
@@ -1,23 +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;
-
-public class HbaseCompatCapabilities {
- // Currently every supported HBase version has the same capabilities, so
there is
- // nothing in here.
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/ReplicationSinkCompatEndpoint.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/ReplicationSinkCompatEndpoint.java
deleted file mode 100644
index 08e73164e3..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/ReplicationSinkCompatEndpoint.java
+++ /dev/null
@@ -1,61 +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 java.io.IOException;
-import java.util.List;
-import java.util.Optional;
-import org.apache.hadoop.hbase.client.Mutation;
-import org.apache.hadoop.hbase.coprocessor.ObserverContext;
-import org.apache.hadoop.hbase.coprocessor.RegionServerCoprocessor;
-import org.apache.hadoop.hbase.coprocessor.RegionServerCoprocessorEnvironment;
-import org.apache.hadoop.hbase.coprocessor.RegionServerObserver;
-
-import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;
-
-/**
- * Replication Sink compat endpoint that helps attach WAL attributes to
mutation. In order to do so,
- * this endpoint utilizes regionserver hook
- * {@link #preReplicationSinkBatchMutate(ObserverContext,
AdminProtos.WALEntry, Mutation)}
- */
-public class ReplicationSinkCompatEndpoint
- implements RegionServerCoprocessor, RegionServerObserver {
-
- @Override
- public Optional<RegionServerObserver> getRegionServerObserver() {
- return Optional.of(this);
- }
-
- @Override
- public void
preReplicationSinkBatchMutate(ObserverContext<RegionServerCoprocessorEnvironment>
ctx,
- AdminProtos.WALEntry walEntry, Mutation mutation) throws IOException {
- RegionServerObserver.super.preReplicationSinkBatchMutate(ctx, walEntry,
mutation);
- List<WALProtos.Attribute> attributeList =
walEntry.getKey().getExtendedAttributesList();
- attachWALExtendedAttributesToMutation(mutation, attributeList);
- }
-
- private void attachWALExtendedAttributesToMutation(Mutation mutation,
- List<WALProtos.Attribute> attributeList) {
- if (attributeList != null) {
- for (WALProtos.Attribute attribute : attributeList) {
- mutation.setAttribute(attribute.getKey(),
attribute.getValue().toByteArray());
- }
- }
- }
-}
diff --git
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/package-info.java
b/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/package-info.java
deleted file mode 100644
index 7c098f4971..0000000000
---
a/phoenix-hbase-compat-2.4.1/src/main/java/org/apache/phoenix/compat/hbase/package-info.java
+++ /dev/null
@@ -1,23 +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.
- */
-
-/**
- * This package contains compatibility classes for bridging differences
- * between different versions of HBase.
- */
-package org.apache.phoenix.compat.hbase;
diff --git a/pom.xml b/pom.xml
index 9319cd4535..7666d0c40e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
<module>phoenix-hbase-compat-2.6.0</module>
<module>phoenix-hbase-compat-2.5.4</module>
<module>phoenix-hbase-compat-2.5.0</module>
- <module>phoenix-hbase-compat-2.4.1</module>
<module>phoenix-core-client</module>
<module>phoenix-core-server</module>
<module>phoenix-core</module>
@@ -73,9 +72,8 @@
<hbase.suffix>hbase-${hbase.profile}</hbase.suffix>
<!-- This is used by the release script only -->
- <hbase.profile.list>2.4 2.5.0 2.5 2.6</hbase.profile.list>
+ <hbase.profile.list>2.5.0 2.5 2.6</hbase.profile.list>
<!-- The default hbase versions to build with (override with
hbase.version) -->
- <hbase-2.4.runtime.version>2.4.18</hbase-2.4.runtime.version>
<hbase-2.5.0.runtime.version>2.5.3-hadoop3</hbase-2.5.0.runtime.version>
<hbase-2.5.4.runtime.version>2.5.10-hadoop3</hbase-2.5.4.runtime.version>
<hbase-2.5.runtime.version>2.5.12-hadoop3</hbase-2.5.runtime.version>
@@ -246,11 +244,6 @@
<artifactId>phoenix-core</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-client-embedded-hbase-2.4</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-embedded-hbase-2.5.0</artifactId>
@@ -276,11 +269,6 @@
<artifactId>phoenix-client-embedded-hbase-2.6.0</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-client-lite-hbase-2.4</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-client-lite-hbase-2.5.4</artifactId>
@@ -306,11 +294,6 @@
<artifactId>phoenix-client-lite-hbase-2.6</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-server-hbase-2.4</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-server-hbase-2.5.0</artifactId>
@@ -336,11 +319,6 @@
<artifactId>phoenix-server-hbase-2.6</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-mapreduce-byo-shaded-hbase-hbase-2.4</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-mapreduce-byo-shaded-hbase-hbase-2.5.0</artifactId>
@@ -381,11 +359,6 @@
<artifactId>phoenix-shaded-guava</artifactId>
<version>${phoenix.thirdparty.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-2.4.1</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
<artifactId>phoenix-hbase-compat-2.5.0</artifactId>
@@ -2113,22 +2086,6 @@
<hbase.version>${hbase-2.5.runtime.version}</hbase.version>
</properties>
</profile>
- <profile>
- <!-- PHOENIX-5993 This won't work with the public HBase artifacts -->
- <id>phoenix-hbase-compat-2.4.1</id>
- <activation>
- <property>
- <name>hbase.profile</name>
- <value>2.4</value>
- </property>
- </activation>
- <properties>
- <hbase.profile>2.4</hbase.profile>
- <hbase.compat.version>2.4.1</hbase.compat.version>
- <hadoop.version>3.1.4</hadoop.version>
- <hbase.version>${hbase-2.4.runtime.version}</hbase.version>
- </properties>
- </profile>
<profile>
<!-- This WILL work with the public -hadoop3 artifacts -->
<id>phoenix-hbase-compat-2.5.12</id>
