Run make fmt to format the code according to Go standard

yorkie-team · Feb 26, 2020 · c095c58 · c095c58
1 parent a31b8f8
commit c095c58
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 47 deletions.
diff --git a/api/converter/to_pb.go b/api/converter/to_pb.go
@@ -107,10 +107,10 @@ func ToOperations(operations []operation.Operation) []*api.Operation {
 		case *operation.Select:
 			pbOperation.Body = &api.Operation_Select_{
 				Select: &api.Operation_Select{
-					ParentCreatedAt:     toTimeTicket(op.ParentCreatedAt()),
-					From:                toTextNodePos(op.From()),
-					To:                  toTextNodePos(op.To()),
-					ExecutedAt:          toTimeTicket(op.ExecutedAt()),
+					ParentCreatedAt: toTimeTicket(op.ParentCreatedAt()),
+					From:            toTextNodePos(op.From()),
+					To:              toTextNodePos(op.To()),
+					ExecutedAt:      toTimeTicket(op.ExecutedAt()),
 				},
 			}
 		default:

diff --git a/client/client_test.go b/client/client_test.go
@@ -503,7 +503,7 @@ func TestClientAndDocument(t *testing.T) {
 				defer wg.Done()
 				rch := c1.Watch(ctx, doc1)
 
-				resp := <- rch
+				resp := <-rch
 				if resp.Err == io.EOF {
 					return
 				}

diff --git a/pkg/document/change/context.go b/pkg/document/change/context.go
@@ -22,7 +22,7 @@ func NewContext(id *ID, message string, root *json.Root) *Context {
 	return &Context{
 		id:      id,
 		message: message,
-		root: root,
+		root:    root,
 	}
 }
 

diff --git a/pkg/document/json/rht.go b/pkg/document/json/rht.go
@@ -7,14 +7,14 @@ import (
 )
 
 type rhtNode struct {
-	key       string
-	elem      Element
+	key  string
+	elem Element
 }
 
 func newRHTNode(key string, elem Element) *rhtNode {
 	return &rhtNode{
-		key:       key,
-		elem:      elem,
+		key:  key,
+		elem: elem,
 	}
 }
 
@@ -31,7 +31,6 @@ func (n *rhtNode) isDeleted() bool {
 	return n.elem.DeletedAt() != nil
 }
 
-
 // RHT is replicated hash table.
 type RHT struct {
 	nodeQueueMapByKey  map[string]*pq.PriorityQueue
@@ -128,4 +127,3 @@ func (rht *RHT) AllNodes() []*rhtNode {
 
 	return nodes
 }
-
diff --git a/pkg/document/operation/select.go b/pkg/document/operation/select.go
@@ -9,10 +9,10 @@ import (
 )
 
 type Select struct {
-	parentCreatedAt           *time.Ticket
-	from                      *json.TextNodePos
-	to                        *json.TextNodePos
-	executedAt                *time.Ticket
+	parentCreatedAt *time.Ticket
+	from            *json.TextNodePos
+	to              *json.TextNodePos
+	executedAt      *time.Ticket
 }
 
 func NewSelect(
@@ -22,10 +22,10 @@ func NewSelect(
 	executedAt *time.Ticket,
 ) *Select {
 	return &Select{
-		parentCreatedAt:           parentCreatedAt,
-		from:                      from,
-		to:                        to,
-		executedAt:                executedAt,
+		parentCreatedAt: parentCreatedAt,
+		from:            from,
+		to:              to,
+		executedAt:      executedAt,
 	}
 }
 

diff --git a/pkg/pq/priority_queue.go b/pkg/pq/priority_queue.go
@@ -42,15 +42,14 @@ type PQValue interface {
 
 // PQItem is something we manage in a priority queue.
 type PQItem struct {
-	value     PQValue
-	index     int
+	value PQValue
+	index int
 }
 
-
 func NewPQItem(value PQValue) *PQItem {
 	return &PQItem{
-		value:     value,
-		index:     -1,
+		value: value,
+		index: -1,
 	}
 }
 

diff --git a/yorkie/api/rpc_server.go b/yorkie/api/rpc_server.go
@@ -93,14 +93,14 @@ func (s *RPCServer) AttachDocument(
 	}
 
 	// if pack.HasChanges() {
-		if err := s.backend.Lock(pack.DocumentKey.BSONKey()); err != nil {
-			return nil, status.Error(codes.Internal, err.Error())
+	if err := s.backend.Lock(pack.DocumentKey.BSONKey()); err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+	defer func() {
+		if err := s.backend.Unlock(pack.DocumentKey.BSONKey()); err != nil {
+			log.Logger.Error(err)
 		}
-		defer func() {
-			if err := s.backend.Unlock(pack.DocumentKey.BSONKey()); err != nil {
-				log.Logger.Error(err)
-			}
-		}()
+	}()
 	// }
 
 	clientInfo, docInfo, err := clients.FindClientAndDocument(ctx, s.backend, req.ClientId, pack)
@@ -139,14 +139,14 @@ func (s *RPCServer) DetachDocument(
 	}
 
 	// if pack.HasChanges() {
-		if err := s.backend.Lock(pack.DocumentKey.BSONKey()); err != nil {
-			return nil, status.Error(codes.Internal, err.Error())
+	if err := s.backend.Lock(pack.DocumentKey.BSONKey()); err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+	defer func() {
+		if err := s.backend.Unlock(pack.DocumentKey.BSONKey()); err != nil {
+			log.Logger.Error(err)
 		}
-		defer func() {
-			if err := s.backend.Unlock(pack.DocumentKey.BSONKey()); err != nil {
-				log.Logger.Error(err)
-			}
-		}()
+	}()
 	// }
 
 	clientInfo, docInfo, err := clients.FindClientAndDocument(ctx, s.backend, req.ClientId, pack)
@@ -186,14 +186,14 @@ func (s *RPCServer) PushPull(
 
 	// TODO uncomment write lock condition. We need $max operation on client.
 	// if pack.HasChanges() {
-		if err := s.backend.Lock(pack.DocumentKey.BSONKey()); err != nil {
-			return nil, status.Error(codes.Internal, err.Error())
+	if err := s.backend.Lock(pack.DocumentKey.BSONKey()); err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+	defer func() {
+		if err := s.backend.Unlock(pack.DocumentKey.BSONKey()); err != nil {
+			log.Logger.Error(err)
 		}
-		defer func() {
-			if err := s.backend.Unlock(pack.DocumentKey.BSONKey()); err != nil {
-				log.Logger.Error(err)
-			}
-		}()
+	}()
 	// }
 
 	clientInfo, docInfo, err := clients.FindClientAndDocument(ctx, s.backend, req.ClientId, pack)

diff --git a/yorkie/backend/mongo/client.go b/yorkie/backend/mongo/client.go
@@ -276,7 +276,7 @@ func (c *Client) CreateChangeInfos(
 
 		for _, c := range changes {
 			modelChanges = append(modelChanges, mongo.NewUpdateOneModel().SetFilter(bson.M{
-				"doc_id": docID,
+				"doc_id":     docID,
 				"server_seq": c.ServerSeq(),
 			}).SetUpdate(bson.M{"$set": bson.M{
 				"actor":      types.EncodeActorID(c.ID().Actor()),