Optimization: refactor gateway compress and encode data.

FGadvancer · Jan 29, 2024 · 2ba13e2 · 2ba13e2
1 parent 59b70cb
commit 2ba13e2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 29 deletions.
diff --git a/internal/msggateway/compressor.go b/internal/msggateway/compressor.go
@@ -19,16 +19,10 @@ import (
 	"compress/gzip"
 	"errors"
 	"io"
-	"sync"
 
 	"github.com/OpenIMSDK/tools/utils"
 )
 
-var (
-	gzipWriterPool = sync.Pool{New: func() any { return gzip.NewWriter(nil) }}
-	gzipReaderPool = sync.Pool{New: func() any { return new(gzip.Reader) }}
-)
-
 type Compressor interface {
 	Compress(rawData []byte) ([]byte, error)
 	CompressWithPool(rawData []byte) ([]byte, error)
@@ -58,7 +52,7 @@ func (g *GzipCompressor) Compress(rawData []byte) ([]byte, error) {
 }
 
 func (g *GzipCompressor) CompressWithPool(rawData []byte) ([]byte, error) {
-	gz := gzipWriterPool.Get().(*gzip.Writer)
+	gz := gzipWriterPool.Get()
 	defer gzipWriterPool.Put(gz)
 
 	gzipBuffer := bytes.Buffer{}
@@ -74,7 +68,7 @@ func (g *GzipCompressor) CompressWithPool(rawData []byte) ([]byte, error) {
 }
 
 func (g *GzipCompressor) CompressWithExternalPool(rawData []byte, compressedData *bytes.Buffer) error {
-	gz := gzipWriterPool.Get().(*gzip.Writer)
+	gz := gzipWriterPool.Get()
 	defer gzipWriterPool.Put(gz)
 
 	gz.Reset(compressedData)
@@ -103,7 +97,7 @@ func (g *GzipCompressor) DeCompress(compressedData []byte) ([]byte, error) {
 }
 
 func (g *GzipCompressor) DecompressWithPool(compressedData []byte) ([]byte, error) {
-	reader := gzipReaderPool.Get().(*gzip.Reader)
+	reader := gzipReaderPool.Get()
 	if reader == nil {
 		return nil, errors.New("NewReader failed")
 	}
@@ -123,7 +117,7 @@ func (g *GzipCompressor) DecompressWithPool(compressedData []byte) ([]byte, erro
 }
 
 func (g *GzipCompressor) DecompressWithExternalPool(compressedData []byte, rawData *bytes.Buffer) error {
-	reader := gzipReaderPool.Get().(*gzip.Reader)
+	reader := gzipReaderPool.Get()
 	if reader == nil {
 		return errors.New("NewReader failed")
 	}

diff --git a/internal/msggateway/options.go b/internal/msggateway/options.go
@@ -19,13 +19,13 @@ import "time"
 type (
 	Option  func(opt *configs)
 	configs struct {
-		// 长连接监听端口
+		// Long connection listening port
 		port int
-		// 长连接允许最大链接数
+		// Maximum number of long connections allowed
 		maxConnNum int64
-		// 连接握手超时时间
+		// Connection handshake timeout
 		handshakeTimeout time.Duration
-		// 允许消息最大长度
+		// Maximum allowed message length
 		messageMaxMsgLength int
 		// websocket write buffer, default: 4096, 4kb.
 		writeBufferSize int

diff --git a/internal/msggateway/pool.go b/internal/msggateway/pool.go
@@ -2,9 +2,28 @@ package msggateway
 
 import (
 	"bytes"
+	"compress/gzip"
 	"sync"
 )
 
+var (
+	bufferPool = NewPool[*bytes.Buffer](func() *bytes.Buffer { return new(bytes.Buffer) },
+		func(b *bytes.Buffer) {
+			b.Reset()
+		})
+	reqPool = NewPool[*Req](func() *Req { return new(Req) },
+		func(r *Req) {
+			r.Data = nil
+			r.MsgIncr = ""
+			r.OperationID = ""
+			r.ReqIdentifier = 0
+			r.SendID = ""
+			r.Token = ""
+		})
+	gzipWriterPool = NewPool[*gzip.Writer](func() *gzip.Writer { return gzip.NewWriter(nil) }, nil)
+	gzipReaderPool = NewPool[*gzip.Reader](func() *gzip.Reader { return new(gzip.Reader) }, nil)
+)
+
 // Pool is a generic sync.Pool
 type Pool[T any] struct {
 	pool      sync.Pool
@@ -39,18 +58,3 @@ func (p *Pool[T]) Get() T {
 func (p *Pool[T]) Put(item T) {
 	p.pool.Put(item)
 }
-
-var bufferPool = NewPool[*bytes.Buffer](func() *bytes.Buffer { return new(bytes.Buffer) },
-	func(b *bytes.Buffer) {
-		b.Reset()
-	})
-
-var reqPool = NewPool[*Req](func() *Req { return new(Req) },
-	func(r *Req) {
-		r.Data = nil
-		r.MsgIncr = ""
-		r.OperationID = ""
-		r.ReqIdentifier = 0
-		r.SendID = ""
-		r.Token = ""
-	})