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

Simplify db.Open name

Browse source
This commit is contained in:
kortschak 2014-06-28 15:21:46 +09:30
parent 96b4d05330
commit 334431418e
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cayley.go
View file

@ -71,15 +71,15 @@ func main() {
case "init": case "init":
db.Init(cfg, *tripleFile) db.Init(cfg, *tripleFile)
case "load": case "load":
ts = db.OpenTSFrom(cfg) ts = db.Open(cfg)
db.Load(ts, cfg, *tripleFile, false) db.Load(ts, cfg, *tripleFile, false)
ts.Close() ts.Close()
case "repl": case "repl":
ts = db.OpenTSFrom(cfg) ts = db.Open(cfg)
db.Repl(ts, *queryLanguage, cfg) db.Repl(ts, *queryLanguage, cfg)
ts.Close() ts.Close()
case "http": case "http":
ts = db.OpenTSFrom(cfg) ts = db.Open(cfg)
http.Serve(ts, cfg) http.Serve(ts, cfg)
ts.Close() ts.Close()
default: default:

2
db/init.go
View file

@ -32,7 +32,7 @@ func Init(cfg *config.Config, triplePath string) bool {
return true return true
} }
if created && triplePath != "" { if created && triplePath != "" {
ts := OpenTSFrom(cfg) ts := Open(cfg)
Load(ts, cfg, triplePath, true) Load(ts, cfg, triplePath, true)
ts.Close() ts.Close()
} }

2
db/open.go
View file

@ -24,7 +24,7 @@ import (
"github.com/google/cayley/graph/mongo" "github.com/google/cayley/graph/mongo"
) )
func OpenTSFrom(cfg *config.Config) graph.TripleStore { func Open(cfg *config.Config) graph.TripleStore {
glog.Infof("Opening database \"%s\" at %s", cfg.DatabaseType, cfg.DatabasePath) glog.Infof("Opening database \"%s\" at %s", cfg.DatabaseType, cfg.DatabasePath)
switch cfg.DatabaseType { switch cfg.DatabaseType {
case "mongo", "mongodb": case "mongo", "mongodb":