Skip to content

Commit

Permalink
encoding: fix duplicate compressor names
Browse files Browse the repository at this point in the history
  • Loading branch information
jronak committed Jan 23, 2023
1 parent bc9728f commit 804e878
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
4 changes: 3 additions & 1 deletion encoding/encoding.go
Expand Up @@ -75,7 +75,9 @@ var registeredCompressor = make(map[string]Compressor)
// registered with the same name, the one registered last will take effect.
func RegisterCompressor(c Compressor) {
registeredCompressor[c.Name()] = c
grpcutil.RegisteredCompressorNames = append(grpcutil.RegisteredCompressorNames, c.Name())
if !grpcutil.IsCompressorNameRegistered(c.Name()) {
grpcutil.RegisteredCompressorNames = append(grpcutil.RegisteredCompressorNames, c.Name())
}
}

// GetCompressor returns Compressor for the given compressor name.
Expand Down
37 changes: 37 additions & 0 deletions encoding/encoding_test.go
@@ -0,0 +1,37 @@
package encoding

import (
"reflect"
"testing"

"google.golang.org/grpc/internal/grpcutil"
)

type mockNamedCompressor struct {
Compressor
}

func (mockNamedCompressor) Name() string {
return "mock-compressor"
}

func TestDuplicateCompressorRegister(t *testing.T) {
defer func(m map[string]Compressor) { registeredCompressor = m }(registeredCompressor)
defer func(c []string) { grpcutil.RegisteredCompressorNames = c }(grpcutil.RegisteredCompressorNames)
registeredCompressor = map[string]Compressor{}
grpcutil.RegisteredCompressorNames = []string{}

RegisterCompressor(&mockNamedCompressor{})

// Register another instance of the same compressor.
mc := &mockNamedCompressor{}
RegisterCompressor(mc)
if got := registeredCompressor["mock-compressor"]; got != mc {
t.Fatalf("Unexpected compressor, got: %+v, want:%+v", got, mc)
}

wantNames := []string{"mock-compressor"}
if !reflect.DeepEqual(wantNames, grpcutil.RegisteredCompressorNames) {
t.Fatalf("Unexpected compressor names, got: %+v, want:%+v", grpcutil.RegisteredCompressorNames, wantNames)
}
}

0 comments on commit 804e878

Please sign in to comment.