apache · szucsvillo · Dec 5, 2024
diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java b/phoenix-core-client/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
@@ -47,8 +47,8 @@
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils.BlockingRpcCallback;
 import org.apache.hadoop.hbase.ipc.ServerRpcController;
-import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.phoenix.compat.hbase.ByteStringer;
 import org.apache.phoenix.compile.QueryPlan;
 import org.apache.phoenix.compile.ScanRanges;
 import org.apache.phoenix.coprocessorclient.MetaDataProtocol;

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/coprocessorclient/MetaDataProtocol.java b/phoenix-core-client/src/main/java/org/apache/phoenix/coprocessorclient/MetaDataProtocol.java
@@ -24,7 +24,7 @@
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
-import org.apache.hadoop.hbase.util.ByteStringer;
+import org.apache.phoenix.compat.hbase.ByteStringer;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataResponse;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataService;

diff --git a/...ix-core-client/src/main/java/org/apache/phoenix/filter/AllVersionsIndexRebuildFilter.java b/...ix-core-client/src/main/java/org/apache/phoenix/filter/AllVersionsIndexRebuildFilter.java
@@ -33,7 +33,7 @@ public AllVersionsIndexRebuildFilter(Filter originalFilter) {
         super(originalFilter);
     }
 
-    @Override
+    // No @Override for HBase 3 compatibility
     public ReturnCode filterKeyValue(Cell v) throws IOException {
         return filterCell(v);
     }

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java b/phoenix-core-client/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
@@ -185,7 +185,7 @@ public String toString() {
         return "";
     }
 
-    @Override
+    // No @Override for HBase 3 compatibility
     public ReturnCode filterKeyValue(Cell ignored) throws IOException {
         return filterCell(ignored);
     }

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/filter/DelegateFilter.java b/phoenix-core-client/src/main/java/org/apache/phoenix/filter/DelegateFilter.java
@@ -21,7 +21,6 @@
 import java.util.List;
 
 import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.filter.Filter;
 import org.apache.hadoop.hbase.filter.FilterBase;
 
@@ -38,11 +37,6 @@ public void reset() throws IOException {
         delegate.reset();
     }
 
-    @Override
-    public boolean filterRowKey(byte[] buffer, int offset, int length) throws IOException {
-        return delegate.filterRowKey(buffer, offset, length);
-    }
-
     @Override
     public boolean filterRowKey(Cell cell) throws IOException {
         return delegate.filterRowKey(cell);
@@ -58,11 +52,6 @@ public boolean filterAllRemaining() throws IOException {
         return delegate.filterAllRemaining();
     }
 
-    @Override
-    public ReturnCode filterKeyValue(Cell v) throws IOException {
-        return delegate.filterKeyValue(v);
-    }
-
     @Override
     public Cell transformCell(Cell v) throws IOException {
         return delegate.transformCell(v);

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/filter/DistinctPrefixFilter.java b/phoenix-core-client/src/main/java/org/apache/phoenix/filter/DistinctPrefixFilter.java
@@ -57,7 +57,7 @@ public void setOffset(int offset) {
         this.offset = offset;
     }
 
-    @Override
+    // No @Override for HBase 3 compatibility
     public ReturnCode filterKeyValue(Cell v) throws IOException {
         return filterCell(v);
     }

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/filter/EmptyColumnOnlyFilter.java b/phoenix-core-client/src/main/java/org/apache/phoenix/filter/EmptyColumnOnlyFilter.java
@@ -56,8 +56,8 @@ public void reset() throws IOException {
         found = false;
         first = true;
     }
-    @Deprecated
-    @Override
+
+    // No @Override for HBase 3 compatibility
     public ReturnCode filterKeyValue(final Cell c) throws IOException {
         return filterCell(c);
     }

diff --git a/...ient/src/main/java/org/apache/phoenix/filter/EncodedQualifiersColumnProjectionFilter.java b/...ient/src/main/java/org/apache/phoenix/filter/EncodedQualifiersColumnProjectionFilter.java
@@ -148,7 +148,7 @@ public String toString() {
         return sb.toString();
     }
 
-    @Override
+    // No @Override for HBase 3 compatibility
     public ReturnCode filterKeyValue(Cell ignored) throws IOException {
         return filterCell(ignored);
     }

diff --git a/...lient/src/main/java/org/apache/phoenix/filter/MultiEncodedCQKeyValueComparisonFilter.java b/...lient/src/main/java/org/apache/phoenix/filter/MultiEncodedCQKeyValueComparisonFilter.java
@@ -215,7 +215,7 @@ private boolean isQualifierForColumnInWhereExpression(int qualifier) {
         return qualifier >= whereExpressionMinQualifier ? whereExpressionQualifiers.get(qualifier - whereExpressionMinQualifier) : false;
     }
 
-    @Override
+    // No @Override for HBase 3 compatibility
     public ReturnCode filterKeyValue(Cell cell) {
         return filterCell(cell);
     }

diff --git a/...ix-core-client/src/main/java/org/apache/phoenix/filter/MultiKeyValueComparisonFilter.java b/...ix-core-client/src/main/java/org/apache/phoenix/filter/MultiKeyValueComparisonFilter.java
@@ -200,7 +200,7 @@ public Void visit(KeyValueColumnExpression expression) {
         expression.accept(visitor);
     }
 
-    @Override
+    // No @Override for Hbase 3 compatibility
     public ReturnCode filterKeyValue(Cell cell) {
         return filterCell(cell);
     }

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/filter/PagingFilter.java b/phoenix-core-client/src/main/java/org/apache/phoenix/filter/PagingFilter.java
@@ -29,9 +29,9 @@
 import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.filter.Filter;
-import org.apache.hadoop.hbase.filter.FilterBase;
 import org.apache.hadoop.hbase.util.Writables;
 import org.apache.hadoop.io.Writable;
+import org.apache.phoenix.compat.hbase.CompatPagingFilter;
 import org.apache.phoenix.util.EnvironmentEdgeManager;
 
 /**
@@ -71,19 +71,19 @@
  * filterRowKey(). In this method, PagingFilter records the last row that is scanned.
  *
  */
-public class PagingFilter extends FilterBase implements Writable {
+public class PagingFilter extends CompatPagingFilter implements Writable {
     private long pageSizeMs;
     private long startTime;
     // tracks the row we last visited
     private Cell currentCell;
     private boolean isStopped;
-    private Filter delegate = null;
 
     public PagingFilter() {
+        super(null);
     }
 
     public PagingFilter(Filter delegate, long pageSizeMs) {
-        this.delegate = delegate;
+        super(delegate);
         this.pageSizeMs = pageSizeMs;
     }
 
@@ -208,14 +208,6 @@ public boolean isFamilyEssential(byte[] name) throws IOException {
         return super.isFamilyEssential(name);
     }
 
-    @Override
-    public ReturnCode filterKeyValue(Cell v) throws IOException {
-        if (delegate != null) {
-            return delegate.filterKeyValue(v);
-        }
-        return super.filterKeyValue(v);
-    }
-
     @Override
     public Filter.ReturnCode filterCell(Cell c) throws IOException {
         if (delegate != null) {

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/filter/RowKeyComparisonFilter.java b/phoenix-core-client/src/main/java/org/apache/phoenix/filter/RowKeyComparisonFilter.java
@@ -65,7 +65,7 @@ public void reset() {
      * Evaluate in filterKeyValue instead of filterRowKey, because HBASE-6562 causes filterRowKey
      * to be called with deleted or partial row keys.
      */
-    @Override
+    // No @Override for HBase 3 compatibility
     public ReturnCode filterKeyValue(Cell v) {
         return filterCell(v);
     }

diff --git a/...x-core-client/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java b/...x-core-client/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java
@@ -71,7 +71,7 @@ private boolean foundColumn() {
         return inputTuple.size() > 0;
     }
 
-    @Override
+    // No @Override for HBase 3 compatibility
     public ReturnCode filterKeyValue(Cell keyValue) {
         return filterCell(keyValue);
     }

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java b/phoenix-core-client/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java
@@ -166,7 +166,7 @@ public boolean filterAllRemaining() {
         return isDone;
     }
 
-    @Override
+    // No @Override for HBase 3 compatibility
     public ReturnCode filterKeyValue(Cell kv) {
         return filterCell(kv);
     }

diff --git a/...x-core-client/src/main/java/org/apache/phoenix/filter/SystemCatalogViewIndexIdFilter.java b/...x-core-client/src/main/java/org/apache/phoenix/filter/SystemCatalogViewIndexIdFilter.java
@@ -54,7 +54,7 @@ public SystemCatalogViewIndexIdFilter(int clientVersion) {
         this.clientVersion = clientVersion;
     }
 
-    @Override
+    // No @Override for HBase 3 compatibility
     public ReturnCode filterKeyValue(Cell keyValue) {
         return filterCell(keyValue);
     }

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/filter/UnverifiedRowFilter.java b/phoenix-core-client/src/main/java/org/apache/phoenix/filter/UnverifiedRowFilter.java
@@ -68,7 +68,7 @@ public void reset() throws IOException {
         delegate.reset();
     }
 
-    @Override
+    // No @Override for HBase 3 compatibility
     public ReturnCode filterKeyValue(Cell v) throws IOException {
         return filterCell(v);
     }

diff --git a/.../main/java/org/apache/phoenix/hbase/index/covered/filter/ApplyAndFilterDeletesFilter.java b/.../main/java/org/apache/phoenix/hbase/index/covered/filter/ApplyAndFilterDeletesFilter.java
@@ -102,7 +102,7 @@ public Cell getNextCellHint(Cell peeked){
     return currentHint.getHint(PhoenixKeyValueUtil.maybeCopyCell(peeked));
   }
 
-  @Override
+  // No @Override for HBase 3 compatibility
   public ReturnCode filterKeyValue(Cell next) {
     return this.filterCell(next);
   }

diff --git a/...g/apache/phoenix/hbase/index/covered/filter/ColumnTrackingNextLargestTimestampFilter.java b/...g/apache/phoenix/hbase/index/covered/filter/ColumnTrackingNextLargestTimestampFilter.java
@@ -47,7 +47,7 @@ public ColumnTrackingNextLargestTimestampFilter(long maxTime, ColumnTracker toTr
     this.column = toTrack;
   }
 
-  @Override
+  // No @Override for HBase 3 compatibility
   public ReturnCode filterKeyValue(Cell v) {
     return this.filterCell(v);
   }

diff --git a/...lient/src/main/java/org/apache/phoenix/hbase/index/covered/filter/MaxTimestampFilter.java b/...lient/src/main/java/org/apache/phoenix/hbase/index/covered/filter/MaxTimestampFilter.java
@@ -51,7 +51,7 @@ public Cell getNextCellHint(Cell currentKV) {
     return kv;
   }
 
-  @Override
+  // No @Override for HBase 3 compatibility
   public ReturnCode filterKeyValue(Cell v) {
     return this.filterCell(v);
   }

diff --git a/...ent/src/main/java/org/apache/phoenix/hbase/index/covered/filter/NewerTimestampFilter.java b/...ent/src/main/java/org/apache/phoenix/hbase/index/covered/filter/NewerTimestampFilter.java
@@ -34,7 +34,7 @@ public NewerTimestampFilter(long timestamp) {
     this.timestamp = timestamp;
   }
 
-  @Override
+  // No @Override for HBase 3 compatibility
   public ReturnCode filterKeyValue(Cell ignored) {
     return this.filterCell(ignored);
   }

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/index/CDCTableInfo.java b/phoenix-core-client/src/main/java/org/apache/phoenix/index/CDCTableInfo.java
@@ -18,7 +18,7 @@
 
 package org.apache.phoenix.index;
 
-import org.apache.hadoop.hbase.util.ByteStringer;
+import org.apache.phoenix.compat.hbase.ByteStringer;
 import org.apache.phoenix.compile.StatementContext;
 import org.apache.phoenix.compile.TupleProjectionCompiler;
 import org.apache.phoenix.coprocessor.generated.CDCInfoProtos;

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/index/IndexMaintainer.java b/phoenix-core-client/src/main/java/org/apache/phoenix/index/IndexMaintainer.java
@@ -50,11 +50,11 @@
 import org.apache.hadoop.hbase.client.Mutation;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
-import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
+import org.apache.phoenix.compat.hbase.ByteStringer;
 import org.apache.phoenix.compile.ColumnResolver;
 import org.apache.phoenix.compile.FromCompiler;
 import org.apache.phoenix.compile.IndexExpressionCompiler;

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/parse/PFunction.java b/phoenix-core-client/src/main/java/org/apache/phoenix/parse/PFunction.java
@@ -22,7 +22,7 @@
 import java.util.List;
 
 import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.util.ByteStringer;
+import org.apache.phoenix.compat.hbase.ByteStringer;
 import org.apache.phoenix.coprocessor.generated.PFunctionProtos;
 import org.apache.phoenix.coprocessor.generated.PFunctionProtos.PFunctionArg;
 import org.apache.phoenix.expression.LiteralExpression;

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/protobuf/ProtobufUtil.java b/phoenix-core-client/src/main/java/org/apache/phoenix/protobuf/ProtobufUtil.java
@@ -28,8 +28,8 @@
 import org.apache.hadoop.hbase.ipc.ServerRpcController;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType;
-import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.hadoop.util.StringUtils;
+import org.apache.phoenix.compat.hbase.ByteStringer;
 import org.apache.phoenix.coprocessor.generated.ChildLinkMetaDataProtos.CreateViewAddChildLinkRequest;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos;
 import org.apache.phoenix.coprocessor.generated.PTableProtos;

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java b/phoenix-core-client/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -181,12 +181,12 @@
 import org.apache.hadoop.hbase.security.AccessDeniedException;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hadoop.hbase.snapshot.SnapshotCreationException;
-import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.hbase.util.VersionInfo;
 import org.apache.hadoop.hbase.zookeeper.ZKConfig;
 import org.apache.hadoop.ipc.RemoteException;
+import org.apache.phoenix.compat.hbase.ByteStringer;
 import org.apache.phoenix.compile.MutationPlan;
 import org.apache.phoenix.coprocessor.generated.ChildLinkMetaDataProtos.ChildLinkMetaDataService;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos;

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/schema/PColumnImpl.java b/phoenix-core-client/src/main/java/org/apache/phoenix/schema/PColumnImpl.java
@@ -18,7 +18,7 @@
 package org.apache.phoenix.schema;
 
 import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.util.ByteStringer;
+import org.apache.phoenix.compat.hbase.ByteStringer;
 import org.apache.phoenix.coprocessor.generated.PTableProtos;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.types.PDataType;

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/schema/PTableImpl.java b/phoenix-core-client/src/main/java/org/apache/phoenix/schema/PTableImpl.java
@@ -59,9 +59,9 @@
 import org.apache.hadoop.hbase.client.Mutation;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
-import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
+import org.apache.phoenix.compat.hbase.ByteStringer;
 import org.apache.phoenix.compile.ExpressionCompiler;
 import org.apache.phoenix.compile.FromCompiler;
 import org.apache.phoenix.compile.QueryPlan;
@@ -141,7 +141,6 @@
 import org.apache.hadoop.hbase.client.Mutation;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
-import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.phoenix.compile.ExpressionCompiler;

diff --git a/...ix-core-client/src/main/java/org/apache/phoenix/schema/transform/TransformMaintainer.java b/...ix-core-client/src/main/java/org/apache/phoenix/schema/transform/TransformMaintainer.java
@@ -24,9 +24,9 @@
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
-import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.hadoop.hbase.util.Pair;
 import org.apache.hadoop.io.WritableUtils;
+import org.apache.phoenix.compat.hbase.ByteStringer;
 import org.apache.phoenix.coprocessor.generated.ServerCachingProtos;
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.ExpressionType;

diff --git a/phoenix-core-client/src/main/java/org/apache/phoenix/util/ValidateLastDDLTimestampUtil.java b/phoenix-core-client/src/main/java/org/apache/phoenix/util/ValidateLastDDLTimestampUtil.java
@@ -28,7 +28,7 @@
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.client.Admin;
-import org.apache.hadoop.hbase.util.ByteStringer;
+import org.apache.phoenix.compat.hbase.ByteStringer;
 import org.apache.phoenix.coprocessor.generated.RegionServerEndpointProtos;
 import org.apache.phoenix.exception.StaleMetadataCacheException;
 import org.apache.phoenix.jdbc.PhoenixConnection;