Merge hash pool in from master

Conflicts:
	graph/leveldb/triplestore.go
	graph/mongo/triplestore.go
This commit is contained in:
Barak Michener 2014-08-14 21:03:36 -04:00
commit 8720e17d87
4 changed files with 76 additions and 68 deletions

View file

@ -177,13 +177,13 @@ func (it *Iterator) Contains(v graph.Value) bool {
case quad.Subject:
offset = 0
case quad.Predicate:
offset = (it.qs.hasherSize * 2)
offset = (hashSize * 2)
case quad.Object:
offset = (it.qs.hasherSize * 2) * 2
offset = (hashSize * 2) * 2
case quad.Label:
offset = (it.qs.hasherSize * 2) * 3
offset = (hashSize * 2) * 3
}
val := v.(string)[offset : it.qs.hasherSize*2+offset]
val := v.(string)[offset : hashSize*2+offset]
if val == it.hash {
it.result = v
return graph.ContainsLogOut(it, v, true)