You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2024/04/25 14:04:16 UTC
(hbase) branch branch-2 updated: HBASE-28518 Allow specifying a filter for the REST multiget endpoint (addendum: add back SCAN_FILTER constant) (#5852)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new f3f35fd4732 HBASE-28518 Allow specifying a filter for the REST multiget endpoint (addendum: add back SCAN_FILTER constant) (#5852)
f3f35fd4732 is described below
commit f3f35fd4732272e402d1cbf4b271d919a46b1a8a
Author: Istvan Toth <st...@apache.org>
AuthorDate: Thu Apr 25 15:56:42 2024 +0200
HBASE-28518 Allow specifying a filter for the REST multiget endpoint (addendum: add back SCAN_FILTER constant) (#5852)
Signed-off-by: Duo Zhang <zh...@apache.org>
(cherry picked from commit 4a9f6f2fe7b345891c8d37961e7db661042e0e93)
---
.../src/main/java/org/apache/hadoop/hbase/rest/Constants.java | 6 ++++++
.../main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java | 1 -
.../src/main/java/org/apache/hadoop/hbase/rest/TableResource.java | 1 -
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java
index 71080de07dd..8d606793be6 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/Constants.java
@@ -86,6 +86,12 @@ public interface Constants {
String SCAN_LIMIT = "limit";
String SCAN_FETCH_SIZE = "hbase.rest.scan.fetchsize";
String FILTER = "filter";
+ /**
+ * @deprecated Since 2.4.18/2.5.9/2.6.0, will be removed in 4.0.0. Please use {@link #FILTER}
+ * instead.
+ */
+ @Deprecated
+ String SCAN_FILTER = FILTER;
String FILTER_B64 = "filter_b64";
String SCAN_REVERSED = "reversed";
String SCAN_CACHE_BLOCKS = "cacheblocks";
diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
index 47b3c22a7c9..4c2f6c3216b 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/MultiRowResource.java
@@ -87,7 +87,6 @@ public class MultiRowResource extends ResourceBase implements Constants {
if (paramFilterB64 != null) {
filterBytes = base64Urldecoder.decode(paramFilterB64);
} else if (paramFilter != null) {
- // Not binary clean
filterBytes = paramFilter.getBytes();
}
diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java
index 8bfc0455303..b8543287c89 100644
--- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java
+++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/TableResource.java
@@ -183,7 +183,6 @@ public class TableResource extends ResourceBase {
if (paramFilterB64 != null) {
filterBytes = base64Urldecoder.decode(paramFilterB64);
} else if (paramFilter != null) {
- // Not binary clean
filterBytes = paramFilter.getBytes();
}
if (filterBytes != null) {