Skip to content

HBASE-30033 Scan.setFilter() should validate against existing batch setting #7988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mini666 wants to merge 4 commits into
base: master
Choose a base branch
from
+37 −0
Open

HBASE-30033 Scan.setFilter() should validate against existing batch setting #7988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
853f630
HBASE-30033 Scan.setFilter() should validate against existing batch s…
mini666 Mar 27, 2026
a49a095
HBASE-30033 Add tests for setFilter() batch validation
mini666 Mar 27, 2026
daef05b
HBASE-30033 Add test for setFilter(null) with batch set
juke-mini666 Mar 27, 2026
314b8af
HBASE-30033 Use assertThrows instead of @Test(expected)
juke-mini666 Mar 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions hbase-client/src/main/java/org/apache/hadoop/hbase/client/Scan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,10 @@ public Scan setMaxResultSize(long maxResultSize) {

@Override
public Scan setFilter(Filter filter) {
if (filter != null && filter.hasFilterRow() && this.batch > 0) {
throw new IncompatibleFilterException(
"Cannot set a filter that returns true for filter.hasFilterRow on a scan with batch set");
}
super.setFilter(filter);
return this;
}
Expand Down
33 changes: 33 additions & 0 deletions hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.fail;

import java.io.IOException;
Expand All @@ -29,6 +30,8 @@
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.client.Scan.ReadType;
import org.apache.hadoop.hbase.filter.FilterList;
import org.apache.hadoop.hbase.filter.IncompatibleFilterException;
import org.apache.hadoop.hbase.filter.PageFilter;
import org.apache.hadoop.hbase.security.access.Permission;
import org.apache.hadoop.hbase.security.visibility.Authorizations;
import org.apache.hadoop.hbase.testclassification.ClientTests;
Expand Down Expand Up @@ -254,6 +257,36 @@ public void testScanCopyConstructor() throws Exception {
"Make sure copy constructor adds all the fields in the copied object");
}

@Test
public void testSetFilterWithBatchThrows() {
Scan scan = new Scan();
scan.setBatch(5);
assertThrows(IncompatibleFilterException.class, () -> scan.setFilter(new PageFilter(10)));
}

@Test
public void testSetFilterWithoutBatchDoesNotThrow() {
Scan scan = new Scan();
scan.setFilter(new PageFilter(10));
// no exception expected
}

@Test
public void testSetFilterWithBatchAndNonFilterRowFilter() {
Scan scan = new Scan();
scan.setBatch(5);
scan.setFilter(new FilterList());
// FilterList.hasFilterRow() returns false, so no exception expected
}

@Test
public void testSetFilterWithBatchAndNullFilter() {
Scan scan = new Scan();
scan.setBatch(5);
scan.setFilter(null);
// null filter should not throw
}

@Test
public void testScanReadType() throws Exception {
Scan scan = new Scan();
Expand Down
Loading