This is an automated email from the ASF dual-hosted git repository. yukon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq-remoting.git
commit c45570c0fe64f8949ba00c969870b271be5052b3 Author: yukon <[email protected]> AuthorDate: Thu May 16 14:28:26 2019 +0800 Use short as request code --- .../org/apache/rocketmq/remoting/api/RemotingService.java | 8 ++++---- .../rocketmq/remoting/impl/netty/NettyRemotingAbstract.java | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/remoting-core/remoting-api/src/main/java/org/apache/rocketmq/remoting/api/RemotingService.java b/remoting-core/remoting-api/src/main/java/org/apache/rocketmq/remoting/api/RemotingService.java index 8802148..57f3743 100644 --- a/remoting-core/remoting-api/src/main/java/org/apache/rocketmq/remoting/api/RemotingService.java +++ b/remoting-core/remoting-api/src/main/java/org/apache/rocketmq/remoting/api/RemotingService.java @@ -25,14 +25,14 @@ import org.apache.rocketmq.remoting.common.Pair; public interface RemotingService extends ConnectionService, ObjectLifecycle { void registerInterceptor(Interceptor interceptor); - void registerRequestProcessor(final String requestCode, final RequestProcessor processor, + void registerRequestProcessor(final short requestCode, final RequestProcessor processor, final ExecutorService executor); - void registerRequestProcessor(final String requestCode, final RequestProcessor processor); + void registerRequestProcessor(final short requestCode, final RequestProcessor processor); - void unregisterRequestProcessor(final String requestCode); + void unregisterRequestProcessor(final short requestCode); - Pair<RequestProcessor, ExecutorService> processor(final String requestCode); + Pair<RequestProcessor, ExecutorService> processor(final short requestCode); String remotingInstanceId(); diff --git a/remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/impl/netty/NettyRemotingAbstract.java b/remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/impl/netty/NettyRemotingAbstract.java index 5026224..d54c71a 100644 --- a/remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/impl/netty/NettyRemotingAbstract.java +++ b/remoting-core/remoting-impl/src/main/java/org/apache/rocketmq/remoting/impl/netty/NettyRemotingAbstract.java @@ -68,7 +68,7 @@ public abstract class NettyRemotingAbstract implements RemotingService { private final Semaphore semaphoreOneway; private final Semaphore semaphoreAsync; private final Map<Integer, ResponseResult> ackTables = new ConcurrentHashMap<Integer, ResponseResult>(256); - private final Map<String, Pair<RequestProcessor, ExecutorService>> processorTables = new ConcurrentHashMap<String, Pair<RequestProcessor, ExecutorService>>(); + private final Map<Short, Pair<RequestProcessor, ExecutorService>> processorTables = new ConcurrentHashMap<>(); private final AtomicLong responseCounter = new AtomicLong(0); private final RemotingCommandFactory remotingCommandFactory; private final String remotingInstanceId = UIDGenerator.instance().createUID(); @@ -132,7 +132,7 @@ public abstract class NettyRemotingAbstract implements RemotingService { } public void processRequestCommand(final ChannelHandlerContext ctx, final RemotingCommand cmd) { - Pair<RequestProcessor, ExecutorService> processorExecutorPair = this.processorTables.get(cmd.opCode()); + Pair<RequestProcessor, ExecutorService> processorExecutorPair = this.processorTables.get(cmd.cmdCode()); RemotingChannel channel = new NettyChannelImpl(ctx.channel()); @@ -496,7 +496,7 @@ public abstract class NettyRemotingAbstract implements RemotingService { } @Override - public void registerRequestProcessor(String requestCode, RequestProcessor processor, ExecutorService executor) { + public void registerRequestProcessor(short requestCode, RequestProcessor processor, ExecutorService executor) { Pair<RequestProcessor, ExecutorService> pair = new Pair<RequestProcessor, ExecutorService>(processor, executor); if (!this.processorTables.containsKey(requestCode)) { this.processorTables.put(requestCode, pair); @@ -504,12 +504,12 @@ public abstract class NettyRemotingAbstract implements RemotingService { } @Override - public void registerRequestProcessor(String requestCode, RequestProcessor processor) { + public void registerRequestProcessor(short requestCode, RequestProcessor processor) { this.registerRequestProcessor(requestCode, processor, publicExecutor); } @Override - public void unregisterRequestProcessor(String requestCode) { + public void unregisterRequestProcessor(short requestCode) { this.processorTables.remove(requestCode); } @@ -529,7 +529,7 @@ public abstract class NettyRemotingAbstract implements RemotingService { } @Override - public Pair<RequestProcessor, ExecutorService> processor(String requestCode) { + public Pair<RequestProcessor, ExecutorService> processor(short requestCode) { return processorTables.get(requestCode); }
