Skip to content

refactor(epaxos.go) add comments for updateAttr and conflicts map #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor(epaxos.go) add comments for updateAttr and conflicts map #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a95ad3f
refactor(epaxos.go) add comments for updateAttr and conflicts map
xiang90 Dec 13, 2013
73d3798
(doc) comment(epaxos.go) comment updateconflicts
xiang90 Dec 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions src/epaxos/epaxos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ type Replica struct {
CommittedUpTo [DS]int32 // highest committed instance per replica that this replica knows about
ExecedUpTo []int32 // instance up to which all commands have been executed (including iteslf)
exec *Exec
conflicts []map[state.Key]int32
maxSeqPerKey map[state.Key]int32
conflicts []map[state.Key]int32 // an array of conflict maps ([conflict key] -> [the highest id of the command with the key])
maxSeqPerKey map[state.Key]int32 // [key] -> [the highest id of the command with the key]
maxSeq int32
latestCPReplica int32
latestCPInstance int32
Expand Down Expand Up @@ -697,13 +697,15 @@ func (r *Replica) updateCommitted(replica int32) {
}
}

// updateConflicts updates the conflict map and the maxSeqPerKey of the given replica
func (r *Replica) updateConflicts(cmds []state.Command, replica int32, instance int32, seq int32) {
for i := 0; i < len(cmds); i++ {
if d, present := r.conflicts[replica][cmds[i].K]; present {
if d < instance {
r.conflicts[replica][cmds[i].K] = instance
}
}

if s, present := r.maxSeqPerKey[cmds[i].K]; present {
if s < seq {
r.maxSeqPerKey[cmds[i].K] = seq
Expand All @@ -714,16 +716,24 @@ func (r *Replica) updateConflicts(cmds []state.Command, replica int32, instance
}
}

func (r *Replica) updateAttributes(cmds []state.Command, seq int32, deps [DS]int32, replica int32, instance int32) (int32, [DS]int32, bool) {
// updateAttributes returns deps and seq based on the batch of cmds and the current conflict maps
func (r *Replica) updateAttributes(cmds []state.Command, seq int32, deps [DS]int32, replica int32,
instance int32) (int32, [DS]int32, bool) {

changed := false

// build deps based on the conflict maps of all the replica in the cluster
for q := 0; q < r.N; q++ {
if r.Id != replica && int32(q) == replica {
continue
}
for i := 0; i < len(cmds); i++ {
if d, present := (r.conflicts[q])[cmds[i].K]; present {
if d > deps[q] {
deps[q] = d

// for each command in the batch, find out the highest conflict id
// record the highest one among all and update the seq to that one
for cmd := range cmds {
if id, present := (r.conflicts[q])[cmd.K]; present {
if id > deps[q] {
deps[q] = id
if seq <= r.InstanceSpace[q][d].Seq {
seq = r.InstanceSpace[q][d].Seq + 1
}
Expand All @@ -732,9 +742,11 @@ func (r *Replica) updateAttributes(cmds []state.Command, seq int32, deps [DS]int
}
}
}

}
for i := 0; i < len(cmds); i++ {
if s, present := r.maxSeqPerKey[cmds[i].K]; present {

for cmd := range cmds {
if s, present := r.maxSeqPerKey[cmd.K]; present {
if seq <= s {
changed = true
seq = s + 1
Expand Down