Refactor:当filter数量为0时不去创建InvokerDelegate

songxinjianqwe · Aug 24, 2018 · e398e4e · e398e4e
1 parent 4c051b8
commit e398e4e
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 12 deletions.
diff --git a/...ark/benchmark-base/src/main/java/com/sinjinsong/benchmark/base/client/AbstractClient.java b/...ark/benchmark-base/src/main/java/com/sinjinsong/benchmark/base/client/AbstractClient.java
@@ -73,9 +73,9 @@ public void run(int threads, int requestsTotal, int measurementIterations) {
         this.executorService = Executors.newFixedThreadPool(threads);
         this.measurementIterations = measurementIterations;
         createUser();
-        existUser();
-        getUser();
-        listUser();
+//        existUser();
+//        getUser();
+//        listUser();
     }
 
     @Data

diff --git a/benchmark/toy-rpc-client/src/main/resources/application.properties b/benchmark/toy-rpc-client/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 rpc.application.name=benchmark_consumer
-rpc.application.serialize=json
-rpc.application.proxy=javassist
+rpc.application.serialize=protostuff
+rpc.application.proxy=jdk
 rpc.protocol.type=toy
 rpc.protocol.executor.server.type=threadpool
 rpc.protocol.executor.client.type=threadpool

diff --git a/benchmark/toy-rpc-client/src/main/resources/logback-spring.xml b/benchmark/toy-rpc-client/src/main/resources/logback-spring.xml
@@ -23,7 +23,7 @@
     </appender>
 
 
-    <logger name="com.sinjinsong.benchmark" level="INFO" additivity="false">
+    <logger name="com.sinjinsong" level="INFO" additivity="false">
         <appender-ref ref="consoleAppender"/>
         <appender-ref ref="fileAppender"/>
     </logger>

diff --git a/benchmark/toy-rpc-server/src/main/resources/application.properties b/benchmark/toy-rpc-server/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 rpc.application.name=benchmark_provider
-rpc.application.serialize=json
-rpc.application.proxy=javassist
+rpc.application.serialize=protostuff
+rpc.application.proxy=jdk
 rpc.protocol.type=toy
 rpc.protocol.port=8000
 rpc.protocol.executor.server.type=threadpool

diff --git a/benchmark/toy-rpc-server/src/main/resources/logback-spring.xml b/benchmark/toy-rpc-server/src/main/resources/logback-spring.xml
@@ -23,7 +23,7 @@
     </appender>
 
 
-    <logger name="com.sinjinsong.benchmark" level="INFO" additivity="false">
+    <logger name="com.sinjinsong" level="INFO" additivity="false">
         <appender-ref ref="consoleAppender"/>
         <appender-ref ref="fileAppender"/>
     </logger>

diff --git a/toy-rpc-core/src/main/java/com/sinjinsong/toy/protocol/http/HttpProtocol.java b/toy-rpc-core/src/main/java/com/sinjinsong/toy/protocol/http/HttpProtocol.java
@@ -4,6 +4,7 @@
 import com.sinjinsong.toy.common.exception.RPCException;
 import com.sinjinsong.toy.config.ReferenceConfig;
 import com.sinjinsong.toy.config.ServiceConfig;
+import com.sinjinsong.toy.filter.Filter;
 import com.sinjinsong.toy.protocol.api.Exporter;
 import com.sinjinsong.toy.protocol.api.Invoker;
 import com.sinjinsong.toy.protocol.api.support.AbstractRemoteProtocol;
@@ -16,6 +17,7 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.List;
 
 /**
  * @author sinjinsong
@@ -49,7 +51,12 @@ public <T> Invoker<T> refer(ReferenceConfig<T> referenceConfig, ServiceURL servi
         invoker.setInterfaceName(referenceConfig.getInterfaceName());
         invoker.setClient(initClient(serviceURL));
         invoker.setGlobalConfig(getGlobalConfig());
-        return invoker.buildFilterChain(referenceConfig.getFilters());
+        List<Filter> filters = referenceConfig.getFilters();
+        if(filters.size() == 0) {
+            return invoker;
+        }else {
+            return invoker.buildFilterChain(filters);
+        }
     }
 
     @Override

diff --git a/toy-rpc-core/src/main/java/com/sinjinsong/toy/protocol/toy/ToyProtocol.java b/toy-rpc-core/src/main/java/com/sinjinsong/toy/protocol/toy/ToyProtocol.java
@@ -4,6 +4,7 @@
 import com.sinjinsong.toy.common.exception.RPCException;
 import com.sinjinsong.toy.config.ReferenceConfig;
 import com.sinjinsong.toy.config.ServiceConfig;
+import com.sinjinsong.toy.filter.Filter;
 import com.sinjinsong.toy.protocol.api.Exporter;
 import com.sinjinsong.toy.protocol.api.Invoker;
 import com.sinjinsong.toy.protocol.api.support.AbstractRemoteProtocol;
@@ -16,6 +17,7 @@
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.List;
 
 /**
  * @author sinjinsong
@@ -47,7 +49,12 @@ public <T> Invoker<T> refer(ReferenceConfig<T> referenceConfig, ServiceURL servi
         invoker.setInterfaceName(referenceConfig.getInterfaceName());
         invoker.setGlobalConfig(getGlobalConfig());
         invoker.setClient(initClient(serviceURL));
-        return invoker.buildFilterChain(referenceConfig.getFilters());
+        List<Filter> filters = referenceConfig.getFilters();
+        if (filters.size() == 0) {
+            return invoker;
+        } else {
+            return invoker.buildFilterChain(filters);
+        }
     }
 
     @Override

diff --git a/toy-rpc-core/src/main/java/com/sinjinsong/toy/transport/api/support/RPCTaskRunner.java b/toy-rpc-core/src/main/java/com/sinjinsong/toy/transport/api/support/RPCTaskRunner.java
@@ -79,7 +79,7 @@ private Object handle(RPCRequest request) throws Throwable {
 
         Method method = serviceClass.getMethod(methodName, parameterTypes);
         method.setAccessible(true);
-
+        
         // 针对callback参数，要将其设置为代理对象
         if (serviceConfig.isCallback()) {
             Class<?> interfaceClass = parameterTypes[serviceConfig.getCallbackParamIndex()];