HBASE-28518 Allow specifying a filter for the REST multiget endpoint …

…(addendum: add back SCAN_FILTER constant) (#5852) Signed-off-by: Duo Zhang <zhangduo@apache.org> (cherry picked from commit 4a9f6f2)
apache · Apr 25, 2024 · 56d46e7 · 56d46e7
1 parent 7a1bedf
commit 56d46e7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 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
@@ -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
@@ -87,7 +87,6 @@ public Response get(final @Context UriInfo uriInfo,
     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
@@ -183,7 +183,6 @@ public TableScanResource getScanResource(final @PathParam("scanspec") String sca
       if (paramFilterB64 != null) {
         filterBytes = base64Urldecoder.decode(paramFilterB64);
       } else if (paramFilter != null) {
-        // Not binary clean
         filterBytes = paramFilter.getBytes();
       }
       if (filterBytes != null) {