From ba5b1dbfc3c4e62ebeaaf50f9cfd20b43df93475 Mon Sep 17 00:00:00 2001 From: Barak Michener Date: Tue, 23 Jun 2015 14:11:03 -0400 Subject: [PATCH] update the registration interface --- graph/bolt/quadstore.go | 8 +++++++- graph/leveldb/quadstore.go | 8 +++++++- graph/memstore/quadstore.go | 12 +++++++++--- graph/mongo/quadstore.go | 8 +++++++- 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/graph/bolt/quadstore.go b/graph/bolt/quadstore.go index 14fe71c..791d941 100644 --- a/graph/bolt/quadstore.go +++ b/graph/bolt/quadstore.go @@ -33,7 +33,13 @@ import ( ) func init() { - graph.RegisterQuadStore("bolt", true, newQuadStore, createNewBolt, nil) + graph.RegisterQuadStore(QuadStoreType, graph.QuadStoreRegistration{ + NewFunc: newQuadStore, + NewForRequestFunc: nil, + UpgradeFunc: nil, + InitFunc: createNewBolt, + IsPersistent: true, + }) } var ( diff --git a/graph/leveldb/quadstore.go b/graph/leveldb/quadstore.go index 73cf386..8437ae6 100644 --- a/graph/leveldb/quadstore.go +++ b/graph/leveldb/quadstore.go @@ -35,7 +35,13 @@ import ( ) func init() { - graph.RegisterQuadStore(QuadStoreType, true, newQuadStore, createNewLevelDB, nil) + graph.RegisterQuadStore(QuadStoreType, graph.QuadStoreRegistration{ + NewFunc: newQuadStore, + NewForRequestFunc: nil, + UpgradeFunc: nil, + InitFunc: createNewLevelDB, + IsPersistent: true, + }) } const ( diff --git a/graph/memstore/quadstore.go b/graph/memstore/quadstore.go index 5605437..3a0ea97 100644 --- a/graph/memstore/quadstore.go +++ b/graph/memstore/quadstore.go @@ -30,9 +30,15 @@ import ( const QuadStoreType = "memstore" func init() { - graph.RegisterQuadStore(QuadStoreType, false, func(string, graph.Options) (graph.QuadStore, error) { - return newQuadStore(), nil - }, nil, nil) + graph.RegisterQuadStore(QuadStoreType, graph.QuadStoreRegistration{ + NewFunc: func(string, graph.Options) (graph.QuadStore, error) { + return newQuadStore(), nil + }, + NewForRequestFunc: nil, + UpgradeFunc: nil, + InitFunc: nil, + IsPersistent: false, + }) } func cmp(a, b int64) int { diff --git a/graph/mongo/quadstore.go b/graph/mongo/quadstore.go index a997ecd..06cce2b 100644 --- a/graph/mongo/quadstore.go +++ b/graph/mongo/quadstore.go @@ -34,7 +34,13 @@ const DefaultDBName = "cayley" const QuadStoreType = "mongo" func init() { - graph.RegisterQuadStore(QuadStoreType, true, newQuadStore, createNewMongoGraph, nil) + graph.RegisterQuadStore(QuadStoreType, graph.QuadStoreRegistration{ + NewFunc: newQuadStore, + NewForRequestFunc: nil, + UpgradeFunc: nil, + InitFunc: createNewMongoGraph, + IsPersistent: true, + }) } var (