IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

tech(influxdb): refactor query builder

Browse Source 
trying to reduce the amounts of moving parts for influxdb
This commit is contained in:
bergquist 2016-11-10 14:38:06 +01:00
parent a948dfe514
commit f924b241ae
3 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/tsdb/influxdb/influxdb.go
View File

@ -18,7 +18,6 @@ import (
type InfluxDBExecutor struct { type InfluxDBExecutor struct {
*tsdb.DataSourceInfo *tsdb.DataSourceInfo
QueryParser *InfluxdbQueryParser QueryParser *InfluxdbQueryParser
QueryBuilder *QueryBuilder
ResponseParser *ResponseParser ResponseParser *ResponseParser
} }
@ -26,7 +25,6 @@ func NewInfluxDBExecutor(dsInfo *tsdb.DataSourceInfo) tsdb.Executor {
return &InfluxDBExecutor{ return &InfluxDBExecutor{
DataSourceInfo: dsInfo, DataSourceInfo: dsInfo,
QueryParser: &InfluxdbQueryParser{}, QueryParser: &InfluxdbQueryParser{},
QueryBuilder: &QueryBuilder{},
ResponseParser: &ResponseParser{}, ResponseParser: &ResponseParser{},
} }
} }
@ -51,7 +49,7 @@ func (e *InfluxDBExecutor) Execute(ctx context.Context, queries tsdb.QuerySlice,
return result.WithError(err) return result.WithError(err)
} }
rawQuery, err := e.QueryBuilder.Build(query, context) rawQuery, err := query.Build(context)
if err != nil { if err != nil {
return result.WithError(err) return result.WithError(err)
} }

30
pkg/tsdb/influxdb/query_builder.go → pkg/tsdb/influxdb/query.go
View File

@ -14,28 +14,26 @@ var (
regexpOperatorPattern *regexp.Regexp = regexp.MustCompile(`^\/.*\/$`) regexpOperatorPattern *regexp.Regexp = regexp.MustCompile(`^\/.*\/$`)
) )
type QueryBuilder struct{} func (query *Query) Build(queryContext *tsdb.QueryContext) (string, error) {
func (qb *QueryBuilder) Build(query *Query, queryContext *tsdb.QueryContext) (string, error) {
if query.UseRawQuery && query.RawQuery != "" { if query.UseRawQuery && query.RawQuery != "" {
q := query.RawQuery q := query.RawQuery
q = strings.Replace(q, "$timeFilter", qb.renderTimeFilter(query, queryContext), 1) q = strings.Replace(q, "$timeFilter", query.renderTimeFilter(queryContext), 1)
q = strings.Replace(q, "$interval", tsdb.CalculateInterval(queryContext.TimeRange), 1) q = strings.Replace(q, "$interval", tsdb.CalculateInterval(queryContext.TimeRange), 1)
return q, nil return q, nil
} }
res := qb.renderSelectors(query, queryContext) res := query.renderSelectors(queryContext)
res += qb.renderMeasurement(query) res += query.renderMeasurement()
res += qb.renderWhereClause(query) res += query.renderWhereClause()
res += qb.renderTimeFilter(query, queryContext) res += query.renderTimeFilter(queryContext)
res += qb.renderGroupBy(query, queryContext) res += query.renderGroupBy(queryContext)
return res, nil return res, nil
} }
func (qb *QueryBuilder) renderTags(query *Query) []string { func (query *Query) renderTags() []string {
var res []string var res []string
for i, tag := range query.Tags { for i, tag := range query.Tags {
str := "" str := ""
@ -76,7 +74,7 @@ func (qb *QueryBuilder) renderTags(query *Query) []string {
return res return res
} }
func (qb *QueryBuilder) renderTimeFilter(query *Query, queryContext *tsdb.QueryContext) string { func (query *Query) renderTimeFilter(queryContext *tsdb.QueryContext) string {
from := "now() - " + queryContext.TimeRange.From from := "now() - " + queryContext.TimeRange.From
to := "" to := ""
@ -87,7 +85,7 @@ func (qb *QueryBuilder) renderTimeFilter(query *Query, queryContext *tsdb.QueryC
return fmt.Sprintf("time > %s%s", from, to) return fmt.Sprintf("time > %s%s", from, to)
} }
func (qb *QueryBuilder) renderSelectors(query *Query, queryContext *tsdb.QueryContext) string { func (query *Query) renderSelectors(queryContext *tsdb.QueryContext) string {
res := "SELECT " res := "SELECT "
var selectors []string var selectors []string
@ -103,7 +101,7 @@ func (qb *QueryBuilder) renderSelectors(query *Query, queryContext *tsdb.QueryCo
return res + strings.Join(selectors, ", ") return res + strings.Join(selectors, ", ")
} }
func (qb *QueryBuilder) renderMeasurement(query *Query) string { func (query *Query) renderMeasurement() string {
policy := "" policy := ""
if query.Policy == "" || query.Policy == "default" { if query.Policy == "" || query.Policy == "default" {
policy = "" policy = ""
@ -113,9 +111,9 @@ func (qb *QueryBuilder) renderMeasurement(query *Query) string {
return fmt.Sprintf(` FROM %s"%s"`, policy, query.Measurement) return fmt.Sprintf(` FROM %s"%s"`, policy, query.Measurement)
} }
func (qb *QueryBuilder) renderWhereClause(query *Query) string { func (query *Query) renderWhereClause() string {
res := " WHERE " res := " WHERE "
conditions := qb.renderTags(query) conditions := query.renderTags()
res += strings.Join(conditions, " ") res += strings.Join(conditions, " ")
if len(conditions) > 0 { if len(conditions) > 0 {
res += " AND " res += " AND "
@ -124,7 +122,7 @@ func (qb *QueryBuilder) renderWhereClause(query *Query) string {
return res return res
} }
func (qb *QueryBuilder) renderGroupBy(query *Query, queryContext *tsdb.QueryContext) string { func (query *Query) renderGroupBy(queryContext *tsdb.QueryContext) string {
groupBy := "" groupBy := ""
for i, group := range query.GroupBy { for i, group := range query.GroupBy {
if i == 0 { if i == 0 {

24
pkg/tsdb/influxdb/query_builder_test.go → pkg/tsdb/influxdb/query_test.go
View File

@ -12,7 +12,6 @@ import (
func TestInfluxdbQueryBuilder(t *testing.T) { func TestInfluxdbQueryBuilder(t *testing.T) {
Convey("Influxdb query builder", t, func() { Convey("Influxdb query builder", t, func() {
builder := QueryBuilder{}
qp1, _ := NewQueryPart("field", []string{"value"}) qp1, _ := NewQueryPart("field", []string{"value"})
qp2, _ := NewQueryPart("mean", []string{}) qp2, _ := NewQueryPart("mean", []string{})
@ -37,7 +36,7 @@ func TestInfluxdbQueryBuilder(t *testing.T) {
Interval: "10s", Interval: "10s",
} }
rawQuery, err := builder.Build(query, queryContext) rawQuery, err := query.Build(queryContext)
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(rawQuery, ShouldEqual, `SELECT mean("value") FROM "policy"."cpu" WHERE time > now() - 5m GROUP BY time(10s) fill(null)`) So(rawQuery, ShouldEqual, `SELECT mean("value") FROM "policy"."cpu" WHERE time > now() - 5m GROUP BY time(10s) fill(null)`)
}) })
@ -51,23 +50,22 @@ func TestInfluxdbQueryBuilder(t *testing.T) {
Interval: "5s", Interval: "5s",
} }
rawQuery, err := builder.Build(query, queryContext) rawQuery, err := query.Build(queryContext)
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(rawQuery, ShouldEqual, `SELECT mean("value") FROM "cpu" WHERE "hostname" = 'server1' OR "hostname" = 'server2' AND time > now() - 5m GROUP BY time(5s), "datacenter" fill(null)`) So(rawQuery, ShouldEqual, `SELECT mean("value") FROM "cpu" WHERE "hostname" = 'server1' OR "hostname" = 'server2' AND time > now() - 5m GROUP BY time(5s), "datacenter" fill(null)`)
}) })
Convey("can render time range", func() { Convey("can render time range", func() {
query := Query{} query := Query{}
builder := &QueryBuilder{}
Convey("render from: 2h to now-1h", func() { Convey("render from: 2h to now-1h", func() {
query := Query{} query := Query{}
queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("2h", "now-1h")} queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("2h", "now-1h")}
So(builder.renderTimeFilter(&query, queryContext), ShouldEqual, "time > now() - 2h and time < now() - 1h") So(query.renderTimeFilter(queryContext), ShouldEqual, "time > now() - 2h and time < now() - 1h")
}) })
Convey("render from: 10m", func() { Convey("render from: 10m", func() {
queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("10m", "now")} queryContext := &tsdb.QueryContext{TimeRange: tsdb.NewTimeRange("10m", "now")}
So(builder.renderTimeFilter(&query, queryContext), ShouldEqual, "time > now() - 10m") So(query.renderTimeFilter(queryContext), ShouldEqual, "time > now() - 10m")
}) })
}) })
@ -82,7 +80,7 @@ func TestInfluxdbQueryBuilder(t *testing.T) {
UseRawQuery: true, UseRawQuery: true,
} }
rawQuery, err := builder.Build(query, queryContext) rawQuery, err := query.Build(queryContext)
So(err, ShouldBeNil) So(err, ShouldBeNil)
So(rawQuery, ShouldEqual, `Raw query`) So(rawQuery, ShouldEqual, `Raw query`)
}) })
@ -90,37 +88,37 @@ func TestInfluxdbQueryBuilder(t *testing.T) {
Convey("can render normal tags without operator", func() { Convey("can render normal tags without operator", func() {
query := &Query{Tags: []*Tag{&Tag{Operator: "", Value: `value`, Key: "key"}}} query := &Query{Tags: []*Tag{&Tag{Operator: "", Value: `value`, Key: "key"}}}
So(strings.Join(builder.renderTags(query), ""), ShouldEqual, `"key" = 'value'`) So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 'value'`)
}) })
Convey("can render regex tags without operator", func() { Convey("can render regex tags without operator", func() {
query := &Query{Tags: []*Tag{&Tag{Operator: "", Value: `/value/`, Key: "key"}}} query := &Query{Tags: []*Tag{&Tag{Operator: "", Value: `/value/`, Key: "key"}}}
So(strings.Join(builder.renderTags(query), ""), ShouldEqual, `"key" =~ /value/`) So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" =~ /value/`)
}) })
Convey("can render regex tags", func() { Convey("can render regex tags", func() {
query := &Query{Tags: []*Tag{&Tag{Operator: "=~", Value: `/value/`, Key: "key"}}} query := &Query{Tags: []*Tag{&Tag{Operator: "=~", Value: `/value/`, Key: "key"}}}
So(strings.Join(builder.renderTags(query), ""), ShouldEqual, `"key" =~ /value/`) So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" =~ /value/`)
}) })
Convey("can render number tags", func() { Convey("can render number tags", func() {
query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "10001", Key: "key"}}} query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "10001", Key: "key"}}}
So(strings.Join(builder.renderTags(query), ""), ShouldEqual, `"key" = 10001`) So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 10001`)
}) })
Convey("can render number tags with decimals", func() { Convey("can render number tags with decimals", func() {
query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "10001.1", Key: "key"}}} query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "10001.1", Key: "key"}}}
So(strings.Join(builder.renderTags(query), ""), ShouldEqual, `"key" = 10001.1`) So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 10001.1`)
}) })
Convey("can render string tags", func() { Convey("can render string tags", func() {
query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "value", Key: "key"}}} query := &Query{Tags: []*Tag{&Tag{Operator: "=", Value: "value", Key: "key"}}}
So(strings.Join(builder.renderTags(query), ""), ShouldEqual, `"key" = 'value'`) So(strings.Join(query.renderTags(), ""), ShouldEqual, `"key" = 'value'`)
}) })
}) })
} }