Browse Source

etcdserver: move member sort interface to member.go

Xiang Li 11 years ago
parent
commit
7a5bf53222
2 changed files with 8 additions and 6 deletions
  1. 0 6
      etcdserver/cluster.go
  2. 8 0
      etcdserver/member.go

+ 0 - 6
etcdserver/cluster.go

@@ -135,12 +135,6 @@ func (c *Cluster) Members() []*Member {
 	return []*Member(sms)
 	return []*Member(sms)
 }
 }
 
 
-type SortableMemberSlice []*Member
-
-func (s SortableMemberSlice) Len() int           { return len(s) }
-func (s SortableMemberSlice) Less(i, j int) bool { return s[i].ID < s[j].ID }
-func (s SortableMemberSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
 func (c *Cluster) Member(id types.ID) *Member {
 func (c *Cluster) Member(id types.ID) *Member {
 	c.Lock()
 	c.Lock()
 	defer c.Unlock()
 	defer c.Unlock()

+ 8 - 0
etcdserver/member.go

@@ -121,6 +121,14 @@ func removedMemberStoreKey(id types.ID) string {
 	return path.Join(storeRemovedMembersPrefix, id.String())
 	return path.Join(storeRemovedMembersPrefix, id.String())
 }
 }
 
 
+// implement sort by ID interface
+type SortableMemberSlice []*Member
+
+func (s SortableMemberSlice) Len() int           { return len(s) }
+func (s SortableMemberSlice) Less(i, j int) bool { return s[i].ID < s[j].ID }
+func (s SortableMemberSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
+
+// implement sort by peer urls interface
 type SortableMemberSliceByPeerURLs []*Member
 type SortableMemberSliceByPeerURLs []*Member
 
 
 func (p SortableMemberSliceByPeerURLs) Len() int { return len(p) }
 func (p SortableMemberSliceByPeerURLs) Len() int { return len(p) }