Entrega Lab 2

common/consistenthash/consistenthash.go

@@ -18,11 +18,15 @@ 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 //
-    /////////////////////////
-
-    return 0
+
+    // alterado
+    sfunc := func(i int) bool {
+    	return r.Nodes[i].HashId >= hashId(key)
+    	return r.Nodes[0]
+  	}
+  	return sort.Search(r.Nodes.Len(), sfunc)
+  	// alterado
+  	//return 0
 }
 
 // NewRing will create a new Ring object and return a pointer to it.

dynamo/cache.go

@@ -5,13 +5,10 @@ import (
     "sync"
 )
 
-///////////////////////////////
-// THIS FILE IS MISSING CODE //
-///////////////////////////////
-
 // Cache is the struct that handle all the data storage for the dynamo server.
 type Cache struct {
-    data map[string]string
+    data map[string]string 
+    time map[string]int64 // alterado
     sync.Mutex
 }
 
@@ -20,7 +17,7 @@ func NewCache() *Cache {
     var s Cache
 
     s.data = make(map[string]string)
-
+    s.time = make(map[string]int64) // alterado
     return &s
 }
 
@@ -29,7 +26,7 @@ func NewCache() *Cache {
 func (cache *Cache) Get(key string) (value string, timestamp int64) {
     cache.Lock()
     value = cache.data[key]
-    timestamp = 0
+    timestamp = cache.time[key] // alterado
     cache.Unlock()
 
     log.Printf("[CACHE] Getting Key '%v' with Value '%v' @ timestamp '%v'\n", key, value, timestamp)
@@ -43,6 +40,7 @@ func (cache *Cache) Put(key string, value string, timestamp int64) {
 
     cache.Lock()
     cache.data[key] = value
+    cache.time[key] = timestamp // alterado
     cache.Unlock()
 
     return
@@ -52,6 +50,7 @@ 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 = make(map[string]int64) // alterado
+    timestamps = cache.time // alterado
     return data, timestamps
 }

dynamo/coordinator.go

@@ -190,9 +190,16 @@ func aggregateVotes(votes []*vote) (result string) {
 		log.Printf("[COORDINATOR] Vote: %v\n", vote.value)
 	}
 
-	/////////////////////////
-	// YOUR CODE GOES HERE //
-	/////////////////////////
+	// alterado
+	var latestStamp int64 = votes[0].timestamp
 	result = votes[0].value
+	for _, vote := range votes {
+		if vote.timestamp > latestStamp {
+			latestStamp = vote.timestamp
+			result = vote.value
+		}
+	}
+	// alterado
+
 	return
 }