Skip to content

Commit 963e82c

Browse files
committed
Updated usage of filterRowKey() to align with HBase 3 API changes
1 parent 7be87f0 commit 963e82c

File tree

9 files changed

+9
-81
lines changed

9 files changed

+9
-81
lines changed

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/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/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-server/src/main/java/org/apache/phoenix/coprocessor/SuffixFilter.java

-72
This file was deleted.

phoenix-core/src/test/java/org/apache/phoenix/filter/SkipScanFilterTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ public SeekNext(byte[] rowkey, byte[] hint) {
646646
KeyValue kv = KeyValueUtil.createFirstOnRow(rowkey);
647647
skipper.reset();
648648
assertFalse(skipper.filterAllRemaining());
649-
assertFalse(skipper.filterRowKey(kv.getBuffer(), kv.getRowOffset(), kv.getRowLength()));
649+
assertFalse(skipper.filterRowKey(kv));
650650

651651
assertEquals(ReturnCode.SEEK_NEXT_USING_HINT, skipper.filterCell(kv));
652652
assertEquals(KeyValueUtil.createFirstOnRow(hint), skipper.getNextCellHint(kv));
@@ -672,7 +672,7 @@ public Include(byte[] rowkey) {
672672
KeyValue kv = KeyValueUtil.createFirstOnRow(rowkey);
673673
skipper.reset();
674674
assertFalse(skipper.filterAllRemaining());
675-
assertFalse(skipper.filterRowKey(kv.getBuffer(), kv.getRowOffset(), kv.getRowLength()));
675+
assertFalse(skipper.filterRowKey(kv));
676676
assertEquals(kv.toString(), ReturnCode.INCLUDE_AND_NEXT_COL, skipper.filterCell(kv));
677677
}
678678

0 commit comments

Comments
 (0)