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

Make query/... interfaces more idiomatic

Browse source 
Also revert the data type returned by queries to interface{} (the change
made sense at the time).
This commit is contained in:
kortschak 2015-02-10 10:06:57 +10:30
parent ad7649806b
commit 21c2d75d07
11 changed files with 304 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

20
http/query.go
View file

@ -49,21 +49,19 @@ func WrapResult(result interface{}) ([]byte, error) {
func Run(q string, ses query.HTTP) (interface{}, error) {
c := make(chan interface{}, 5)
go ses.ExecInput(q, c, 100)
go ses.Execute(q, c, 100)
for res := range c {
ses.BuildJSON(res)
ses.Collate(res)
}
return ses.GetJSON()
return ses.Results()
}
func GetQueryShape(q string, ses query.HTTP) ([]byte, error) {
c := make(chan map[string]interface{}, 5)
go ses.GetQuery(q, c)
var data map[string]interface{}
for res := range c {
data = res
s, err := ses.ShapeOf(q)
if err != nil {
return nil, err
}
return json.Marshal(data)
return json.Marshal(s)
}
// TODO(barakmich): Turn this into proper middleware.
@ -82,7 +80,7 @@ func (api *API) ServeV1Query(w http.ResponseWriter, r *http.Request, params http
return jsonResponse(w, 400, err)
}
code := string(bodyBytes)
result, err := ses.InputParses(code)
result, err := ses.Parse(code)
switch result {
case query.Parsed:
var output interface{}
@ -127,7 +125,7 @@ func (api *API) ServeV1Shape(w http.ResponseWriter, r *http.Request, params http
return jsonResponse(w, 400, err)
}
code := string(bodyBytes)
result, err := ses.InputParses(code)
result, err := ses.Parse(code)
switch result {
case query.Parsed:
var output []byte