Go style
My C++ programmer's disease was acting up.
This commit is contained in:
parent
03798bc4fa
commit
cfca7db47c
4 changed files with 47 additions and 47 deletions
|
|
@ -43,7 +43,7 @@ type Iterator struct {
|
|||
|
||||
func NewIterator(prefix string, d quad.Direction, value graph.Value, qs *TripleStore) *Iterator {
|
||||
vb := value.(Token)
|
||||
p := make([]byte, 0, 2+qs.hasher_size)
|
||||
p := make([]byte, 0, 2+qs.hasherSize)
|
||||
p = append(p, []byte(prefix)...)
|
||||
p = append(p, []byte(vb[1:])...)
|
||||
|
||||
|
|
@ -169,9 +169,9 @@ func PositionOf(prefix []byte, d quad.Direction, qs *TripleStore) int {
|
|||
case quad.Subject:
|
||||
return 2
|
||||
case quad.Predicate:
|
||||
return qs.hasher_size + 2
|
||||
return qs.hasherSize + 2
|
||||
case quad.Object:
|
||||
return 2*qs.hasher_size + 2
|
||||
return 2*qs.hasherSize + 2
|
||||
case quad.Label:
|
||||
return -1
|
||||
}
|
||||
|
|
@ -179,11 +179,11 @@ func PositionOf(prefix []byte, d quad.Direction, qs *TripleStore) int {
|
|||
if bytes.Equal(prefix, []byte("po")) {
|
||||
switch d {
|
||||
case quad.Subject:
|
||||
return 2*qs.hasher_size + 2
|
||||
return 2*qs.hasherSize + 2
|
||||
case quad.Predicate:
|
||||
return 2
|
||||
case quad.Object:
|
||||
return qs.hasher_size + 2
|
||||
return qs.hasherSize + 2
|
||||
case quad.Label:
|
||||
return -1
|
||||
}
|
||||
|
|
@ -191,9 +191,9 @@ func PositionOf(prefix []byte, d quad.Direction, qs *TripleStore) int {
|
|||
if bytes.Equal(prefix, []byte("os")) {
|
||||
switch d {
|
||||
case quad.Subject:
|
||||
return qs.hasher_size + 2
|
||||
return qs.hasherSize + 2
|
||||
case quad.Predicate:
|
||||
return 2*qs.hasher_size + 2
|
||||
return 2*qs.hasherSize + 2
|
||||
case quad.Object:
|
||||
return 2
|
||||
case quad.Label:
|
||||
|
|
@ -203,11 +203,11 @@ func PositionOf(prefix []byte, d quad.Direction, qs *TripleStore) int {
|
|||
if bytes.Equal(prefix, []byte("cp")) {
|
||||
switch d {
|
||||
case quad.Subject:
|
||||
return 2*qs.hasher_size + 2
|
||||
return 2*qs.hasherSize + 2
|
||||
case quad.Predicate:
|
||||
return qs.hasher_size + 2
|
||||
return qs.hasherSize + 2
|
||||
case quad.Object:
|
||||
return 3*qs.hasher_size + 2
|
||||
return 3*qs.hasherSize + 2
|
||||
case quad.Label:
|
||||
return 2
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -185,13 +185,13 @@ func (it *Iterator) Contains(v graph.Value) bool {
|
|||
case quad.Subject:
|
||||
offset = 0
|
||||
case quad.Predicate:
|
||||
offset = (it.qs.hasher_size * 2)
|
||||
offset = (it.qs.hasherSize * 2)
|
||||
case quad.Object:
|
||||
offset = (it.qs.hasher_size * 2) * 2
|
||||
offset = (it.qs.hasherSize * 2) * 2
|
||||
case quad.Label:
|
||||
offset = (it.qs.hasher_size * 2) * 3
|
||||
offset = (it.qs.hasherSize * 2) * 3
|
||||
}
|
||||
val := v.(string)[offset : it.qs.hasher_size*2+offset]
|
||||
val := v.(string)[offset : it.qs.hasherSize*2+offset]
|
||||
if val == it.hash {
|
||||
it.result = v
|
||||
return graph.ContainsLogOut(it, v, true)
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@ var _ graph.BulkLoader = (*TripleStore)(nil)
|
|||
const DefaultDBName = "cayley"
|
||||
|
||||
type TripleStore struct {
|
||||
session *mgo.Session
|
||||
db *mgo.Database
|
||||
hasher_size int
|
||||
make_hasher func() hash.Hash
|
||||
idCache *IDLru
|
||||
session *mgo.Session
|
||||
db *mgo.Database
|
||||
hasherSize int
|
||||
makeHasher func() hash.Hash
|
||||
idCache *IDLru
|
||||
}
|
||||
|
||||
func createNewMongoGraph(addr string, options graph.Options) error {
|
||||
|
|
@ -87,14 +87,14 @@ func newTripleStore(addr string, options graph.Options) (graph.TripleStore, erro
|
|||
}
|
||||
qs.db = conn.DB(dbName)
|
||||
qs.session = conn
|
||||
qs.hasher_size = sha1.Size
|
||||
qs.make_hasher = func() hash.Hash { return sha1.New() }
|
||||
qs.hasherSize = sha1.Size
|
||||
qs.makeHasher = sha1.New
|
||||
qs.idCache = NewIDLru(1 << 16)
|
||||
return &qs, nil
|
||||
}
|
||||
|
||||
func (qs *TripleStore) getIdForTriple(t quad.Quad) string {
|
||||
hasher := qs.make_hasher()
|
||||
hasher := qs.makeHasher()
|
||||
id := qs.convertStringToByteHash(t.Subject, hasher)
|
||||
id += qs.convertStringToByteHash(t.Predicate, hasher)
|
||||
id += qs.convertStringToByteHash(t.Object, hasher)
|
||||
|
|
@ -104,7 +104,7 @@ func (qs *TripleStore) getIdForTriple(t quad.Quad) string {
|
|||
|
||||
func (qs *TripleStore) convertStringToByteHash(s string, hasher hash.Hash) string {
|
||||
hasher.Reset()
|
||||
key := make([]byte, 0, qs.hasher_size)
|
||||
key := make([]byte, 0, qs.hasherSize)
|
||||
hasher.Write([]byte(s))
|
||||
key = hasher.Sum(key)
|
||||
return hex.EncodeToString(key)
|
||||
|
|
@ -246,7 +246,7 @@ func (qs *TripleStore) TriplesAllIterator() graph.Iterator {
|
|||
}
|
||||
|
||||
func (qs *TripleStore) ValueOf(s string) graph.Value {
|
||||
h := qs.make_hasher()
|
||||
h := qs.makeHasher()
|
||||
return qs.convertStringToByteHash(s, h)
|
||||
}
|
||||
|
||||
|
|
@ -292,13 +292,13 @@ func (qs *TripleStore) TripleDirection(in graph.Value, d quad.Direction) graph.V
|
|||
case quad.Subject:
|
||||
offset = 0
|
||||
case quad.Predicate:
|
||||
offset = (qs.hasher_size * 2)
|
||||
offset = (qs.hasherSize * 2)
|
||||
case quad.Object:
|
||||
offset = (qs.hasher_size * 2) * 2
|
||||
offset = (qs.hasherSize * 2) * 2
|
||||
case quad.Label:
|
||||
offset = (qs.hasher_size * 2) * 3
|
||||
offset = (qs.hasherSize * 2) * 3
|
||||
}
|
||||
val := in.(string)[offset : qs.hasher_size*2+offset]
|
||||
val := in.(string)[offset : qs.hasherSize*2+offset]
|
||||
return val
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue