-
Notifications
You must be signed in to change notification settings - Fork 5.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
lightning: replace grpc gzip compressor with klauspost/compress/gzip #41974
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d9bda5d
lightning: replace grpc gzip compressor with klauspost/compress/gzip
sleepymole efd31a2
fix panic
sleepymole 842bb84
add test
sleepymole 2dc6d89
add benchmark
sleepymole c104950
fix lint
sleepymole ed58668
fix lint
sleepymole File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
// Copyright 2023 PingCAP, Inc. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package local | ||
|
||
import ( | ||
"io" | ||
"sync" | ||
|
||
"github.com/klauspost/compress/gzip" // faster than stdlib | ||
"google.golang.org/grpc" | ||
) | ||
|
||
var ( | ||
_ grpc.Compressor = (*gzipCompressor)(nil) | ||
_ grpc.Decompressor = (*gzipDecompressor)(nil) | ||
) | ||
|
||
type gzipCompressor struct{} | ||
|
||
var gzipWriterPool = sync.Pool{ | ||
New: func() any { | ||
return gzip.NewWriter(io.Discard) | ||
}, | ||
} | ||
|
||
func (c *gzipCompressor) Do(w io.Writer, p []byte) error { | ||
z := gzipWriterPool.Get().(*gzip.Writer) | ||
defer gzipWriterPool.Put(z) | ||
z.Reset(w) | ||
if _, err := z.Write(p); err != nil { | ||
return err | ||
} | ||
return z.Close() | ||
} | ||
|
||
func (c *gzipCompressor) Type() string { | ||
return "gzip" | ||
} | ||
|
||
type gzipDecompressor struct{} | ||
|
||
var gzipReaderPool = sync.Pool{ | ||
New: func() any { | ||
return &gzip.Reader{} | ||
}, | ||
} | ||
|
||
func (d *gzipDecompressor) Do(r io.Reader) ([]byte, error) { | ||
z := gzipReaderPool.Get().(*gzip.Reader) | ||
if err := z.Reset(r); err != nil { | ||
gzipReaderPool.Put(z) | ||
return nil, err | ||
} | ||
|
||
defer func() { | ||
_ = z.Close() | ||
gzipReaderPool.Put(z) | ||
}() | ||
return io.ReadAll(z) | ||
} | ||
|
||
func (d *gzipDecompressor) Type() string { | ||
return "gzip" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
package local | ||
|
||
import ( | ||
"bytes" | ||
"compress/gzip" // use standard library to verify the result | ||
"crypto/rand" | ||
"io" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/require" | ||
"google.golang.org/grpc" | ||
) | ||
|
||
func TestGzipCompressor(t *testing.T) { | ||
compressor := &gzipCompressor{} | ||
require.Equal(t, "gzip", compressor.Type()) | ||
|
||
input := make([]byte, 1<<20) | ||
_, err := rand.Read(input) | ||
require.NoError(t, err) | ||
|
||
buf := &bytes.Buffer{} | ||
err = compressor.Do(buf, input) | ||
require.NoError(t, err) | ||
|
||
compressed := buf.Bytes() | ||
z, err := gzip.NewReader(bytes.NewReader(compressed)) | ||
require.NoError(t, err) | ||
uncompressed, err := io.ReadAll(z) | ||
require.NoError(t, err) | ||
require.NoError(t, z.Close()) | ||
|
||
require.Equal(t, input, uncompressed) | ||
} | ||
|
||
func TestGzipDecompressor(t *testing.T) { | ||
decompressor := &gzipDecompressor{} | ||
require.Equal(t, "gzip", decompressor.Type()) | ||
|
||
input := make([]byte, 1<<20) | ||
_, err := rand.Read(input) | ||
require.NoError(t, err) | ||
|
||
buf := &bytes.Buffer{} | ||
z := gzip.NewWriter(buf) | ||
_, err = z.Write(input) | ||
require.NoError(t, err) | ||
require.NoError(t, z.Close()) | ||
|
||
uncompressed, err := decompressor.Do(bytes.NewReader(buf.Bytes())) | ||
require.NoError(t, err) | ||
|
||
require.Equal(t, input, uncompressed) | ||
} | ||
|
||
func BenchmarkGzipCompressor(b *testing.B) { | ||
benchCompressor(b, &gzipCompressor{}) | ||
} | ||
|
||
func BenchmarkGrpcGzipCompressor(b *testing.B) { | ||
benchCompressor(b, grpc.NewGZIPCompressor()) | ||
} | ||
|
||
func benchCompressor(b *testing.B, compressor grpc.Compressor) { | ||
input := make([]byte, 1<<20) | ||
_, err := rand.Read(input) | ||
require.NoError(b, err) | ||
|
||
b.ResetTimer() | ||
for i := 0; i < b.N; i++ { | ||
buf := &bytes.Buffer{} | ||
err = compressor.Do(buf, input) | ||
require.NoError(b, err) | ||
} | ||
} | ||
|
||
func BenchmarkGzipDecompressor(b *testing.B) { | ||
benchDecompressor(b, &gzipDecompressor{}) | ||
} | ||
|
||
func BenchmarkGrpcGzipDecompressor(b *testing.B) { | ||
benchDecompressor(b, grpc.NewGZIPDecompressor()) | ||
} | ||
|
||
func benchDecompressor(b *testing.B, decompressor grpc.Decompressor) { | ||
input := make([]byte, 1<<20) | ||
_, err := rand.Read(input) | ||
require.NoError(b, err) | ||
|
||
buf := &bytes.Buffer{} | ||
z := gzip.NewWriter(buf) | ||
_, err = z.Write(input) | ||
require.NoError(b, err) | ||
require.NoError(b, z.Close()) | ||
|
||
b.ResetTimer() | ||
for i := 0; i < b.N; i++ { | ||
_, err := decompressor.Do(bytes.NewReader(buf.Bytes())) | ||
require.NoError(b, err) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we can register our gzip Compressor with the name "gzip2" or something? Not important, we can postpone it when upstream remove this API
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, we can't. The name will be sent to the server. The server can't recognize
gzip2
.