Added functionality so quadstore is generated per request (if needed) for the new appengine backend \n CR : nobody \n Tests run: unit tests
This commit is contained in:
parent
2c74cb1657
commit
35ccfe7677
8 changed files with 130 additions and 51 deletions
24
http/http.go
24
http/http.go
|
|
@ -26,6 +26,7 @@ import (
|
|||
"github.com/julienschmidt/httprouter"
|
||||
|
||||
"github.com/google/cayley/config"
|
||||
"github.com/google/cayley/db"
|
||||
"github.com/google/cayley/graph"
|
||||
)
|
||||
|
||||
|
|
@ -55,6 +56,10 @@ func findAssetsPath() string {
|
|||
return "."
|
||||
}
|
||||
|
||||
if hasAssets("..") {
|
||||
return ".."
|
||||
}
|
||||
|
||||
gopathPath := os.ExpandEnv("$GOPATH/src/github.com/google/cayley")
|
||||
if hasAssets(gopathPath) {
|
||||
return gopathPath
|
||||
|
|
@ -105,6 +110,25 @@ type API struct {
|
|||
handle *graph.Handle
|
||||
}
|
||||
|
||||
func (api *API) GetHandleForRequest(r *http.Request) (*graph.Handle, error) {
|
||||
if !api.config.RequiresHTTPRequestContext {
|
||||
return api.handle, nil
|
||||
}
|
||||
|
||||
opts := make(graph.Options)
|
||||
opts["HTTPRequest"] = r
|
||||
|
||||
qs, err := graph.NewQuadStoreForRequest(api.handle.QuadStore, opts)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
qw, err := db.OpenQuadWriter(qs, api.config)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &graph.Handle{QuadStore: qs, QuadWriter: qw}, nil
|
||||
}
|
||||
|
||||
func (api *API) APIv1(r *httprouter.Router) {
|
||||
r.POST("/api/v1/query/:query_lang", LogRequest(api.ServeV1Query))
|
||||
r.POST("/api/v1/shape/:query_lang", LogRequest(api.ServeV1Shape))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue