Merge pull request #760 from georgehao/refact-seri

feat: delete dubbo_protocol assert remoting.ExchangeClient
apache · Sep 17, 2020 · cb290c9 · cb290c9
2 parents 1e033d2 + 2d5b004
commit cb290c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 18 deletions.
diff --git a/protocol/dubbo/dubbo_protocol.go b/protocol/dubbo/dubbo_protocol.go
@@ -48,8 +48,8 @@ const (
 var (
 	// Make the connection can be shared.
 	// It will create one connection for one address (ip+port)
-	exchangeClientMap *sync.Map = new(sync.Map)
-	exchangeLock      *sync.Map = new(sync.Map)
+	exchangeClientMap = new(sync.Map)
+	exchangeLock      = new(sync.Map)
 )
 
 func init() {
@@ -215,17 +215,7 @@ func getExchangeClient(url common.URL) *remoting.ExchangeClient {
 	if clientTmp == nil {
 		return nil
 	}
-	exchangeClient, ok := clientTmp.(*remoting.ExchangeClient)
-	if !ok {
-		exchangeClientTmp := remoting.NewExchangeClient(url, getty.NewClient(getty.Options{
-			ConnectTimeout: config.GetConsumerConfig().ConnectTimeout,
-			RequestTimeout: config.GetConsumerConfig().RequestTimeout}), config.GetConsumerConfig().ConnectTimeout, false)
-		if exchangeClientTmp != nil {
-			exchangeClientMap.Store(url.Location, exchangeClientTmp)
-		}
-		return exchangeClientTmp
-	}
-	return exchangeClient
+	return clientTmp.(*remoting.ExchangeClient)
 }
 
 // rebuildCtx rebuild the context by attachment.

diff --git a/protocol/jsonrpc/jsonrpc_invoker.go b/protocol/jsonrpc/jsonrpc_invoker.go
@@ -26,7 +26,6 @@ import (
 	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/common/logger"
 	"github.com/apache/dubbo-go/protocol"
-
 	invocation_impl "github.com/apache/dubbo-go/protocol/invocation"
 )
 

diff --git a/remoting/getty/getty_server.go b/remoting/getty/getty_server.go
@@ -95,15 +95,15 @@ func GetServerConfig() ServerConfig {
 	return *srvConf
 }
 
-// SetServerGrpool ...
+// SetServerGrpool set getty server GrPool
 func SetServerGrpool() {
 	if srvConf.GrPoolSize > 1 {
 		srvGrpool = gxsync.NewTaskPool(gxsync.WithTaskPoolTaskPoolSize(srvConf.GrPoolSize), gxsync.WithTaskPoolTaskQueueLength(srvConf.QueueLen),
 			gxsync.WithTaskPoolTaskQueueNumber(srvConf.QueueNumber))
 	}
 }
 
-// Server ...
+// Server define getty server
 type Server struct {
 	conf           ServerConfig
 	addr           string
@@ -113,7 +113,7 @@ type Server struct {
 	requestHandler func(*invocation.RPCInvocation) protocol.RPCResult
 }
 
-// NewServer ...
+// NewServer create a new Server
 func NewServer(url common.URL, handlers func(*invocation.RPCInvocation) protocol.RPCResult) *Server {
 	//init
 	initServer(url.Protocol)
@@ -210,7 +210,7 @@ func (s *Server) Start() {
 
 }
 
-// Stop ...
+// Stop dubbo server
 func (s *Server) Stop() {
 	s.tcpServer.Close()
 }