github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10657 from djdongjin/reduce-ptypes-Empty-creation

Browse Source 
Avoid repeated ptypes.Empty creation by predefining it as a var
This commit is contained in:
Maksym Pavlenko 2024-09-03 18:22:43 +00:00 committed by GitHub
commit 4b28e29266
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/services/containers/local.go
View File

@ -38,6 +38,8 @@ import (
"google.golang.org/grpc/status"
)
var empty = &ptypes.Empty{}
func init() {
registry.Register(&plugin.Registration{
Type: plugins.ServicePlugin,
@ -188,16 +190,16 @@ func (l *local) Delete(ctx context.Context, req *api.DeleteContainerRequest, _ .
if err := l.withStoreUpdate(ctx, func(ctx context.Context) error {
return l.Store.Delete(ctx, req.ID)
}); err != nil {
return &ptypes.Empty{}, errdefs.ToGRPC(err)
return empty, errdefs.ToGRPC(err)
}
if err := l.publisher.Publish(ctx, "/containers/delete", &eventstypes.ContainerDelete{
ID: req.ID,
}); err != nil {
return &ptypes.Empty{}, err
return empty, err
}
return &ptypes.Empty{}, nil
return empty, nil
}
func (l *local) withStore(ctx context.Context, fn func(ctx context.Context) error) func(tx *bolt.Tx) error {

6
plugins/services/events/service.go
View File

@ -36,6 +36,8 @@ import (
"google.golang.org/grpc"
)
var empty = &ptypes.Empty{}
func init() {
registry.Register(&plugin.Registration{
Type: plugins.GRPCPlugin,
@ -84,7 +86,7 @@ func (s *service) Publish(ctx context.Context, r *api.PublishRequest) (*ptypes.E
return nil, errdefs.ToGRPC(err)
}
return &ptypes.Empty{}, nil
return empty, nil
}
func (s *service) Forward(ctx context.Context, r *api.ForwardRequest) (*ptypes.Empty, error) {
@ -92,7 +94,7 @@ func (s *service) Forward(ctx context.Context, r *api.ForwardRequest) (*ptypes.E
return nil, errdefs.ToGRPC(err)
}
return &ptypes.Empty{}, nil
return empty, nil
}
func (s *service) Subscribe(req *api.SubscribeRequest, srv api.Events_SubscribeServer) error {

2
plugins/services/events/ttrpc.go
View File

@ -37,7 +37,7 @@ func (s *ttrpcService) Forward(ctx context.Context, r *api.ForwardRequest) (*pty
return nil, errdefs.ToGRPC(err)
}
return &ptypes.Empty{}, nil
return empty, nil
}
func fromTProto(env *types.Envelope) *events.Envelope {

4
plugins/services/images/local.go
View File

@ -39,6 +39,8 @@ import (
"github.com/containerd/plugin/registry"
)
var empty = &ptypes.Empty{}
func init() {
registry.Register(&plugin.Registration{
Type: plugins.ServicePlugin,
@ -183,7 +185,7 @@ func (l *local) Delete(ctx context.Context, req *imagesapi.DeleteImageRequest, _
}
}
return &ptypes.Empty{}, nil
return empty, nil
}
func (l *local) emitSchema1DeprecationWarning(ctx context.Context, image *images.Image) {

8
plugins/services/leases/service.go
View File

@ -30,6 +30,8 @@ import (
"google.golang.org/grpc"
)
var empty = &ptypes.Empty{}
func init() {
registry.Register(&plugin.Registration{
Type: plugins.GRPCPlugin,
@ -87,7 +89,7 @@ func (s *service) Delete(ctx context.Context, r *api.DeleteRequest) (*ptypes.Emp
}, opts...); err != nil {
return nil, errdefs.ToGRPC(err)
}
return &ptypes.Empty{}, nil
return empty, nil
}
func (s *service) List(ctx context.Context, r *api.ListRequest) (*api.ListResponse, error) {
@ -117,7 +119,7 @@ func (s *service) AddResource(ctx context.Context, r *api.AddResourceRequest) (*
}); err != nil {
return nil, errdefs.ToGRPC(err)
}
return &ptypes.Empty{}, nil
return empty, nil
}
func (s *service) DeleteResource(ctx context.Context, r *api.DeleteResourceRequest) (*ptypes.Empty, error) {
@ -131,7 +133,7 @@ func (s *service) DeleteResource(ctx context.Context, r *api.DeleteResourceReque
}); err != nil {
return nil, errdefs.ToGRPC(err)
}
return &ptypes.Empty{}, nil
return empty, nil
}
func (s *service) ListResources(ctx context.Context, r *api.ListResourcesRequest) (*api.ListResourcesResponse, error) {

8
plugins/services/namespaces/local.go
View File

@ -37,6 +37,8 @@ import (
"google.golang.org/grpc/status"
)
var empty = &ptypes.Empty{}
func init() {
registry.Register(&plugin.Registration{
Type: plugins.ServicePlugin,
@ -206,17 +208,17 @@ func (l *local) Delete(ctx context.Context, req *api.DeleteNamespaceRequest, _ .
if err := l.withStoreUpdate(ctx, func(ctx context.Context, store namespaces.Store) error {
return errdefs.ToGRPC(store.Delete(ctx, req.Name))
}); err != nil {
return &ptypes.Empty{}, err
return empty, err
}
// set the namespace in the context before publishing the event
ctx = namespaces.WithNamespace(ctx, req.Name)
if err := l.publisher.Publish(ctx, "/namespaces/delete", &eventstypes.NamespaceDelete{
Name: req.Name,
}); err != nil {
return &ptypes.Empty{}, err
return empty, err
}
return &ptypes.Empty{}, nil
return empty, nil
}
func (l *local) withStore(ctx context.Context, fn func(ctx context.Context, store namespaces.Store) error) func(tx *bolt.Tx) error {

4
plugins/services/transfer/service.go
View File

@ -39,6 +39,8 @@ import (
"google.golang.org/protobuf/types/known/emptypb"
)
var empty = &ptypes.Empty{}
func init() {
registry.Register(&plugin.Registration{
Type: plugins.GRPCPlugin,
@ -130,7 +132,7 @@ func (s *service) Transfer(ctx context.Context, req *transferapi.TransferRequest
for _, t := range s.transferrers {
if err := t.Transfer(ctx, src, dst, transferOpts...); err == nil {
return &ptypes.Empty{}, nil
return empty, nil
} else if !errdefs.IsNotImplemented(err) {
return nil, errdefs.ToGRPC(err)
}