Repository: hbase Updated Branches: refs/heads/master b68b3bf78 -> 3851d05a8
HBASE-12237 HBaseZeroCopyByteString#wrap() should not be called in hbase-client code Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3851d05a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3851d05a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3851d05a Branch: refs/heads/master Commit: 3851d05a80cfdebe087faa660ab488da02a6b943 Parents: b68b3bf Author: Ted Yu <te...@apache.org> Authored: Mon Oct 13 17:29:09 2014 +0000 Committer: Ted Yu <te...@apache.org> Committed: Mon Oct 13 17:29:09 2014 +0000 ---------------------------------------------------------------------- .../hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3851d05a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java index ed7a6af..cf22dd5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java @@ -13,7 +13,6 @@ package org.apache.hadoop.hbase.ipc; import java.io.IOException; -import com.google.protobuf.HBaseZeroCopyByteString; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; @@ -23,6 +22,7 @@ import org.apache.hadoop.hbase.client.ClusterConnection; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResponse; +import org.apache.hadoop.hbase.util.ByteStringer; import com.google.protobuf.Descriptors; @@ -55,7 +55,7 @@ public class RegionServerCoprocessorRpcChannel extends CoprocessorRpcChannel { } final ClientProtos.CoprocessorServiceCall call = ClientProtos.CoprocessorServiceCall.newBuilder() - .setRow(HBaseZeroCopyByteString.wrap(HConstants.EMPTY_BYTE_ARRAY)) + .setRow(ByteStringer.wrap(HConstants.EMPTY_BYTE_ARRAY)) .setServiceName(method.getService().getFullName()).setMethodName(method.getName()) .setRequest(request.toByteString()).build(); CoprocessorServiceResponse result =
