From 5f496df0bc8b9bbc6d5bd7a893041c9050cbab83 Mon Sep 17 00:00:00 2001
From: Cody Soyland <cody@soyland.org>
Date: Mon, 18 Nov 2013 15:46:43 -0600
Subject: [PATCH] Fix compilation errors, add deps.

---
 commands/pilosa-nexter/nexter.go | 11 ++++-------
 core/etcd.go                     |  4 ++--
 db/shard.go                      |  2 +-
 deps.json                        |  5 +++++
 index/storage_cass.go            |  7 +++++--
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/commands/pilosa-nexter/nexter.go b/commands/pilosa-nexter/nexter.go
index b0913bf18..e06673f83 100644
--- a/commands/pilosa-nexter/nexter.go
+++ b/commands/pilosa-nexter/nexter.go
@@ -26,7 +26,7 @@ func (self *Nexter) countloop(ch chan uint64, id int, client *etcd.Client) {
 	var end uint64
 	for {
 		path := "nexter/" + strconv.Itoa(id)
-		node, err := client.Get(path)
+		node, err := client.Get(path, false)
 		if err != nil {
 			ee, ok := err.(etcd.EtcdError)
 			if ok && ee.ErrorCode == 100 { // node does not exist
@@ -37,21 +37,18 @@ func (self *Nexter) countloop(ch chan uint64, id int, client *etcd.Client) {
 				log.Fatal(err)
 			}
 		} else { // No error, get start of series from etcd node
-			start, err = strconv.ParseUint(node[0].Value, 10, 0)
+			start, err = strconv.ParseUint(node.Kvs[0].Value, 10, 0)
 			end = start + blocksize
 			if err != nil {
 				log.Fatal(err)
 			}
 		}
 		for {
-			newval, ok, err := client.TestAndSet(path, strconv.FormatUint(start, 10), strconv.FormatUint(end, 10), 0)
+			newval, err := client.CompareAndSwap(path, strconv.FormatUint(end, 10), 0, strconv.FormatUint(start, 10), 0)
 			if err != nil {
-				log.Fatal(err)
-			}
-			if ok {
 				break
 			} else {
-				log.Println("Error with TestAndSet! Trying again in 1 second...")
+				log.Println("Error with CompareAndSet! Trying again in 1 second...")
 				time.Sleep(time.Second)
 				start, err = strconv.ParseUint(newval.Value, 10, 0)
 				if err != nil {
diff --git a/core/etcd.go b/core/etcd.go
index 46368ed67..bb19b91d4 100644
--- a/core/etcd.go
+++ b/core/etcd.go
@@ -16,11 +16,11 @@ func (service *Service) SetupEtcd() {
 	defer service.NodeMapMutex.Unlock()
 	service.NodeMap = db.NodeMap{}
 
-	nodes, err := service.Etcd.Get("nodes")
+	nodes, err := service.Etcd.Get("nodes", false)
 	if err != nil {
 		log.Fatal(err)
 	}
-	for _, node := range nodes {
+	for _, node := range nodes.Kvs {
 		nodestring := strings.Split(node.Key, "/")[2]
 		location, err := db.NewLocation(nodestring)
 		if err != nil {
diff --git a/db/shard.go b/db/shard.go
index b982cc0c9..db2508bb6 100644
--- a/db/shard.go
+++ b/db/shard.go
@@ -3,7 +3,7 @@ package db
 import (
 	"fmt"
 	"log"
-	"lru"
+	"github.com/golang/groupcache/lru"
 	"pilosa/index"
 )
 
diff --git a/deps.json b/deps.json
index 7000b1da7..4fbea9c4a 100644
--- a/deps.json
+++ b/deps.json
@@ -19,6 +19,11 @@
         "version": "87bcc4729f2c5a08d2513ad10684c6bbd256380f",
         "type": "git"
     },
+    "lru": {
+        "repo": "github.com/golang/groupcache/lru",
+        "version": "d781998583680cda80cf61e0b37dd0cd8da2eb52",
+        "type": "git"
+    },
     "rbtree": {
         "repo": "github.com/yasushi-saito/rbtree",
         "version": "571e2538414bf914c7e2909b61217b4e3e5508f4",
diff --git a/index/storage_cass.go b/index/storage_cass.go
index 5accf6026..de062381e 100644
--- a/index/storage_cass.go
+++ b/index/storage_cass.go
@@ -17,8 +17,11 @@ func NewCassStorage() Storage{
 	cluster.Consistency = gocql.Quorum
 	//cluster.ProtoVersion = 1
 	// cluster.CQLVersion = "3.0.0"
-	session := cluster.CreateSession()
-	if err := session.Query("USE hotbox").Exec(); err != nil {
+	session, err := cluster.CreateSession()
+	if err != nil {
+		log.Fatal(err)
+	}
+	if err = session.Query("USE hotbox").Exec(); err != nil {
 	}
     obj.db = session
     return obj