merge from paulmach

client/client.go

@@ -20,7 +20,7 @@ var (
 )
 
 func init() {
-    IdGen = NewObjectId()
+	IdGen = NewAutoIncId()
 }
 
 // Status handler

client/id.go

@@ -2,34 +2,28 @@ package client
 
 import (
 	"strconv"
-    "labix.org/v2/mgo/bson"
+	"sync/atomic"
-    "github.com/mikespook/golib/autoinc"
+	"time"
 )
 
 type IdGenerator interface {
 	Id() string
 }
 
-// ObjectId
-type objectId struct {}
-
-func (id *objectId) Id() string {
-    return bson.NewObjectId().Hex()
-}
-
-func NewObjectId() IdGenerator {
-    return &objectId{}
-}
-
 // AutoIncId
 type autoincId struct {
-    *autoinc.AutoInc
+	value int64
 }
 
-func (id *autoincId) Id() string {
+func (ai *autoincId) Id() string {
-    return strconv.Itoa(id.AutoInc.Id())
+	next := atomic.AddInt64(&ai.value, 1)
+	return strconv.FormatInt(next, 10)
 }
 
 func NewAutoIncId() IdGenerator {
-    return &autoincId{autoinc.New(1, 1)}
+	// we'll consider the nano fraction of a second at startup unique
+	// and count up from there.
+	return &autoincId{
+		value: int64(time.Now().Nanosecond()) << 32,
+	}
 }

client/id_test.go

@@ -0,0 +1,18 @@
+package client
+
+import (
+	"testing"
+)
+
+func TestAutoInc(t *testing.T) {
+	ai := NewAutoIncId()
+
+	previous := ai.Id()
+	for i := 0; i < 10; i++ {
+		id := ai.Id()
+		if id == previous {
+			t.Errorf("Id not unique, previous and current %s", id)
+		}
+		previous = id
+	}
+}