Skip to content

Commit

Permalink
refactor: remove dependency, add more docs on method
Browse files Browse the repository at this point in the history
Remove Influxdb dependency.
  • Loading branch information
coanor committed Apr 12, 2023
1 parent 503042f commit bf62d7d
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 2,848 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ module github.com/GuanceCloud/dql-go

go 1.18

require github.com/stretchr/testify v1.8.2

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/stretchr/testify v1.8.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
3 changes: 1 addition & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c h1:qSHzRbhzK8RdXOsAdfDgO49TtqC1oZ+acxPrkfTxcCs=
github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand All @@ -12,6 +10,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
Expand Down
7 changes: 4 additions & 3 deletions options.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,11 @@ func WithSLimit(n int) DQLOption {
}

// WithTimeRange used to set time range of the DQL query.
func WithTimeRange(rng [2]int) DQLOption {
// start and end are UNIX timestamp in ms.
func WithTimeRange(start, end int) DQLOption {
return func(q *dql) {
q.TimeRange = append(q.TimeRange, rng[0])
q.TimeRange = append(q.TimeRange, rng[1])
q.TimeRange = append(q.TimeRange, start)
q.TimeRange = append(q.TimeRange, end)
}
}

Expand Down
19 changes: 13 additions & 6 deletions query.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import (
"fmt"
"io/ioutil"
"net/http"

"github.com/influxdata/influxdb1-client/models"
)

type query struct {
Expand All @@ -22,12 +20,12 @@ type Client struct {
}

// NewClient create a datakit client with IP:Port.
// For example, local default Datakit host is localhost:9529.
func NewClient(dk string) *Client {
c := &Client{
dk: dk,
}

// TODO: new http client
c.cli = &http.Client{}

return c
Expand All @@ -44,9 +42,18 @@ type Result struct {

// A DQLResult is a single DQL's query result.
type DQLResult struct {
Series []*models.Row `json:"series"`
RawQuery string `json:"raw_query,omitempty"`
Cost string `json:"cost"`
Series []*Row `json:"series"`
RawQuery string `json:"raw_query,omitempty"`
Cost string `json:"cost"`
}

// Row represents a single row returned from the execution of a statement.
type Row struct {
Name string `json:"name,omitempty"`
Tags map[string]string `json:"tags,omitempty"`
Columns []string `json:"columns,omitempty"`
Values [][]interface{} `json:"values,omitempty"`
Partial bool `json:"partial,omitempty"`
}

// Query send one or more DQL query to Datakit. We can build
Expand Down
21 changes: 0 additions & 21 deletions vendor/github.com/influxdata/influxdb1-client/LICENSE

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit bf62d7d

Please sign in to comment.