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

Merge pull request #3137 from influxdata/fixes/regexp-queries 

Fixes literal expression json serialization
pull/3130/head^2
Brandon Farmer 2018-04-05 17:02:49 -07:00 committed by GitHub
parent 16f5b3dcb7 4bd501b346
commit 92d95972c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -24,6 +24,7 @@
1. [#3111](https://github.com/influxdata/chronograf/pull/3111): Fix saving of new TICKscripts 1. [#3111](https://github.com/influxdata/chronograf/pull/3111): Fix saving of new TICKscripts
1. [#3129](https://github.com/influxdata/chronograf/pull/3129): Only add stateChangesOnly to new rules 1. [#3129](https://github.com/influxdata/chronograf/pull/3129): Only add stateChangesOnly to new rules
1. [#3131](https://github.com/influxdata/chronograf/pull/3131): Fix 500s when deleting organizations 1. [#3131](https://github.com/influxdata/chronograf/pull/3131): Fix 500s when deleting organizations
1. [#3137](https://github.com/influxdata/chronograf/pull/3137): Fixes issues with providing regexp in query
## v1.4.3.1 [2018-04-02] ## v1.4.3.1 [2018-04-02]

29
influx/queries/select.go
View File

@ -13,6 +13,12 @@ import (
"github.com/influxdata/influxdb/influxql" "github.com/influxdata/influxdb/influxql"
) )
type literalJSON struct {
Expr string `json:"expr"`
Val string `json:"val"`
Type string `json:"type"`
}
func ParseSelect(q string) (*SelectStatement, error) { func ParseSelect(q string) (*SelectStatement, error) {
stmt, err := influxql.NewParser(strings.NewReader(q)).ParseStatement() stmt, err := influxql.NewParser(strings.NewReader(q)).ParseStatement()
if err != nil { if err != nil {
@ -115,8 +121,13 @@ func (p *ParenExpr) MarshalJSON() ([]byte, error) {
return []byte(fmt.Sprintf(`{"expr": "paren", "val": %s}`, expr)), nil return []byte(fmt.Sprintf(`{"expr": "paren", "val": %s}`, expr)), nil
} }
func LiteralJSON(lit string, litType string) []byte { func LiteralJSON(lit string, litType string) ([]byte, error) {
return []byte(fmt.Sprintf(`{"expr": "literal", "val": "%s", "type": "%s"}`, lit, litType)) result := literalJSON{
Expr: "literal",
Val: lit,
Type: litType,
}
return json.Marshal(result)
} }
type BooleanLiteral struct { type BooleanLiteral struct {
@ -124,7 +135,7 @@ type BooleanLiteral struct {
} }
func (b *BooleanLiteral) MarshalJSON() ([]byte, error) { func (b *BooleanLiteral) MarshalJSON() ([]byte, error) {
return LiteralJSON(b.String(), "boolean"), nil return LiteralJSON(b.String(), "boolean")
} }
type DurationLiteral struct { type DurationLiteral struct {
@ -132,7 +143,7 @@ type DurationLiteral struct {
} }
func (d *DurationLiteral) MarshalJSON() ([]byte, error) { func (d *DurationLiteral) MarshalJSON() ([]byte, error) {
return LiteralJSON(d.String(), "duration"), nil return LiteralJSON(d.String(), "duration")
} }
type IntegerLiteral struct { type IntegerLiteral struct {
@ -140,7 +151,7 @@ type IntegerLiteral struct {
} }
func (i *IntegerLiteral) MarshalJSON() ([]byte, error) { func (i *IntegerLiteral) MarshalJSON() ([]byte, error) {
return LiteralJSON(i.String(), "integer"), nil return LiteralJSON(i.String(), "integer")
} }
type NumberLiteral struct { type NumberLiteral struct {
@ -148,7 +159,7 @@ type NumberLiteral struct {
} }
func (n *NumberLiteral) MarshalJSON() ([]byte, error) { func (n *NumberLiteral) MarshalJSON() ([]byte, error) {
return LiteralJSON(n.String(), "number"), nil return LiteralJSON(n.String(), "number")
} }
type RegexLiteral struct { type RegexLiteral struct {
@ -156,7 +167,7 @@ type RegexLiteral struct {
} }
func (r *RegexLiteral) MarshalJSON() ([]byte, error) { func (r *RegexLiteral) MarshalJSON() ([]byte, error) {
return LiteralJSON(r.String(), "regex"), nil return LiteralJSON(r.String(), "regex")
} }
// TODO: I don't think list is right // TODO: I don't think list is right
@ -178,7 +189,7 @@ type StringLiteral struct {
} }
func (s *StringLiteral) MarshalJSON() ([]byte, error) { func (s *StringLiteral) MarshalJSON() ([]byte, error) {
return LiteralJSON(s.Val, "string"), nil return LiteralJSON(s.Val, "string")
} }
type TimeLiteral struct { type TimeLiteral struct {
@ -186,7 +197,7 @@ type TimeLiteral struct {
} }
func (t *TimeLiteral) MarshalJSON() ([]byte, error) { func (t *TimeLiteral) MarshalJSON() ([]byte, error) {
return LiteralJSON(t.Val.UTC().Format(time.RFC3339Nano), "time"), nil return LiteralJSON(t.Val.UTC().Format(time.RFC3339Nano), "time")
} }
type VarRef struct { type VarRef struct {

1
influx/queries/select_test.go
View File

@ -16,6 +16,7 @@ func TestSelect(t *testing.T) {
{q: `SELECT derivative(field1, 1h) / derivative(field2, 1h) FROM myseries`}, {q: `SELECT derivative(field1, 1h) / derivative(field2, 1h) FROM myseries`},
{q: `SELECT mean("load1") FROM "system" WHERE "cluster_id" =~ /^$ClusterID$/ AND time > now() - 1h GROUP BY time(10m), "host" fill(null)`}, {q: `SELECT mean("load1") FROM "system" WHERE "cluster_id" =~ /^$ClusterID$/ AND time > now() - 1h GROUP BY time(10m), "host" fill(null)`},
{q: "SELECT max(\"n_cpus\") AS \"max_cpus\", non_negative_derivative(median(\"n_users\"), 5m) FROM \"system\" WHERE \"cluster_id\" =~ /^23/ AND \"host\" = 'prod-2ccccc04-us-east-1-data-3' AND time > now() - 15m GROUP BY time(15m, 10s),host,tag_x fill(10)"}, {q: "SELECT max(\"n_cpus\") AS \"max_cpus\", non_negative_derivative(median(\"n_users\"), 5m) FROM \"system\" WHERE \"cluster_id\" =~ /^23/ AND \"host\" = 'prod-2ccccc04-us-east-1-data-3' AND time > now() - 15m GROUP BY time(15m, 10s),host,tag_x fill(10)"},
{q: "SELECT mean(\"usage_user\") AS \"mean_usage_user\" FROM \"telegraf\".\"default\".\"cpu\" WHERE host =~ /\\./ AND time > now() - 1h"},
{q: `SELECT 1 + "A" FROM howdy`}, {q: `SELECT 1 + "A" FROM howdy`},
} }