Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Create a new query request for each Query

pull/4700/head
Cameron Sparr 2015-11-06 11:12:40 -07:00
parent 7d3c84f92a
commit cc077f6fb0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
client/v2/client.go
View File

@ -335,9 +335,6 @@ func (uc *udpclient) Write(bp BatchPoints) error {
} }
func (c *client) Write(bp BatchPoints) error { func (c *client) Write(bp BatchPoints) error {
u := c.url
u.Path = "write"
var b bytes.Buffer var b bytes.Buffer
for _, p := range bp.Points() { for _, p := range bp.Points() {
@ -350,6 +347,8 @@ func (c *client) Write(bp BatchPoints) error {
} }
} }
u := c.url
u.Path = "write"
req, err := http.NewRequest("POST", u.String(), &b) req, err := http.NewRequest("POST", u.String(), &b)
if err != nil { if err != nil {
return err return err
@ -426,25 +425,26 @@ func (uc *udpclient) Query(q Query) (*Response, error) {
// Query sends a command to the server and returns the Response // Query sends a command to the server and returns the Response
func (c *client) Query(q Query) (*Response, error) { func (c *client) Query(q Query) (*Response, error) {
u := c.url u := c.url
u.Path = "query" u.Path = "query"
values := u.Query()
values.Set("q", q.Command)
values.Set("db", q.Database)
if q.Precision != "" {
values.Set("epoch", q.Precision)
}
u.RawQuery = values.Encode()
req, err := http.NewRequest("GET", u.String(), nil) req, err := http.NewRequest("GET", u.String(), nil)
if err != nil { if err != nil {
return nil, err return nil, err
} }
req.Header.Set("Content-Type", "")
req.Header.Set("User-Agent", c.useragent) req.Header.Set("User-Agent", c.useragent)
if c.username != "" { if c.username != "" {
req.SetBasicAuth(c.username, c.password) req.SetBasicAuth(c.username, c.password)
} }
params := req.URL.Query()
params.Set("q", q.Command)
params.Set("db", q.Database)
if q.Precision != "" {
params.Set("epoch", q.Precision)
}
req.URL.RawQuery = params.Encode()
resp, err := c.httpClient.Do(req) resp, err := c.httpClient.Do(req)
if err != nil { if err != nil {
return nil, err return nil, err