Skip to content

Commit 5c99ff1

Browse files
szucsvillostoty
szucsvillo
and
stoty
committed
PHOENIX-7476 HBase 3 compatibility changes for Filters, ByteStringer, and Paging
Co-authored-by: Istvan Toth <[email protected]>
1 parent a51a57a commit 5c99ff1

File tree

49 files changed

+556
-128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+556
-128
lines changed

‎phoenix-core-client/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
4848
import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils.BlockingRpcCallback;
4949
import org.apache.hadoop.hbase.ipc.ServerRpcController;
50-
import org.apache.hadoop.hbase.util.ByteStringer;
5150
import org.apache.hadoop.hbase.util.Bytes;
51+
import org.apache.phoenix.compat.hbase.ByteStringer;
5252
import org.apache.phoenix.compile.QueryPlan;
5353
import org.apache.phoenix.compile.ScanRanges;
5454
import org.apache.phoenix.coprocessorclient.MetaDataProtocol;

‎phoenix-core-client/src/main/java/org/apache/phoenix/coprocessorclient/MetaDataProtocol.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.NavigableMap;
2525
import java.util.TreeMap;
2626

27-
import org.apache.hadoop.hbase.util.ByteStringer;
27+
import org.apache.phoenix.compat.hbase.ByteStringer;
2828
import org.apache.phoenix.coprocessor.generated.MetaDataProtos;
2929
import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataResponse;
3030
import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataService;

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/AllVersionsIndexRebuildFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public AllVersionsIndexRebuildFilter(Filter originalFilter) {
3333
super(originalFilter);
3434
}
3535

36-
@Override
36+
// No @Override for HBase 3 compatibility
3737
public ReturnCode filterKeyValue(Cell v) throws IOException {
3838
return filterCell(v);
3939
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ public String toString() {
185185
return "";
186186
}
187187

188-
@Override
188+
// No @Override for HBase 3 compatibility
189189
public ReturnCode filterKeyValue(Cell ignored) throws IOException {
190190
return filterCell(ignored);
191191
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/DelegateFilter.java

-11
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.List;
2222

2323
import org.apache.hadoop.hbase.Cell;
24-
import org.apache.hadoop.hbase.KeyValue;
2524
import org.apache.hadoop.hbase.filter.Filter;
2625
import org.apache.hadoop.hbase.filter.FilterBase;
2726

@@ -38,11 +37,6 @@ public void reset() throws IOException {
3837
delegate.reset();
3938
}
4039

41-
@Override
42-
public boolean filterRowKey(byte[] buffer, int offset, int length) throws IOException {
43-
return delegate.filterRowKey(buffer, offset, length);
44-
}
45-
4640
@Override
4741
public boolean filterRowKey(Cell cell) throws IOException {
4842
return delegate.filterRowKey(cell);
@@ -58,11 +52,6 @@ public boolean filterAllRemaining() throws IOException {
5852
return delegate.filterAllRemaining();
5953
}
6054

61-
@Override
62-
public ReturnCode filterKeyValue(Cell v) throws IOException {
63-
return delegate.filterKeyValue(v);
64-
}
65-
6655
@Override
6756
public Cell transformCell(Cell v) throws IOException {
6857
return delegate.transformCell(v);

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/DistinctPrefixFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void setOffset(int offset) {
5757
this.offset = offset;
5858
}
5959

60-
@Override
60+
// No @Override for HBase 3 compatibility
6161
public ReturnCode filterKeyValue(Cell v) throws IOException {
6262
return filterCell(v);
6363
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/EmptyColumnOnlyFilter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public void reset() throws IOException {
5656
found = false;
5757
first = true;
5858
}
59-
@Deprecated
60-
@Override
59+
60+
// No @Override for HBase 3 compatibility
6161
public ReturnCode filterKeyValue(final Cell c) throws IOException {
6262
return filterCell(c);
6363
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/EncodedQualifiersColumnProjectionFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public String toString() {
148148
return sb.toString();
149149
}
150150

151-
@Override
151+
// No @Override for HBase 3 compatibility
152152
public ReturnCode filterKeyValue(Cell ignored) throws IOException {
153153
return filterCell(ignored);
154154
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/MultiEncodedCQKeyValueComparisonFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ private boolean isQualifierForColumnInWhereExpression(int qualifier) {
215215
return qualifier >= whereExpressionMinQualifier ? whereExpressionQualifiers.get(qualifier - whereExpressionMinQualifier) : false;
216216
}
217217

218-
@Override
218+
// No @Override for HBase 3 compatibility
219219
public ReturnCode filterKeyValue(Cell cell) {
220220
return filterCell(cell);
221221
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/MultiKeyValueComparisonFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public Void visit(KeyValueColumnExpression expression) {
200200
expression.accept(visitor);
201201
}
202202

203-
@Override
203+
// No @Override for Hbase 3 compatibility
204204
public ReturnCode filterKeyValue(Cell cell) {
205205
return filterCell(cell);
206206
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/PagingFilter.java

+4-12
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import org.apache.hadoop.hbase.DoNotRetryIOException;
3030
import org.apache.hadoop.hbase.exceptions.DeserializationException;
3131
import org.apache.hadoop.hbase.filter.Filter;
32-
import org.apache.hadoop.hbase.filter.FilterBase;
3332
import org.apache.hadoop.hbase.util.Writables;
3433
import org.apache.hadoop.io.Writable;
34+
import org.apache.phoenix.compat.hbase.CompatPagingFilter;
3535
import org.apache.phoenix.util.EnvironmentEdgeManager;
3636

3737
/**
@@ -71,19 +71,19 @@
7171
* filterRowKey(). In this method, PagingFilter records the last row that is scanned.
7272
*
7373
*/
74-
public class PagingFilter extends FilterBase implements Writable {
74+
public class PagingFilter extends CompatPagingFilter implements Writable {
7575
private long pageSizeMs;
7676
private long startTime;
7777
// tracks the row we last visited
7878
private Cell currentCell;
7979
private boolean isStopped;
80-
private Filter delegate = null;
8180

8281
public PagingFilter() {
82+
super(null);
8383
}
8484

8585
public PagingFilter(Filter delegate, long pageSizeMs) {
86-
this.delegate = delegate;
86+
super(delegate);
8787
this.pageSizeMs = pageSizeMs;
8888
}
8989

@@ -208,14 +208,6 @@ public boolean isFamilyEssential(byte[] name) throws IOException {
208208
return super.isFamilyEssential(name);
209209
}
210210

211-
@Override
212-
public ReturnCode filterKeyValue(Cell v) throws IOException {
213-
if (delegate != null) {
214-
return delegate.filterKeyValue(v);
215-
}
216-
return super.filterKeyValue(v);
217-
}
218-
219211
@Override
220212
public Filter.ReturnCode filterCell(Cell c) throws IOException {
221213
if (delegate != null) {

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/RowKeyComparisonFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void reset() {
6565
* Evaluate in filterKeyValue instead of filterRowKey, because HBASE-6562 causes filterRowKey
6666
* to be called with deleted or partial row keys.
6767
*/
68-
@Override
68+
// No @Override for HBase 3 compatibility
6969
public ReturnCode filterKeyValue(Cell v) {
7070
return filterCell(v);
7171
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/SingleKeyValueComparisonFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private boolean foundColumn() {
7171
return inputTuple.size() > 0;
7272
}
7373

74-
@Override
74+
// No @Override for HBase 3 compatibility
7575
public ReturnCode filterKeyValue(Cell keyValue) {
7676
return filterCell(keyValue);
7777
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/SkipScanFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public boolean filterAllRemaining() {
166166
return isDone;
167167
}
168168

169-
@Override
169+
// No @Override for HBase 3 compatibility
170170
public ReturnCode filterKeyValue(Cell kv) {
171171
return filterCell(kv);
172172
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/SystemCatalogViewIndexIdFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public SystemCatalogViewIndexIdFilter(int clientVersion) {
5454
this.clientVersion = clientVersion;
5555
}
5656

57-
@Override
57+
// No @Override for HBase 3 compatibility
5858
public ReturnCode filterKeyValue(Cell keyValue) {
5959
return filterCell(keyValue);
6060
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/filter/UnverifiedRowFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void reset() throws IOException {
6868
delegate.reset();
6969
}
7070

71-
@Override
71+
// No @Override for HBase 3 compatibility
7272
public ReturnCode filterKeyValue(Cell v) throws IOException {
7373
return filterCell(v);
7474
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/hbase/index/covered/filter/ApplyAndFilterDeletesFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public Cell getNextCellHint(Cell peeked){
102102
return currentHint.getHint(PhoenixKeyValueUtil.maybeCopyCell(peeked));
103103
}
104104

105-
@Override
105+
// No @Override for HBase 3 compatibility
106106
public ReturnCode filterKeyValue(Cell next) {
107107
return this.filterCell(next);
108108
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/hbase/index/covered/filter/ColumnTrackingNextLargestTimestampFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public ColumnTrackingNextLargestTimestampFilter(long maxTime, ColumnTracker toTr
4747
this.column = toTrack;
4848
}
4949

50-
@Override
50+
// No @Override for HBase 3 compatibility
5151
public ReturnCode filterKeyValue(Cell v) {
5252
return this.filterCell(v);
5353
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/hbase/index/covered/filter/MaxTimestampFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public Cell getNextCellHint(Cell currentKV) {
5151
return kv;
5252
}
5353

54-
@Override
54+
// No @Override for HBase 3 compatibility
5555
public ReturnCode filterKeyValue(Cell v) {
5656
return this.filterCell(v);
5757
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/hbase/index/covered/filter/NewerTimestampFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public NewerTimestampFilter(long timestamp) {
3434
this.timestamp = timestamp;
3535
}
3636

37-
@Override
37+
// No @Override for HBase 3 compatibility
3838
public ReturnCode filterKeyValue(Cell ignored) {
3939
return this.filterCell(ignored);
4040
}

‎phoenix-core-client/src/main/java/org/apache/phoenix/index/CDCTableInfo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.phoenix.index;
2020

21-
import org.apache.hadoop.hbase.util.ByteStringer;
21+
import org.apache.phoenix.compat.hbase.ByteStringer;
2222
import org.apache.phoenix.compile.StatementContext;
2323
import org.apache.phoenix.compile.TupleProjectionCompiler;
2424
import org.apache.phoenix.coprocessor.generated.CDCInfoProtos;

‎phoenix-core-client/src/main/java/org/apache/phoenix/index/IndexMaintainer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
import org.apache.hadoop.hbase.client.Mutation;
5151
import org.apache.hadoop.hbase.client.Put;
5252
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
53-
import org.apache.hadoop.hbase.util.ByteStringer;
5453
import org.apache.hadoop.hbase.util.Bytes;
5554
import org.apache.hadoop.hbase.util.Pair;
5655
import org.apache.hadoop.io.Writable;
5756
import org.apache.hadoop.io.WritableUtils;
57+
import org.apache.phoenix.compat.hbase.ByteStringer;
5858
import org.apache.phoenix.compile.ColumnResolver;
5959
import org.apache.phoenix.compile.FromCompiler;
6060
import org.apache.phoenix.compile.IndexExpressionCompiler;

‎phoenix-core-client/src/main/java/org/apache/phoenix/parse/PFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.util.List;
2323

2424
import org.apache.hadoop.hbase.HConstants;
25-
import org.apache.hadoop.hbase.util.ByteStringer;
25+
import org.apache.phoenix.compat.hbase.ByteStringer;
2626
import org.apache.phoenix.coprocessor.generated.PFunctionProtos;
2727
import org.apache.phoenix.coprocessor.generated.PFunctionProtos.PFunctionArg;
2828
import org.apache.phoenix.expression.LiteralExpression;

‎phoenix-core-client/src/main/java/org/apache/phoenix/protobuf/ProtobufUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.apache.hadoop.hbase.ipc.ServerRpcController;
2929
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto;
3030
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType;
31-
import org.apache.hadoop.hbase.util.ByteStringer;
3231
import org.apache.hadoop.util.StringUtils;
32+
import org.apache.phoenix.compat.hbase.ByteStringer;
3333
import org.apache.phoenix.coprocessor.generated.ChildLinkMetaDataProtos.CreateViewAddChildLinkRequest;
3434
import org.apache.phoenix.coprocessor.generated.MetaDataProtos;
3535
import org.apache.phoenix.coprocessor.generated.PTableProtos;

‎phoenix-core-client/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,12 @@
181181
import org.apache.hadoop.hbase.security.AccessDeniedException;
182182
import org.apache.hadoop.hbase.security.User;
183183
import org.apache.hadoop.hbase.snapshot.SnapshotCreationException;
184-
import org.apache.hadoop.hbase.util.ByteStringer;
185184
import org.apache.hadoop.hbase.util.Bytes;
186185
import org.apache.hadoop.hbase.util.Pair;
187186
import org.apache.hadoop.hbase.util.VersionInfo;
188187
import org.apache.hadoop.hbase.zookeeper.ZKConfig;
189188
import org.apache.hadoop.ipc.RemoteException;
189+
import org.apache.phoenix.compat.hbase.ByteStringer;
190190
import org.apache.phoenix.compile.MutationPlan;
191191
import org.apache.phoenix.coprocessor.generated.ChildLinkMetaDataProtos.ChildLinkMetaDataService;
192192
import org.apache.phoenix.coprocessor.generated.MetaDataProtos;

‎phoenix-core-client/src/main/java/org/apache/phoenix/schema/PColumnImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.phoenix.schema;
1919

2020
import org.apache.hadoop.hbase.HConstants;
21-
import org.apache.hadoop.hbase.util.ByteStringer;
21+
import org.apache.phoenix.compat.hbase.ByteStringer;
2222
import org.apache.phoenix.coprocessor.generated.PTableProtos;
2323
import org.apache.phoenix.query.QueryConstants;
2424
import org.apache.phoenix.schema.types.PDataType;

‎phoenix-core-client/src/main/java/org/apache/phoenix/schema/PTableImpl.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
import org.apache.hadoop.hbase.client.Mutation;
6060
import org.apache.hadoop.hbase.client.Put;
6161
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
62-
import org.apache.hadoop.hbase.util.ByteStringer;
6362
import org.apache.hadoop.hbase.util.Bytes;
6463
import org.apache.hadoop.hbase.util.Pair;
64+
import org.apache.phoenix.compat.hbase.ByteStringer;
6565
import org.apache.phoenix.compile.ExpressionCompiler;
6666
import org.apache.phoenix.compile.FromCompiler;
6767
import org.apache.phoenix.compile.QueryPlan;
@@ -141,7 +141,6 @@
141141
import org.apache.hadoop.hbase.client.Mutation;
142142
import org.apache.hadoop.hbase.client.Put;
143143
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
144-
import org.apache.hadoop.hbase.util.ByteStringer;
145144
import org.apache.hadoop.hbase.util.Bytes;
146145
import org.apache.hadoop.hbase.util.Pair;
147146
import org.apache.phoenix.compile.ExpressionCompiler;

‎phoenix-core-client/src/main/java/org/apache/phoenix/schema/transform/TransformMaintainer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import org.apache.hadoop.hbase.client.Delete;
2525
import org.apache.hadoop.hbase.client.Put;
2626
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
27-
import org.apache.hadoop.hbase.util.ByteStringer;
2827
import org.apache.hadoop.hbase.util.Pair;
2928
import org.apache.hadoop.io.WritableUtils;
29+
import org.apache.phoenix.compat.hbase.ByteStringer;
3030
import org.apache.phoenix.coprocessor.generated.ServerCachingProtos;
3131
import org.apache.phoenix.expression.Expression;
3232
import org.apache.phoenix.expression.ExpressionType;

‎phoenix-core-client/src/main/java/org/apache/phoenix/util/ValidateLastDDLTimestampUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.apache.hadoop.hbase.HConstants;
2929
import org.apache.hadoop.hbase.ServerName;
3030
import org.apache.hadoop.hbase.client.Admin;
31-
import org.apache.hadoop.hbase.util.ByteStringer;
31+
import org.apache.phoenix.compat.hbase.ByteStringer;
3232
import org.apache.phoenix.coprocessor.generated.RegionServerEndpointProtos;
3333
import org.apache.phoenix.exception.StaleMetadataCacheException;
3434
import org.apache.phoenix.jdbc.PhoenixConnection;

0 commit comments

Comments
 (0)