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

Solution #44

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
27 changes: 23 additions & 4 deletions common/consistenthash/consistenthash.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,30 @@ type Ring struct {
// search will find the index of the node that is responsible for the range that
// includes the hashed value of key.
func (r *Ring) search(key string) int {
/////////////////////////
// YOUR CODE GOES HERE //
/////////////////////////

r.Lock()
defer r.Unlock()

id := int(0)

hash := uint32(0)

currentHash := hashId(key)

for _, node := range r.Nodes {

node.HashId = hashId(node.Id)

if !(currentHash >= hash && currentHash <= node.HashId) {
id++
}

if node.HashId > hash {
hash = node.HashId
}
}

return 0
return id % len(r.Nodes)
}

// NewRing will create a new Ring object and return a pointer to it.
Expand Down
7 changes: 5 additions & 2 deletions dynamo/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ import (
type Cache struct {
data map[string]string
sync.Mutex
timestamps map[string]int64
}

// Create a new cache object and return a pointer to it.
func NewCache() *Cache {
var s Cache

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

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

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

cache.Lock()
cache.data[key] = value
cache.timestamps[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.timestamps
return data, timestamps
}
17 changes: 12 additions & 5 deletions dynamo/coordinator.go
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,16 @@ func aggregateVotes(votes []*vote) (result string) {
log.Printf("[COORDINATOR] Vote: %v\n", vote.value)
}

/////////////////////////
// YOUR CODE GOES HERE //
/////////////////////////
result = votes[0].value
return
v := votes[0]

for _, vote := range votes {

if vote.timestamp > v.timestamp {
v = vote
}
}

result = v.value

return result
}