optimize: delete pool and optimize ut (#12)

* optimize: delete pool and optimize ut

* update

* format

* format

* format

* format

* optimize ut

Author: chaoranz758

README.md

@@ -157,7 +157,7 @@ func main() {
 		for i := 0; i < 10; i++ {
 			c.Write([]byte(fmt.Sprintf("chunk %d: %s\n", i, strings.Repeat("hi~", i)))) // nolint: errcheck
 			c.Flush()                                                                   // nolint: errcheck
-			time.Sleep(200 * time.Millisecond)
+			time.Sleep(time.Second)
 		}
 	})
 	h.Spin()

README_CN.md

@@ -151,7 +151,7 @@ func main() {
 		for i := 0; i < 10; i++ {
 			c.Write([]byte(fmt.Sprintf("chunk %d: %s\n", i, strings.Repeat("hi~", i)))) // nolint: errcheck
 			c.Flush()                                                                   // nolint: errcheck
-			time.Sleep(200 * time.Millisecond)
+			time.Sleep(time.Second)
 		}
 	})
 	h.Spin()

example/stream/main.go

@@ -65,7 +65,7 @@ func main() {
 		for i := 0; i < 10; i++ {
 			c.Write([]byte(fmt.Sprintf("chunk %d: %s\n", i, strings.Repeat("hi~", i)))) // nolint: errcheck
 			c.Flush()                                                                   // nolint: errcheck
-			time.Sleep(200 * time.Millisecond)
+			time.Sleep(time.Second)
 		}
 	})
 	go h.Spin()
@@ -87,11 +87,30 @@ func main() {
 	}
 
 	bodyStream := res.BodyStream()
-	compressedData, _ := ioutil.ReadAll(bodyStream)
-	gunzipBytes, err := compress.AppendGunzipBytes(nil, compressedData)
+
+	r, err := compress.AcquireGzipReader(bodyStream)
+	if err != nil {
+		panic(err)
+	}
+
+	firstChunk := make([]byte, 10)
+	_, err = r.Read(firstChunk)
 	if err != nil {
 		panic(err)
 	}
+	fmt.Println(fmt.Printf("%s", firstChunk))
 
-	fmt.Println(fmt.Printf("%s", gunzipBytes))
+	secondChunk := make([]byte, 13)
+	_, err = r.Read(secondChunk)
+	if err != nil {
+		panic(err)
+	}
+	fmt.Println(fmt.Printf("%s", secondChunk))
+
+	otherChunks, _ := ioutil.ReadAll(r)
+	fmt.Println(fmt.Printf("%s", otherChunks))
+
+	if r != nil {
+		compress.ReleaseGzipReader(r)
+	}
 }

gzip_test.go

@@ -439,9 +439,11 @@ func TestDecompressGzipForClient(t *testing.T) {
 }
 
 func TestStreamGzip(t *testing.T) {
-	data := `chunk 0: 
-chunk 1: hi~
-chunk 2: hi~hi~
+	firstData := `chunk 0: 
+`
+	secondData := `chunk 1: hi~
+`
+	otherData := `chunk 2: hi~hi~
 chunk 3: hi~hi~hi~
 chunk 4: hi~hi~hi~hi~
 chunk 5: hi~hi~hi~hi~hi~
@@ -457,7 +459,7 @@ chunk 9: hi~hi~hi~hi~hi~hi~hi~hi~hi~
 		for i := 0; i < 10; i++ {
 			c.Write([]byte(fmt.Sprintf("chunk %d: %s\n", i, strings.Repeat("hi~", i)))) // nolint: errcheck
 			c.Flush()                                                                   // nolint: errcheck
-			time.Sleep(200 * time.Millisecond)
+			time.Sleep(time.Second)
 		}
 	})
 
@@ -484,14 +486,34 @@ chunk 9: hi~hi~hi~hi~hi~hi~hi~hi~hi~
 	}
 
 	bodyStream := resp.BodyStream()
-	compressedData, _ := ioutil.ReadAll(bodyStream)
-	gunzipBytes, err := compress.AppendGunzipBytes(nil, compressedData)
+
+	r, err := compress.AcquireGzipReader(bodyStream)
+	if err != nil {
+		t.Fatalf("Get: %v", err)
+	}
+
+	firstChunk := make([]byte, 10)
+	_, err = r.Read(firstChunk)
 	if err != nil {
 		t.Fatalf("Get: %v", err)
 	}
 
+	secondChunk := make([]byte, 13)
+	_, err = r.Read(secondChunk)
+	if err != nil {
+		t.Fatalf("Get: %v", err)
+	}
+
+	otherChunks, _ := ioutil.ReadAll(r)
+
+	if r != nil {
+		compress.ReleaseGzipReader(r)
+	}
+
 	assert.Equal(t, "gzip", resp.Header.Get("Content-Encoding"))
 	assert.Equal(t, "chunked", resp.Header.Get("Transfer-Encoding"))
 	assert.Equal(t, "Accept-Encoding", resp.Header.Get("Vary"))
-	assert.Equal(t, data, string(gunzipBytes))
+	assert.Equal(t, firstData, string(firstChunk))
+	assert.Equal(t, secondData, string(secondChunk))
+	assert.Equal(t, otherData, string(otherChunks))
 }

srv_stream_middleware.go

@@ -42,7 +42,6 @@ package gzip
 
 import (
 	"context"
-	"runtime"
 	"strings"
 	"sync"
 
@@ -54,16 +53,6 @@ import (
 	"github.com/cloudwego/hertz/pkg/protocol/http1/resp"
 )
 
-var chunkReaderPool sync.Pool
-
-func init() {
-	chunkReaderPool = sync.Pool{
-		New: func() interface{} {
-			return &gzipChunkedWriter{}
-		},
-	}
-}
-
 type gzipChunkedWriter struct {
 	sync.Once
 	level          int
@@ -123,24 +112,12 @@ func (g *gzipChunkedWriter) Finalize() error {
 	return g.finalizeErr
 }
 
-func (g *gzipChunkedWriter) release() {
-	g.level = 0
-	g.originalSize = 0
-	g.compressedSize = 0
-	g.r = nil
-	g.w = nil
-	g.finalizeErr = nil
-	g.wroteHeader = false
-	chunkReaderPool.Put(g)
-}
-
 func newGzipChunkedWriter(r *protocol.Response, w network.Writer, level int) network.ExtWriter {
-	extWriter := chunkReaderPool.Get().(*gzipChunkedWriter)
+	extWriter := new(gzipChunkedWriter)
 	extWriter.r = r
 	extWriter.w = w
 	extWriter.Once = sync.Once{}
 	extWriter.level = level
-	runtime.SetFinalizer(extWriter, (*gzipChunkedWriter).release)
 	return extWriter
 }