diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java index c02fcee..46b13b1 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTableInterface.java @@ -462,7 +462,6 @@ public interface HTableInterface extends Closeable { * @param row The row key used to identify the remote region location * @return A CoprocessorRpcChannel instance */ - @InterfaceAudience.Private // TODO add coproc audience level CoprocessorRpcChannel coprocessorService(byte[] row); /** @@ -486,7 +485,6 @@ public interface HTableInterface extends Closeable { * {@link org.apache.hadoop.hbase.client.coprocessor.Batch.Call#call} method * @return a map of result values keyed by region name */ - @InterfaceAudience.Private // TODO add coproc audience level Map coprocessorService(final Class service, byte[] startKey, byte[] endKey, final Batch.Call callable) throws ServiceException, Throwable; @@ -518,7 +516,6 @@ public interface HTableInterface extends Closeable { * @param Return type for the {@code callable} parameter's * {@link org.apache.hadoop.hbase.client.coprocessor.Batch.Call#call} method */ - @InterfaceAudience.Private // TODO add coproc audience level void coprocessorService(final Class service, byte[] startKey, byte[] endKey, final Batch.Call callable, final Batch.Callback callback) throws ServiceException, Throwable; @@ -622,7 +619,6 @@ public interface HTableInterface extends Closeable { * @throws Throwable * @return a map of result values keyed by region name */ - @InterfaceAudience.Private Map batchCoprocessorService( Descriptors.MethodDescriptor methodDescriptor, Message request, byte[] startKey, byte[] endKey, R responsePrototype) throws ServiceException, Throwable; @@ -658,7 +654,6 @@ public interface HTableInterface extends Closeable { * @throws ServiceException * @throws Throwable */ - @InterfaceAudience.Private void batchCoprocessorService(Descriptors.MethodDescriptor methodDescriptor, Message request, byte[] startKey, byte[] endKey, R responsePrototype, Batch.Callback callback) throws ServiceException, Throwable; diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java index 41d7b65..f29ba82 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/coprocessor/Batch.java @@ -21,14 +21,10 @@ package org.apache.hadoop.hbase.client.coprocessor; import java.io.IOException; -import org.apache.hadoop.classification.InterfaceAudience; - - /** * A collection of interfaces and utilities used for interacting with custom RPC * interfaces exposed by Coprocessors. */ -@InterfaceAudience.Private public abstract class Batch { /** * Defines a unit of work to be executed. @@ -37,9 +33,7 @@ public abstract class Batch { * When used with * {@link org.apache.hadoop.hbase.client.HTable#coprocessorService(Class, byte[], byte[], org.apache.hadoop.hbase.client.coprocessor.Batch.Call)} * the implementations {@link Batch.Call#call(Object)} method will be invoked - * with a proxy to the - * {@link org.apache.hadoop.hbase.coprocessor.CoprocessorService} - * sub-type instance. + * with a proxy to each region's coprocessor {@link com.google.protobuf.Service} implementation. *

* @see org.apache.hadoop.hbase.client.coprocessor * @see org.apache.hadoop.hbase.client.HTable#coprocessorService(byte[]) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java index b998d41..99cfdc5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java @@ -18,6 +18,9 @@ package org.apache.hadoop.hbase.ipc; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.hbase.protobuf.ResponseConverter; + import com.google.protobuf.BlockingRpcChannel; import com.google.protobuf.Descriptors; import com.google.protobuf.Message; @@ -28,20 +31,20 @@ import com.google.protobuf.Service; import com.google.protobuf.ServiceException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.hbase.protobuf.ResponseConverter; import java.io.IOException; /** * Base class which provides clients with an RPC connection to - * call coprocessor endpoint {@link Service}s + * call coprocessor endpoint {@link Service}s. Note that clients should not use this class + * directly, except through + * {@link org.apache.hadoop.hbase.client.HTableInterface#coprocessorService(byte[])}. */ -@InterfaceAudience.Private public abstract class CoprocessorRpcChannel implements RpcChannel, BlockingRpcChannel { private static Log LOG = LogFactory.getLog(CoprocessorRpcChannel.class); @Override + @InterfaceAudience.Private public void callMethod(Descriptors.MethodDescriptor method, RpcController controller, Message request, Message responsePrototype, @@ -59,6 +62,7 @@ public abstract class CoprocessorRpcChannel implements RpcChannel, BlockingRpcCh } @Override + @InterfaceAudience.Private public Message callBlockingMethod(Descriptors.MethodDescriptor method, RpcController controller, Message request, Message responsePrototype)