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 2025/02/28 16:36:32 UTC

(hbase) branch branch-2.6 updated (59f04912284 -> 06951692295)

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a change to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git


    from 59f04912284 HBASE-29093 Load userSnapshots.jsp only on master status page (#6697)
     new ade8d386d09 HBASE-29107 shell: Improve 'count' performance (#6656)
     new 06951692295 HBASE-29066 Fix NPE in rits.jsp when regions are not open (#6594)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../hbase/master/assignment/RegionStateNode.java   |  8 ++++
 .../main/resources/hbase-webapps/master/rits.jsp   | 45 ++++++++++++----------
 hbase-shell/src/main/ruby/hbase/table.rb           | 29 +++++++-------
 hbase-shell/src/main/ruby/shell/commands/count.rb  | 11 +-----
 4 files changed, 47 insertions(+), 46 deletions(-)


(hbase) 01/02: HBASE-29107 shell: Improve 'count' performance (#6656)

Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit ade8d386d099fb8facd798fe8bb8554b16f94b8a
Author: Junegunn Choi <ju...@gmail.com>
AuthorDate: Sat Mar 1 01:05:53 2025 +0900

    HBASE-29107 shell: Improve 'count' performance (#6656)
    
    Signed-off-by: Duo Zhang <zh...@apache.org>
    Signed-off-by: Nihal Jain <ni...@apache.org>
    Signed-off-by: Viraj Jasani <vj...@apache.org>
    (cherry picked from commit 8785122141ebf96d1e50530e60cdae0c83cff0b4)
---
 hbase-shell/src/main/ruby/hbase/table.rb          | 29 ++++++++++-------------
 hbase-shell/src/main/ruby/shell/commands/count.rb | 11 ++-------
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/hbase-shell/src/main/ruby/hbase/table.rb b/hbase-shell/src/main/ruby/hbase/table.rb
index 0461f497d0f..73c39532b82 100644
--- a/hbase-shell/src/main/ruby/hbase/table.rb
+++ b/hbase-shell/src/main/ruby/hbase/table.rb
@@ -321,24 +321,21 @@ EOF
     def _count_internal(interval = 1000, scan = nil, cacheBlocks=false)
       raise(ArgumentError, 'Scan argument should be org.apache.hadoop.hbase.client.Scan') \
         unless scan.nil? || scan.is_a?(org.apache.hadoop.hbase.client.Scan)
-      # We can safely set scanner caching with the first key only filter
 
-      if scan.nil?
-        scan = org.apache.hadoop.hbase.client.Scan.new
-        scan.setCacheBlocks(cacheBlocks)
-        scan.setCaching(10)
-        scan.setFilter(org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter.new)
-      else
-        scan.setCacheBlocks(cacheBlocks)
-        filter = scan.getFilter
-        firstKeyOnlyFilter = org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter.new
-        if filter.nil?
-          scan.setFilter(firstKeyOnlyFilter)
-        else
-          firstKeyOnlyFilter.setReversed(filter.isReversed)
-          scan.setFilter(org.apache.hadoop.hbase.filter.FilterList.new(filter, firstKeyOnlyFilter))
-        end
+      scan ||= org.apache.hadoop.hbase.client.Scan.new
+      scan.setCacheBlocks(cacheBlocks)
+
+      # Optimize counting by using FirstKeyOnlyFilter and KeyOnlyFilter
+      filters = [
+        org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter.new,
+        org.apache.hadoop.hbase.filter.KeyOnlyFilter.new
+      ]
+      filter = scan.getFilter
+      if filter
+        filters.each { |f| f.setReversed(filter.isReversed) }
+        filters = [filter, *filters]
       end
+      scan.setFilter(org.apache.hadoop.hbase.filter.FilterList.new(filters))
 
       # Run the scanner
       scanner = @table.getScanner(scan)
diff --git a/hbase-shell/src/main/ruby/shell/commands/count.rb b/hbase-shell/src/main/ruby/shell/commands/count.rb
index 70523588231..c850c712338 100644
--- a/hbase-shell/src/main/ruby/shell/commands/count.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/count.rb
@@ -25,16 +25,12 @@ module Shell
 Count the number of rows in a table.  Return value is the number of rows.
 This operation may take a LONG time (Run '$HADOOP_HOME/bin/hadoop jar
 hbase.jar rowcount' to run a counting mapreduce job). Current count is shown
-every 1000 rows by default. Count interval may be optionally specified. Scan
-caching is enabled on count scans by default. Default cache size is 10 rows.
-If your rows are small in size, you may want to increase this
-parameter. Examples:
+every 1000 rows by default. Count interval may be optionally specified.
+Examples:
 
  hbase> count 'ns1:t1'
  hbase> count 't1'
  hbase> count 't1', INTERVAL => 100000
- hbase> count 't1', CACHE => 1000
- hbase> count 't1', INTERVAL => 10, CACHE => 1000
  hbase> count 't1', FILTER => "
     (QualifierFilter (>=, 'binary:xyz')) AND (TimestampsFilter ( 123, 456))"
  hbase> count 't1', COLUMNS => ['c1', 'c2'], STARTROW => 'abc', STOPROW => 'xyz'
@@ -44,8 +40,6 @@ t to table 't1', the corresponding commands would be:
 
  hbase> t.count
  hbase> t.count INTERVAL => 100000
- hbase> t.count CACHE => 1000
- hbase> t.count INTERVAL => 10, CACHE => 1000
  hbase> t.count FILTER => "
     (QualifierFilter (>=, 'binary:xyz')) AND (TimestampsFilter ( 123, 456))"
  hbase> t.count COLUMNS => ['c1', 'c2'], STARTROW => 'abc', STOPROW => 'xyz'
@@ -85,7 +79,6 @@ EOF
         # Merge params with defaults
         params = {
           'INTERVAL' => 1000,
-          'CACHE' => 10,
           'CACHE_BLOCKS' => false
         }.merge(params)
 


(hbase) 02/02: HBASE-29066 Fix NPE in rits.jsp when regions are not open (#6594)

Posted by zh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 0695169229537b6494f30d8d85dab127d7d612d0
Author: Junegunn Choi <ju...@gmail.com>
AuthorDate: Sat Mar 1 01:07:02 2025 +0900

    HBASE-29066 Fix NPE in rits.jsp when regions are not open (#6594)
    
    Signed-off-by: Duo Zhang <zh...@apache.org>
    (cherry picked from commit fd50561a099a5b3b44b209d5b806e70f24c2aa9c)
---
 .../hbase/master/assignment/RegionStateNode.java   |  8 ++++
 .../main/resources/hbase-webapps/master/rits.jsp   | 45 ++++++++++++----------
 2 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateNode.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateNode.java
index 91c0222facd..c00f8c367ad 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateNode.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateNode.java
@@ -244,6 +244,14 @@ public class RegionStateNode implements Comparable<RegionStateNode> {
     return regionLocation;
   }
 
+  public String getRegionServerName() {
+    ServerName sn = getRegionLocation();
+    if (sn != null) {
+      return sn.getServerName();
+    }
+    return null;
+  }
+
   public State getState() {
     return state;
   }
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
index 3fc960ee0c6..b08c4a37f87 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/rits.jsp
@@ -97,7 +97,7 @@
                 <td><%= regionStateNode.getRegionInfo().getEncodedName() %></td>
                 <td><%= regionStateNode.getRegionInfo().getTable() %></td>
                 <td><%= regionStateNode.getState() %></td>
-                <td><%= regionStateNode.getRegionLocation().getServerName() %></td>
+                <td><%= regionStateNode.getRegionServerName() %></td>
                 <%
                     TransitRegionStateProcedure procedure = regionStateNode.getProcedure();
 
@@ -123,27 +123,30 @@
 </div>
 <jsp:include page="footer.jsp" />
 <% } else if (format.equals("json")) { %>
-<%
-    Gson GSON = GsonUtil.createGson().create();
-    Map<String, List<Map<String, Object>>> map = new HashMap<>();
-    List<Map<String, Object>> rits = new ArrayList<>();
-    map.put("rits", rits);
-    for (RegionStateNode regionStateNode : rit) {
-        Map<String, Object> r = new HashMap<>();
-        r.put("region", regionStateNode.getRegionInfo().getEncodedName());
-        r.put("table", regionStateNode.getRegionInfo().getTable().getNameAsString());
-        r.put("state", regionStateNode.getState());
-        r.put("server", regionStateNode.getRegionLocation().getServerName());
-        TransitRegionStateProcedure procedure = regionStateNode.getProcedure();
-        if (procedure != null) {
-          r.put("procedureId", procedure.getProcId());
-          r.put("procedureState", procedure.getState().toString());
+    <%
+        Gson GSON = GsonUtil.createGson().create();
+        Map<String, List<Map<String, Object>>> map = new HashMap<>();
+        List<Map<String, Object>> rits = new ArrayList<>();
+        map.put("rits", rits);
+        for (RegionStateNode regionStateNode : rit) {
+            Map<String, Object> r = new HashMap<>();
+            r.put("region", regionStateNode.getRegionInfo().getEncodedName());
+            r.put("table", regionStateNode.getRegionInfo().getTable().getNameAsString());
+            r.put("state", regionStateNode.getState());
+            r.put("server", regionStateNode.getRegionServerName());
+
+            TransitRegionStateProcedure procedure = regionStateNode.getProcedure();
+            if (procedure != null) {
+                r.put("procedureId", procedure.getProcId());
+                r.put("procedureState", procedure.getState().toString());
+            }
+
+            RegionState rs = regionStateNode.toRegionState();
+            r.put("startTime", rs.getStamp());
+            r.put("duration", System.currentTimeMillis() - rs.getStamp());
+
+            rits.add(r);
         }
-        RegionState rs = regionStateNode.toRegionState();
-        r.put("startTime", rs.getStamp());
-        r.put("duration", System.currentTimeMillis() - rs.getStamp());
-        rits.add(r);
-      }
     %>
     <%= GSON.toJson(map) %>
 <% } else { %>