refactor: use more consistent naming

Author: buraksezer

internal/cluster/routingtable/distribute.go

@@ -171,7 +171,7 @@ func (r *RoutingTable) distributeBackups(partID uint64) []discovery.Member {
 		err = msgpack.Unmarshal(res.Value(), &count)
 		if err != nil {
 			r.log.V(3).Printf("[ERROR] Failed to unmarshal key count "+
-				"while checking backup partition: %d: %v", partID, err)
+				"while checking replica partition: %d: %v", partID, err)
 			// This may be a temporary event. Pass it.
 			continue
 		}

internal/cluster/routingtable/distribute_test.go

@@ -77,7 +77,7 @@ func TestRoutingTable_distributedBackups(t *testing.T) {
 
 		for _, owner := range part.Owners() {
 			if owner.CompareByID(rt1.This()) {
-				t.Fatalf("Dead node still a backup owner: %v", rt1.This())
+				t.Fatalf("Dead node still a replica owner: %v", rt1.This())
 			}
 		}
 	}

internal/cluster/routingtable/operations.go

@@ -24,7 +24,7 @@ import (
 	"github.com/vmihailenco/msgpack"
 )
 
-func (r *RoutingTable) keyCountOnPartOperation(w, rq protocol.EncodeDecoder) {
+func (r *RoutingTable) lengthOfPartOperation(w, rq protocol.EncodeDecoder) {
 	req := rq.(*protocol.SystemMessage)
 	partID := req.Extra().(protocol.LengthOfPartExtra).PartID
 	isBackup := req.Extra().(protocol.LengthOfPartExtra).Backup

internal/cluster/routingtable/routingtable.go

@@ -206,7 +206,7 @@ func (r *RoutingTable) UpdateEagerly() {
 
 func (r *RoutingTable) RegisterOperations(operations map[protocol.OpCode]func(w, r protocol.EncodeDecoder)) {
 	operations[protocol.OpUpdateRouting] = r.updateRoutingOperation
-	operations[protocol.OpLengthOfPart] = r.keyCountOnPartOperation
+	operations[protocol.OpLengthOfPart] = r.lengthOfPartOperation
 }
 
 func (r *RoutingTable) updateRouting() {

internal/dmap/delete.go

@@ -79,12 +79,12 @@ func (dm *DMap) deleteBackupOnCluster(hkey uint64, key string) error {
 		mem := owner
 		g.Go(func() error {
 			// TODO: Add retry with backoff
-			req := protocol.NewDMapMessage(protocol.OpDeleteBackup)
+			req := protocol.NewDMapMessage(protocol.OpDeleteReplica)
 			req.SetDMap(dm.name)
 			req.SetKey(key)
 			_, err := dm.s.requestTo(mem.String(), req)
 			if err != nil {
-				dm.s.log.V(3).Printf("[ERROR] Failed to delete backup key/value on %s: %s", dm.name, err)
+				dm.s.log.V(3).Printf("[ERROR] Failed to delete replica key/value on %s: %s", dm.name, err)
 			}
 			return err
 		})

internal/dmap/delete_operations.go

@@ -56,7 +56,7 @@ func (s *Service) deletePrevOperation(w, r protocol.EncodeDecoder) {
 	})
 }
 
-func (s *Service) deleteBackupOperation(w, r protocol.EncodeDecoder) {
+func (s *Service) deleteReplicaOperation(w, r protocol.EncodeDecoder) {
 	s.deleteOperationCommon(w, r, func(dm *DMap, r protocol.EncodeDecoder) error {
 		req := r.(*protocol.DMapMessage)
 		return dm.deleteBackupFromFragment(req.Key(), partitions.BACKUP)

internal/dmap/get.go

@@ -201,7 +201,7 @@ func (dm *DMap) lookupOnReplicas(hkey uint64, key string) []*version {
 	backups := dm.s.backup.PartitionOwnersByHKey(hkey)
 	versions := make([]*version, 0, len(backups))
 	for _, replica := range backups {
-		req := protocol.NewDMapMessage(protocol.OpGetBackup)
+		req := protocol.NewDMapMessage(protocol.OpGetReplica)
 		req.SetDMap(dm.name)
 		req.SetKey(key)
 		host := replica

internal/dmap/get_operations.go

@@ -52,7 +52,7 @@ func (s *Service) getOperation(w, r protocol.EncodeDecoder) {
 	})
 }
 
-func (s *Service) getBackupOperation(w, r protocol.EncodeDecoder) {
+func (s *Service) getReplicaOperation(w, r protocol.EncodeDecoder) {
 	s.getOperationCommon(w, r, func(dm *DMap, r protocol.EncodeDecoder) (storage.Entry, error) {
 		e := newEnvFromReq(r, partitions.BACKUP)
 		return dm.getOnFragment(e)

internal/dmap/operations.go

@@ -32,11 +32,11 @@ func (s *Service) RegisterOperations(operations map[protocol.OpCode]func(w, r pr
 	// DMap.Get
 	s.operations[protocol.OpGet] = s.getOperation
 	s.operations[protocol.OpGetPrev] = s.getPrevOperation
-	s.operations[protocol.OpGetBackup] = s.getBackupOperation
+	s.operations[protocol.OpGetReplica] = s.getReplicaOperation
 
 	// DMap.Delete
 	s.operations[protocol.OpDelete] = s.deleteOperation
-	s.operations[protocol.OpDeleteBackup] = s.deleteBackupOperation
+	s.operations[protocol.OpDeleteReplica] = s.deleteReplicaOperation
 	s.operations[protocol.OpDeletePrev] = s.deletePrevOperation
 
 	// DMap.Atomic

internal/protocol/operations.go

@@ -38,8 +38,8 @@ const (
 	OpPutIfExReplica        // 18
 	OpDeletePrev            // 19
 	OpGetPrev               // 20
-	OpGetBackup             // 21
-	OpDeleteBackup          // 22
+	OpGetReplica            // 21
+	OpDeleteReplica         // 22
 	OpDestroyDMapInternal   // 23
 	OpMoveFragment          // 24
 	OpLengthOfPart          // 25