converted to main cql driver

core/batch.go

@@ -5,7 +5,7 @@ import (
 	"pilosa/db"
 	. "pilosa/util"
 
-	"tux21b.org/v1/gocql/uuid"
+	"github.com/gocql/gocql/uuid"
 )
 
 type BatchRequest struct {

core/etcd.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/coreos/go-etcd/etcd"
 	"github.com/davecgh/go-spew/spew"
-	"tux21b.org/v1/gocql/uuid"
+	"github.com/gocql/gocql/uuid"
 )
 
 type TopologyMapper struct {

core/http.go

@@ -22,8 +22,8 @@ import (
 
 	notify "github.com/bitly/go-notify"
 	"github.com/davecgh/go-spew/spew"
+	"github.com/gocql/gocql/uuid"
 	"github.com/gorilla/websocket"
-	"tux21b.org/v1/gocql/uuid"
 )
 
 type WebService struct {

core/ping.go

@@ -5,7 +5,7 @@ import (
 	"pilosa/db"
 	"time"
 
-	"tux21b.org/v1/gocql/uuid"
+	"github.com/gocql/gocql/uuid"
 )
 
 type PingRequest struct {

core/service.go

@@ -14,7 +14,7 @@ import (
 	"syscall"
 
 	"github.com/coreos/go-etcd/etcd"
-	"tux21b.org/v1/gocql/uuid"
+	"github.com/gocql/gocql/uuid"
 )
 
 type Service struct {

db/db.go

@@ -3,7 +3,7 @@ package db
 import (
 	"encoding/gob"
 
-	"tux21b.org/v1/gocql/uuid"
+	"github.com/gocql/gocql/uuid"
 )
 
 type Message struct {

db/topology.go

@@ -7,8 +7,8 @@ import (
 	"pilosa/util"
 	"sync"
 
+	"github.com/gocql/gocql/uuid"
 	"github.com/stathat/consistent"
-	"tux21b.org/v1/gocql/uuid"
 )
 
 var FrameDoesNotExistError = errors.New("Frame does not exist.")

deps.json

@@ -6,7 +6,7 @@
     },
     "etcd": {
         "repo": "github.com/coreos/go-etcd/etcd",
-        "version": "35c98e8c885757fab1824daa77cc0e24bf30e76b",
+        "version": "7745cfd7f8e619cc9e6be450238e6253a57a227f",
         "type": "git"
     },
     "gkvlite": {
@@ -20,8 +20,8 @@
         "type": "git"
     },
     "gocql": {
-        "repo": "tux21b.org/v1/gocql",
-        "version": "44eda643c1ae69e866e491b1c935c5b22e42350e",
+        "repo": "github.com/gocql/gocql",
+        "version": "f2deeb64d238e3a470f4489d734fab820cb44b4b",
         "type": "git"
     },
     "goleveldb": {

hold/hold.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	"tux21b.org/v1/gocql/uuid"
+	"github.com/gocql/gocql/uuid"
 )
 
 type holdchan chan interface{}

hold/hold_test.go

@@ -4,8 +4,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gocql/gocql/uuid"
+
 	. "github.com/smartystreets/goconvey/convey"
-	"tux21b.org/v1/gocql/uuid"
 )
 
 func TestHoldChan(t *testing.T) {

index/storage_cass.go

@@ -9,7 +9,7 @@ import (
 
 	"time"
 
-	"tux21b.org/v1/gocql"
+	"github.com/gocql/gocql"
 )
 
 type CassandraStorage struct {

index/timeframe_test.go

@@ -11,13 +11,15 @@ import (
 
 func TestTimeFrame(t *testing.T) {
 
+	//print get_YMD_id(2014,3,28,1234)
 	Convey("Test ID", t, func() {
 		const shortForm = "2006-01-02 15:04"
-		x, _ := time.Parse(shortForm, "2014-01-01 10:03")
+		x, _ := time.Parse(shortForm, "1970-01-01 00:00:00")
 		fmt.Println(x)
 
-		m := GetTimeIds(uint64(1), x, YMDH)
+		m := GetTimeIds(uint64(15027), x, YMD)
 		spew.Dump(m)
+		fmt.Println("OK")
 		So(1, ShouldEqual, 1)
 	})
 	Convey("Test 1H", t, func() {

interfaces/core.go

@@ -3,7 +3,7 @@ package interfaces
 import (
 	"pilosa/db"
 
-	"tux21b.org/v1/gocql/uuid"
+	"github.com/gocql/gocql/uuid"
 )
 
 type Transporter interface {

query/parser.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 	"strconv"
-	"tux21b.org/v1/gocql/uuid"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/gocql/gocql/uuid"
 )
 
 var InvalidQueryError = errors.New("Invalid query format.")

query/planner.go

@@ -5,7 +5,7 @@ import (
 	"math/rand"
 	"pilosa/db"
 
-	"tux21b.org/v1/gocql/uuid"
+	"github.com/gocql/gocql/uuid"
 )
 
 type PortableQueryStep interface {

query/planner_test.go

@@ -4,8 +4,9 @@ import (
 	"pilosa/db"
 	"pilosa/util"
 	"testing"
+
+	"github.com/gocql/gocql/uuid"
 	. "github.com/smartystreets/goconvey/convey"
-	"tux21b.org/v1/gocql/uuid"
 )
 
 func basic_database() (*db.Database, *db.Fragment) {

query/query.go

@@ -4,7 +4,7 @@ import (
 	"pilosa/db"
 	"strings"
 
-	"tux21b.org/v1/gocql/uuid"
+	"github.com/gocql/gocql/uuid"
 )
 
 type QueryInput interface{}

transport/tcp.go

@@ -10,8 +10,9 @@ import (
 	"pilosa/db"
 
 	"time"
+
 	notify "github.com/bitly/go-notify"
-	"tux21b.org/v1/gocql/uuid"
+	"github.com/gocql/gocql/uuid"
 )
 
 type connection struct {

util/util_test.go

@@ -3,8 +3,8 @@ package util
 import (
 	"testing"
 
+	"github.com/gocql/gocql/uuid"
 	. "github.com/smartystreets/goconvey/convey"
-	"tux21b.org/v1/gocql/uuid"
 )
 
 /*