barak/cayley
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

graph: tighten up primarykey json marshaling to prefer integer keys

Browse source
This commit is contained in:
Barak Michener 2015-04-04 19:00:56 -04:00
parent 643e721f82
commit a5cc4007f0
1 changed files with 37 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

69
graph/primarykey.go
View file

@ -32,16 +32,16 @@ const (
) )
type PrimaryKey struct { type PrimaryKey struct {
KeyType primaryKeyType keyType primaryKeyType
mut sync.Mutex mut sync.Mutex
SequentialID int64 sequentialID int64
UniqueID string uniqueID string
} }
func NewSequentialKey(horizon int64) PrimaryKey { func NewSequentialKey(horizon int64) PrimaryKey {
return PrimaryKey{ return PrimaryKey{
KeyType: sequential, keyType: sequential,
SequentialID: horizon, sequentialID: horizon,
} }
} }
@ -51,27 +51,27 @@ func NewUniqueKey(horizon string) PrimaryKey {
id = uuid.NewUUID() id = uuid.NewUUID()
} }
return PrimaryKey{ return PrimaryKey{
KeyType: unique, keyType: unique,
UniqueID: id.String(), uniqueID: id.String(),
} }
} }
func (p *PrimaryKey) Next() PrimaryKey { func (p *PrimaryKey) Next() PrimaryKey {
switch p.KeyType { switch p.keyType {
case sequential: case sequential:
p.mut.Lock() p.mut.Lock()
defer p.mut.Unlock() defer p.mut.Unlock()
p.SequentialID++ p.sequentialID++
if p.SequentialID <= 0 { if p.sequentialID <= 0 {
p.SequentialID = 1 p.sequentialID = 1
} }
return PrimaryKey{ return PrimaryKey{
KeyType: sequential, keyType: sequential,
SequentialID: p.SequentialID, sequentialID: p.sequentialID,
} }
case unique: case unique:
id := uuid.NewUUID() id := uuid.NewUUID()
p.UniqueID = id.String() p.uniqueID = id.String()
return *p return *p
case none: case none:
panic("Calling next() on a none PrimaryKey") panic("Calling next() on a none PrimaryKey")
@ -80,9 +80,9 @@ func (p *PrimaryKey) Next() PrimaryKey {
} }
func (p *PrimaryKey) Int() int64 { func (p *PrimaryKey) Int() int64 {
switch p.KeyType { switch p.keyType {
case sequential: case sequential:
return p.SequentialID return p.sequentialID
case unique: case unique:
glog.Fatal("UUID cannot be cast to an int64") glog.Fatal("UUID cannot be cast to an int64")
return -1 return -1
@ -91,11 +91,11 @@ func (p *PrimaryKey) Int() int64 {
} }
func (p *PrimaryKey) String() string { func (p *PrimaryKey) String() string {
switch p.KeyType { switch p.keyType {
case sequential: case sequential:
return strconv.FormatInt(p.SequentialID, 10) return strconv.FormatInt(p.sequentialID, 10)
case unique: case unique:
return p.UniqueID return p.uniqueID
case none: case none:
panic("Calling String() on a none PrimaryKey") panic("Calling String() on a none PrimaryKey")
} }
@ -103,27 +103,32 @@ func (p *PrimaryKey) String() string {
} }
func (p *PrimaryKey) MarshalJSON() ([]byte, error) { func (p *PrimaryKey) MarshalJSON() ([]byte, error) {
if p.KeyType == none { switch p.keyType {
case none:
return nil, errors.New("Cannot marshal PrimaryKey with KeyType of 'none'") return nil, errors.New("Cannot marshal PrimaryKey with KeyType of 'none'")
case sequential:
return json.Marshal(p.sequentialID)
case unique:
return []byte("\"u" + p.uniqueID + "\""), nil
default:
return nil, errors.New("Unknown PrimaryKey type")
} }
return json.Marshal(*p)
} }
//To avoid recursion in the implmentation of the UnmarshalJSON interface below //To avoid recursion in the implmentation of the UnmarshalJSON interface below
type primaryKey PrimaryKey type primaryKey PrimaryKey
func (p *PrimaryKey) UnmarshalJSON(bytes []byte) error { func (p *PrimaryKey) UnmarshalJSON(bytes []byte) error {
/* Careful special casing here. For example, string-related things might begin
if bytes[0] == '"' { if bytes[0] == '"' {
} switch bytes[1] {
*/ case 'u':
temp := primaryKey{} p.keyType = unique
if err := json.Unmarshal(bytes, &temp); err != nil { p.uniqueID = string(bytes[2 : len(bytes)-1])
return err
}
*p = (PrimaryKey)(temp)
if p.KeyType == none {
return errors.New("Could not properly unmarshal primary key, 'none' keytype detected")
}
return nil return nil
default:
return errors.New("Unknown string-like PrimaryKey type")
}
}
p.keyType = sequential
return json.Unmarshal(bytes, &p.sequentialID)
} }