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

fix naming in test and fix test

Browse source
This commit is contained in:
Barak Michener 2015-06-23 17:38:19 -04:00
parent 390d012fc4
commit 8ee61735b7
3 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graph/bolt/bolt_test.go
View file

@ -104,7 +104,7 @@ func TestCreateDatabase(t *testing.T) {
qs, err := newQuadStore(tmpFile.Name(), nil) qs, err := newQuadStore(tmpFile.Name(), nil)
if qs == nil || err != nil { if qs == nil || err != nil {
t.Error("Failed to create leveldb QuadStore.") t.Error("Failed to create bolt QuadStore.")
} }
if s := qs.Size(); s != 0 { if s := qs.Size(); s != 0 {
t.Errorf("Unexpected size, got:%d expected:0", s) t.Errorf("Unexpected size, got:%d expected:0", s)
@ -167,7 +167,7 @@ func TestLoadDatabase(t *testing.T) {
ts2, didConvert := qs.(*QuadStore) ts2, didConvert := qs.(*QuadStore)
if !didConvert { if !didConvert {
t.Errorf("Could not convert from generic to LevelDB QuadStore") t.Errorf("Could not convert from generic to Bolt QuadStore")
} }
//Test horizon //Test horizon
@ -219,7 +219,7 @@ func TestIterator(t *testing.T) {
qs, err := newQuadStore(tmpFile.Name(), nil) qs, err := newQuadStore(tmpFile.Name(), nil)
if qs == nil || err != nil { if qs == nil || err != nil {
t.Error("Failed to create leveldb QuadStore.") t.Error("Failed to create bolt QuadStore.")
} }
w, _ := writer.NewSingleReplication(qs, nil) w, _ := writer.NewSingleReplication(qs, nil)
@ -313,7 +313,7 @@ func TestSetIterator(t *testing.T) {
qs, err := newQuadStore(tmpFile.Name(), nil) qs, err := newQuadStore(tmpFile.Name(), nil)
if qs == nil || err != nil { if qs == nil || err != nil {
t.Error("Failed to create leveldb QuadStore.") t.Error("Failed to create bolt QuadStore.")
} }
defer qs.Close() defer qs.Close()
@ -428,7 +428,7 @@ func TestOptimize(t *testing.T) {
} }
qs, err := newQuadStore(tmpFile.Name(), nil) qs, err := newQuadStore(tmpFile.Name(), nil)
if qs == nil || err != nil { if qs == nil || err != nil {
t.Error("Failed to create leveldb QuadStore.") t.Error("Failed to create bolt QuadStore.")
} }
w, _ := writer.NewSingleReplication(qs, nil) w, _ := writer.NewSingleReplication(qs, nil)
@ -478,7 +478,7 @@ func TestDeletedFromIterator(t *testing.T) {
qs, err := newQuadStore(tmpFile.Name(), nil) qs, err := newQuadStore(tmpFile.Name(), nil)
if qs == nil || err != nil { if qs == nil || err != nil {
t.Error("Failed to create leveldb QuadStore.") t.Error("Failed to create bolt QuadStore.")
} }
defer qs.Close() defer qs.Close()

8
graph/bolt/quadstore.go
View file

@ -360,12 +360,14 @@ func (qs *QuadStore) UpdateValueKeyBy(name string, amount int64, tx *bolt.Tx) er
if data != nil { if data != nil {
// Node exists in the database -- unmarshal and update. // Node exists in the database -- unmarshal and update.
err := value.Unmarshal(data) var oldvalue proto.NodeData
err := oldvalue.Unmarshal(data)
if err != nil { if err != nil {
glog.Errorf("Error: couldn't reconstruct value: %v", err) glog.Errorf("Error: couldn't reconstruct value: %v", err)
return err return err
} }
value.Size_ += amount oldvalue.Size_ += amount
value = oldvalue
} }
// Are we deleting something? // Are we deleting something?
@ -495,7 +497,7 @@ func (qs *QuadStore) NameOf(k graph.Value) string {
func (qs *QuadStore) SizeOf(k graph.Value) int64 { func (qs *QuadStore) SizeOf(k graph.Value) int64 {
if k == nil { if k == nil {
return 0 return -1
} }
return int64(qs.valueData(k.(*Token)).Size_) return int64(qs.valueData(k.(*Token)).Size_)
} }

11
graph/gaedatastore/quadstore.go
View file

@ -25,9 +25,10 @@ import (
"net/http" "net/http"
"sync" "sync"
"github.com/barakmich/glog"
"appengine" "appengine"
"appengine/datastore" "appengine/datastore"
"github.com/barakmich/glog"
"github.com/google/cayley/graph" "github.com/google/cayley/graph"
"github.com/google/cayley/graph/iterator" "github.com/google/cayley/graph/iterator"
@ -86,7 +87,13 @@ type LogEntry struct {
} }
func init() { func init() {
graph.RegisterQuadStore("gaedatastore", true, newQuadStore, initQuadStore, newQuadStoreForRequest) graph.RegisterQuadStore("gaedatastore", graph.QuadStoreRegistration{
NewFunc: newQuadStore,
NewForRequestFunc: newQuadStoreForRequest,
UpgradeFunc: nil,
InitFunc: initQuadStore,
IsPersistent: true,
})
} }
func initQuadStore(_ string, _ graph.Options) error { func initQuadStore(_ string, _ graph.Options) error {