Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-13484 Fix HBase_2_ClientService.getResults methods, so they properly return a single row when startRow and endRow/stopRow are the same. 

This closes #9029.

Signed-off-by: Peter Turcsanyi <turcsanyi@apache.org>
This commit is contained in:
tpalfy 2024-07-03 17:03:37 +02:00 committed by Peter Turcsanyi
parent f5476ca3b4
commit 057e02e698
No known key found for this signature in database
GPG Key ID: 55A813F1C3E553DC
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nifi-extension-bundles/nifi-standard-services/nifi-hbase_2-client-service-bundle/nifi-hbase_2-client-service/src/main/java/org/apache/nifi/hbase/HBase_2_ClientService.java
View File

@ -21,6 +21,7 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@ -745,7 +746,13 @@ public class HBase_2_ClientService extends AbstractControllerService implements
scan = scan.withStartRow(startRow.getBytes(StandardCharsets.UTF_8));
}
if (!StringUtils.isBlank(endRow)) {
scan = scan.withStopRow(endRow.getBytes(StandardCharsets.UTF_8));
byte[] endRowBytes = endRow.getBytes(StandardCharsets.UTF_8);
if (endRow.equals(startRow)) {
scan = scan.withStopRow(endRowBytes, true);
} else {
scan = scan.withStopRow(endRowBytes, false);
}
}
if (authorizations != null && authorizations.size() > 0) {
@ -792,7 +799,12 @@ public class HBase_2_ClientService extends AbstractControllerService implements
protected ResultScanner getResults(final Table table, final byte[] startRow, final byte[] endRow, final Collection<Column> columns, List<String> authorizations) throws IOException {
Scan scan = new Scan();
scan = scan.withStartRow(startRow);
scan = scan.withStopRow(endRow);
if (Arrays.equals(startRow, endRow)) {
scan = scan.withStopRow(endRow, true);
} else {
scan = scan.withStopRow(endRow, false);
}
if (authorizations != null && authorizations.size() > 0) {
scan.setAuthorizations(new Authorizations(authorizations));