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

fix mongo indexing name mismatch

Browse source
This commit is contained in:
Barak Michener 2014-08-14 01:55:12 -04:00
parent f967b36f84
commit d2026ea271
2 changed files with 12 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graph/mongo/iterator.go
View file

@ -45,17 +45,7 @@ type Iterator struct {
func NewIterator(qs *TripleStore, collection string, d quad.Direction, val graph.Value) *Iterator { func NewIterator(qs *TripleStore, collection string, d quad.Direction, val graph.Value) *Iterator {
name := qs.NameOf(val) name := qs.NameOf(val)
var constraint bson.M constraint := bson.M{d.String(): name}
switch d {
case quad.Subject:
constraint = bson.M{"Subject": name}
case quad.Predicate:
constraint = bson.M{"Predicate": name}
case quad.Object:
constraint = bson.M{"Object": name}
case quad.Label:
constraint = bson.M{"Label": name}
}
size, err := qs.db.C(collection).Find(constraint).Count() size, err := qs.db.C(collection).Find(constraint).Count()
if err != nil { if err != nil {

28
graph/mongo/triplestore.go
View file

@ -54,18 +54,18 @@ func createNewMongoGraph(addr string, options graph.Options) error {
} }
db := conn.DB(dbName) db := conn.DB(dbName)
indexOpts := mgo.Index{ indexOpts := mgo.Index{
Key: []string{"Sub"}, Key: []string{"subject"},
Unique: false, Unique: false,
DropDups: false, DropDups: false,
Background: true, Background: true,
Sparse: true, Sparse: true,
} }
db.C("quads").EnsureIndex(indexOpts) db.C("quads").EnsureIndex(indexOpts)
indexOpts.Key = []string{"Pred"} indexOpts.Key = []string{"predicate"}
db.C("quads").EnsureIndex(indexOpts) db.C("quads").EnsureIndex(indexOpts)
indexOpts.Key = []string{"Obj"} indexOpts.Key = []string{"object"}
db.C("quads").EnsureIndex(indexOpts) db.C("quads").EnsureIndex(indexOpts)
indexOpts.Key = []string{"Label"} indexOpts.Key = []string{"label"}
db.C("quads").EnsureIndex(indexOpts) db.C("quads").EnsureIndex(indexOpts)
logOpts := mgo.Index{ logOpts := mgo.Index{
Key: []string{"LogID"}, Key: []string{"LogID"},
@ -97,7 +97,7 @@ func newTripleStore(addr string, options graph.Options) (graph.TripleStore, erro
return &qs, nil return &qs, nil
} }
func (qs *TripleStore) getIdForTriple(t quad.Quad) string { func (qs *TripleStore) getIdForQuad(t quad.Quad) string {
hasher := qs.makeHasher() hasher := qs.makeHasher()
id := qs.convertStringToByteHash(t.Subject, hasher) id := qs.convertStringToByteHash(t.Subject, hasher)
id += qs.convertStringToByteHash(t.Predicate, hasher) id += qs.convertStringToByteHash(t.Predicate, hasher)
@ -147,26 +147,20 @@ func (qs *TripleStore) updateNodeBy(node_name string, inc int) error {
return err return err
} }
func (qs *TripleStore) updateTriple(t quad.Quad, id int64, proc graph.Procedure) error { func (qs *TripleStore) updateQuad(q quad.Quad, id int64, proc graph.Procedure) error {
var setname string var setname string
if proc == graph.Add { if proc == graph.Add {
setname = "Added" setname = "Added"
} else if proc == graph.Delete { } else if proc == graph.Delete {
setname = "Deleted" setname = "Deleted"
} }
tripledoc := bson.M{
"Subject": t.Subject,
"Predicate": t.Predicate,
"Object": t.Object,
"Label": t.Label,
}
upsert := bson.M{ upsert := bson.M{
"$setOnInsert": tripledoc, "$setOnInsert": q,
"$push": bson.M{ "$push": bson.M{
setname: id, setname: id,
}, },
} }
_, err := qs.db.C("quads").UpsertId(qs.getIdForTriple(t), upsert) _, err := qs.db.C("quads").UpsertId(qs.getIdForQuad(q), upsert)
if err != nil { if err != nil {
glog.Errorf("Error: %v", err) glog.Errorf("Error: %v", err)
} }
@ -202,7 +196,7 @@ func (qs *TripleStore) updateLog(d graph.Delta) error {
entry := MongoLogEntry{ entry := MongoLogEntry{
LogID: d.ID, LogID: d.ID,
Action: action, Action: action,
Key: qs.getIdForTriple(d.Quad), Key: qs.getIdForQuad(d.Quad),
Timestamp: d.Timestamp.UnixNano(), Timestamp: d.Timestamp.UnixNano(),
} }
err := qs.db.C("log").Insert(entry) err := qs.db.C("log").Insert(entry)
@ -217,7 +211,7 @@ func (qs *TripleStore) ApplyDeltas(in []graph.Delta) error {
ids := make(map[string]int) ids := make(map[string]int)
// Pre-check the existence condition. // Pre-check the existence condition.
for _, d := range in { for _, d := range in {
key := qs.getIdForTriple(d.Quad) key := qs.getIdForQuad(d.Quad)
switch d.Action { switch d.Action {
case graph.Add: case graph.Add:
if qs.checkValid(key) { if qs.checkValid(key) {
@ -239,7 +233,7 @@ func (qs *TripleStore) ApplyDeltas(in []graph.Delta) error {
} }
} }
for _, d := range in { for _, d := range in {
err := qs.updateTriple(d.Quad, d.ID, d.Action) err := qs.updateQuad(d.Quad, d.ID, d.Action)
if err != nil { if err != nil {
return err return err
} }