smallnest#212 remove duplicated unzip

Author: smallnest

client/client.go

@@ -17,7 +17,6 @@ import (
 	"github.com/smallnest/rpcx/log"
 	"github.com/smallnest/rpcx/protocol"
 	"github.com/smallnest/rpcx/share"
-	"github.com/smallnest/rpcx/util"
 )
 
 const (
@@ -530,13 +529,6 @@ func (client *Client) input() {
 			} else {
 				data := res.Payload
 				if len(data) > 0 {
-					if res.CompressType() == protocol.Gzip {
-						data, err = util.Unzip(data)
-						if err != nil {
-							call.Error = ServiceError("unzip payload: " + err.Error())
-						}
-					}
-
 					codec := share.Codecs[res.SerializeType()]
 					if codec == nil {
 						call.Error = ServiceError(ErrUnsupportedCodec.Error())

protocol/compressor.go

@@ -1,6 +1,8 @@
 package protocol
 
-import "github.com/smallnest/rpcx/util"
+import (
+	"github.com/smallnest/rpcx/util"
+)
 
 // Compressor defines a common compression interface.
 type Compressor interface {

protocol/message.go

@@ -234,7 +234,6 @@ func (m Message) Encode() []byte {
 				payload = m.Payload
 			}
 		}
-
 	}
 
 	totalL := (4 + spL) + (4 + smL) + (4 + len(meta)) + (4 + len(payload))

server/server.go

@@ -366,6 +366,9 @@ func (s *Server) serveConn(conn net.Conn) {
 					}
 				}
 
+				if len(res.Payload) > 1024 && req.CompressType() != protocol.None {
+					res.SetCompressType(req.CompressType())
+				}
 				data := res.Encode()
 				conn.Write(data)
 				//res.WriteTo(conn)