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

Go style

Browse source 
My C++ programmer's disease was acting up.
This commit is contained in:
Barak Michener 2014-08-13 14:54:36 -04:00
parent 03798bc4fa
commit cfca7db47c
4 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

38
graph/leveldb/triplestore.go
View file

@ -49,15 +49,15 @@ func (t Token) Key() interface{} {
}
type TripleStore struct {
dbOpts *opt.Options
db *leveldb.DB
path string
open bool
size int64
hasher_size int
make_hasher func() hash.Hash
writeopts *opt.WriteOptions
readopts *opt.ReadOptions
dbOpts *opt.Options
db *leveldb.DB
path string
open bool
size int64
hasherSize int
makeHasher func() hash.Hash
writeopts *opt.WriteOptions
readopts *opt.ReadOptions
}
func createNewLevelDB(path string, _ graph.Options) error {
@ -94,8 +94,8 @@ func newTripleStore(path string, options graph.Options) (graph.TripleStore, erro
write_buffer_mb = val
}
qs.dbOpts.WriteBuffer = write_buffer_mb * opt.MiB
qs.hasher_size = sha1.Size
qs.make_hasher = func() hash.Hash { return sha1.New() }
qs.hasherSize = sha1.Size
qs.makeHasher = sha1.New
qs.writeopts = &opt.WriteOptions{
Sync: false,
}
@ -125,8 +125,8 @@ func (qs *TripleStore) Size() int64 {
}
func (qs *TripleStore) createKeyFor(d [3]quad.Direction, triple quad.Quad) []byte {
hasher := qs.make_hasher()
key := make([]byte, 0, 2+(qs.hasher_size*3))
hasher := qs.makeHasher()
key := make([]byte, 0, 2+(qs.hasherSize*3))
// TODO(kortschak) Remove dependence on String() method.
key = append(key, []byte{d[0].Prefix(), d[1].Prefix()}...)
key = append(key, qs.convertStringToByteHash(triple.Get(d[0]), hasher)...)
@ -136,8 +136,8 @@ func (qs *TripleStore) createKeyFor(d [3]quad.Direction, triple quad.Quad) []byt
}
func (qs *TripleStore) createProvKeyFor(d [3]quad.Direction, triple quad.Quad) []byte {
hasher := qs.make_hasher()
key := make([]byte, 0, 2+(qs.hasher_size*4))
hasher := qs.makeHasher()
key := make([]byte, 0, 2+(qs.hasherSize*4))
// TODO(kortschak) Remove dependence on String() method.
key = append(key, []byte{quad.Label.Prefix(), d[0].Prefix()}...)
key = append(key, qs.convertStringToByteHash(triple.Get(quad.Label), hasher)...)
@ -148,8 +148,8 @@ func (qs *TripleStore) createProvKeyFor(d [3]quad.Direction, triple quad.Quad) [
}
func (qs *TripleStore) createValueKeyFor(s string) []byte {
hasher := qs.make_hasher()
key := make([]byte, 0, 1+qs.hasher_size)
hasher := qs.makeHasher()
key := make([]byte, 0, 1+qs.hasherSize)
key = append(key, []byte("z")...)
key = append(key, qs.convertStringToByteHash(s, hasher)...)
return key
@ -338,7 +338,7 @@ func (qs *TripleStore) Quad(k graph.Value) quad.Quad {
func (qs *TripleStore) convertStringToByteHash(s string, hasher hash.Hash) []byte {
hasher.Reset()
key := make([]byte, 0, qs.hasher_size)
key := make([]byte, 0, qs.hasherSize)
hasher.Write([]byte(s))
key = hasher.Sum(key)
return key
@ -446,7 +446,7 @@ func (qs *TripleStore) TripleDirection(val graph.Value, d quad.Direction) graph.
v := val.(Token)
offset := PositionOf(v[0:2], d, qs)
if offset != -1 {
return Token(append([]byte("z"), v[offset:offset+qs.hasher_size]...))
return Token(append([]byte("z"), v[offset:offset+qs.hasherSize]...))
} else {
return Token(qs.Quad(val).Get(d))
}