From d89bb1cfd8b1e24321266be488e22dabfd07c380 Mon Sep 17 00:00:00 2001 From: Ruanhui <32773751+frostruan@users.noreply.github.com> Date: Mon, 8 May 2023 21:32:21 +0800 Subject: [PATCH] HBASE-27844 changed type names to avoid conflicts with built-in types (#5223) Co-authored-by: huiruan <876107431@qq.com> Signed-off-by: Duo Zhang (cherry picked from commit d49df8b7a96cbeca60c09f837f2cd4f2067f9ddf) --- .../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 2a6b778cbff..2e36d2efe4e 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 @@ -238,7 +238,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; @@ -1488,7 +1487,7 @@ public class HRegionServer extends Thread serverLoad.setUsedHeapMB((int) (usedMemory / 1024 / 1024)); serverLoad.setMaxHeapMB((int) (maxMemory / 1024 / 1024)); Set coprocessors = getWAL(null).getCoprocessorHost().getCoprocessors(); - Builder coprocessorBuilder = Coprocessor.newBuilder(); + Coprocessor.Builder coprocessorBuilder = Coprocessor.newBuilder(); for (String coprocessor : coprocessors) { serverLoad.addCoprocessors(coprocessorBuilder.setName(coprocessor).build()); }