From 23a9dd601c633416bfb0026c7dc9a3d46657c049 Mon Sep 17 00:00:00 2001 From: Stephen J Day Date: Thu, 6 Apr 2017 17:58:33 -0700 Subject: [PATCH] services/images: simplify transaction management For some reason, when I wrote this, I forgot about the `View` and `Update` helpers on boltdb. These are now used and makes the code much easier to follow. Signed-off-by: Stephen J Day --- services/images/service.go | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/services/images/service.go b/services/images/service.go index 8f2f765..0863c23 100644 --- a/services/images/service.go +++ b/services/images/service.go @@ -35,7 +35,7 @@ func (s *Service) Register(server *grpc.Server) error { func (s *Service) Get(ctx context.Context, req *imagesapi.GetRequest) (*imagesapi.GetResponse, error) { var resp imagesapi.GetResponse - return &resp, s.withStoreTx(ctx, req.Name, false, func(ctx context.Context, store images.Store) error { + return &resp, s.withStoreView(ctx, func(ctx context.Context, store images.Store) error { image, err := store.Get(ctx, req.Name) if err != nil { return mapGRPCError(err, req.Name) @@ -47,7 +47,7 @@ func (s *Service) Get(ctx context.Context, req *imagesapi.GetRequest) (*imagesap } func (s *Service) Put(ctx context.Context, req *imagesapi.PutRequest) (*empty.Empty, error) { - return &empty.Empty{}, s.withStoreTx(ctx, req.Image.Name, true, func(ctx context.Context, store images.Store) error { + return &empty.Empty{}, s.withStoreUpdate(ctx, func(ctx context.Context, store images.Store) error { return mapGRPCError(store.Put(ctx, req.Image.Name, descFromProto(&req.Image.Target)), req.Image.Name) }) } @@ -55,7 +55,7 @@ func (s *Service) Put(ctx context.Context, req *imagesapi.PutRequest) (*empty.Em func (s *Service) List(ctx context.Context, _ *imagesapi.ListRequest) (*imagesapi.ListResponse, error) { var resp imagesapi.ListResponse - return &resp, s.withStoreTx(ctx, "", false, func(ctx context.Context, store images.Store) error { + return &resp, s.withStoreView(ctx, func(ctx context.Context, store images.Store) error { images, err := store.List(ctx) if err != nil { return mapGRPCError(err, "") @@ -67,25 +67,19 @@ func (s *Service) List(ctx context.Context, _ *imagesapi.ListRequest) (*imagesap } func (s *Service) Delete(ctx context.Context, req *imagesapi.DeleteRequest) (*empty.Empty, error) { - return &empty.Empty{}, s.withStoreTx(ctx, req.Name, true, func(ctx context.Context, store images.Store) error { + return &empty.Empty{}, s.withStoreUpdate(ctx, func(ctx context.Context, store images.Store) error { return mapGRPCError(store.Delete(ctx, req.Name), req.Name) }) } -func (s *Service) withStoreTx(ctx context.Context, id string, writable bool, fn func(ctx context.Context, store images.Store) error) error { - tx, err := s.db.Begin(writable) - if err != nil { - return mapGRPCError(err, id) - } - defer tx.Rollback() - - if err := fn(ctx, images.NewImageStore(tx)); err != nil { - return err - } - - if writable { - return tx.Commit() - } - - return nil +func (s *Service) withStore(ctx context.Context, fn func(ctx context.Context, store images.Store) error) func(tx *bolt.Tx) error { + return func(tx *bolt.Tx) error { return fn(ctx, images.NewImageStore(tx)) } +} + +func (s *Service) withStoreView(ctx context.Context, fn func(ctx context.Context, store images.Store) error) error { + return s.db.View(s.withStore(ctx, fn)) +} + +func (s *Service) withStoreUpdate(ctx context.Context, fn func(ctx context.Context, store images.Store) error) error { + return s.db.Update(s.withStore(ctx, fn)) }