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 2023/05/08 13:32:34 UTC

[hbase] branch master updated: HBASE-27844 changed type names to avoid conflicts with built-in types (#5223)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new d49df8b7a96 HBASE-27844 changed type names to avoid conflicts with built-in types (#5223)
d49df8b7a96 is described below

commit d49df8b7a96cbeca60c09f837f2cd4f2067f9ddf
Author: Ruanhui <32...@users.noreply.github.com>
AuthorDate: Mon May 8 21:32:21 2023 +0800

    HBASE-27844 changed type names to avoid conflicts with built-in types (#5223)
    
    Co-authored-by: huiruan <87...@qq.com>
    Signed-off-by: Duo Zhang <zh...@apache.org>
---
 .../main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 317db10c095..6daae10b726 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -207,7 +207,6 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos.Reg
 import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos.RegionStoreSequenceIds;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.ClusterStatusProtos.UserLoad;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.Coprocessor;
-import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.Coprocessor.Builder;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NameStringPair;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionServerInfo;
 import org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.RegionSpecifier;
@@ -1188,7 +1187,7 @@ public class HRegionServer extends HBaseServerBase<RSRpcServices>
     serverLoad.setReadRequestsCount(this.metricsRegionServerImpl.getReadRequestsCount());
     serverLoad.setWriteRequestsCount(this.metricsRegionServerImpl.getWriteRequestsCount());
     Set<String> coprocessors = getWAL(null).getCoprocessorHost().getCoprocessors();
-    Builder coprocessorBuilder = Coprocessor.newBuilder();
+    Coprocessor.Builder coprocessorBuilder = Coprocessor.newBuilder();
     for (String coprocessor : coprocessors) {
       serverLoad.addCoprocessors(coprocessorBuilder.setName(coprocessor).build());
     }