Skip to content
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.

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

Entrega Lab 2 #23

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions common/consistenthash/consistenthash.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ func (r *Ring) search(key string) int {
// YOUR CODE GOES HERE //
/////////////////////////

j := hashId(key)

for i := range r.Nodes {
if(r.Nodes[i].HashId > j) {
return i
}
}

return 0
}

Expand Down
9 changes: 6 additions & 3 deletions dynamo/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
// Cache is the struct that handle all the data storage for the dynamo server.
type Cache struct {
data map[string]string
timestamp map[string]int64
sync.Mutex
}

Expand All @@ -20,6 +21,7 @@ func NewCache() *Cache {
var s Cache

s.data = make(map[string]string)
s.timestamp = make(map[string]int64)

return &s
}
Expand All @@ -29,9 +31,9 @@ func NewCache() *Cache {
func (cache *Cache) Get(key string) (value string, timestamp int64) {
cache.Lock()
value = cache.data[key]
timestamp = 0
timestamp = cache.timestamp[key]
cache.Unlock()

log.Printf("[CACHE] Getting Key '%v' with Value '%v' @ timestamp '%v'\n", key, value, timestamp)
return
}
Expand All @@ -43,6 +45,7 @@ func (cache *Cache) Put(key string, value string, timestamp int64) {

cache.Lock()
cache.data[key] = value
cache.timestamp[key] = timestamp
cache.Unlock()

return
Expand All @@ -52,6 +55,6 @@ func (cache *Cache) Put(key string, value string, timestamp int64) {
// except for testing purposes.
func (cache *Cache) getAll() (data map[string]string, timestamps map[string]int64) {
data = cache.data
timestamps = make(map[string]int64)
timestamps = cache.timestamp
return data, timestamps
}
11 changes: 10 additions & 1 deletion dynamo/coordinator.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,15 @@ func aggregateVotes(votes []*vote) (result string) {
/////////////////////////
// YOUR CODE GOES HERE //
/////////////////////////
result = votes[0].value
var bestts int64
bestts = 0
for _, vote := range votes {
if (bestts < vote.timestamp) {
result = vote.value
bestts = vote.timestamp
}
}

//result = votes[0].value
return
}