Merge pull request influxdata#7889 from influxdata/js-subquery-fixes

Cherry-pick 1.2 fixes for subqueries into master

CHANGELOG.md

@@ -1,3 +1,10 @@
+## v1.2.1 [unreleased]
+
+### Bugfixes
+
+- [#7877](https://github.com/influxdata/influxdb/issues/7877): Fix mapping of types when the measurement uses a regex
+- [#7888](https://github.com/influxdata/influxdb/pull/7888): Expand query dimensions from the subquery.
+
 ## v1.2.0 [2017-01-24]
 
 ### Release Notes
@@ -6,7 +13,6 @@
 
 The stress tool `influx_stress` will be removed in a subsequent release. We recommend using [`influx-stress`](https://github.com/influxdata/influx-stress) as a replacement.
 
-
 ### Features
 
 - [#7723](https://github.com/influxdata/influxdb/pull/7723): Remove the override of GOMAXPROCS.

cmd/influxd/run/server_test.go

@@ -2959,6 +2959,12 @@ func TestServer_Query_Regex(t *testing.T) {
 			command: `SELECT * FROM db0../cpu[13]/ GROUP BY *`,
 			exp:     `{"results":[{"statement_id":0,"series":[{"name":"cpu1","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",10]]},{"name":"cpu3","tags":{"host":"server01"},"columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",30]]}]}]}`,
 		},
+		&Query{
+			name:    "map field type with a regex source",
+			command: `SELECT value FROM /cpu[13]/`,
+			params:  url.Values{"db": []string{"db0"}},
+			exp:     `{"results":[{"statement_id":0,"series":[{"name":"cpu1","columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",10]]},{"name":"cpu3","columns":["time","value"],"values":[["2015-02-28T01:03:36.703820946Z",30]]}]}]}`,
+		},
 	}...)
 
 	for i, query := range test.queries {

coordinator/shard_mapper.go

@@ -134,7 +134,22 @@ func (a *LocalShardMapping) MapType(m *influxql.Measurement, field string) influ
 	if sg == nil {
 		return influxql.Unknown
 	}
-	return sg.MapType(m.Name, field)
+
+	var names []string
+	if m.Regex != nil {
+		names = sg.MeasurementsByRegex(m.Regex.Val)
+	} else {
+		names = []string{m.Name}
+	}
+
+	var typ influxql.DataType
+	for _, name := range names {
+		t := sg.MapType(name, field)
+		if typ == influxql.Unknown || t < typ {
+			typ = t
+		}
+	}
+	return typ
 }
 
 func (a *LocalShardMapping) CreateIterator(m *influxql.Measurement, opt influxql.IteratorOptions) (influxql.Iterator, error) {

influxql/ast.go

@@ -4508,13 +4508,10 @@ func FieldDimensions(sources Sources, m FieldMapper) (fields map[string]DataType
 				}
 			}
 
-			_, d, err := FieldDimensions(src.Statement.Sources, m)
-			if err != nil {
-				return nil, nil, err
-			}
-
-			for k := range d {
-				dimensions[k] = struct{}{}
+			for _, d := range src.Statement.Dimensions {
+				if expr, ok := d.Expr.(*VarRef); ok {
+					dimensions[expr.Val] = struct{}{}
+				}
 			}
 		}
 	}

influxql/ast_test.go

@@ -411,7 +411,7 @@ func TestSelectStatement_RewriteFields(t *testing.T) {
 		// Rewrite subquery
 		{
 			stmt:    `SELECT * FROM (SELECT mean(value1) FROM cpu GROUP BY host) GROUP BY *`,
-			rewrite: `SELECT mean::float FROM (SELECT mean(value1::float) FROM cpu GROUP BY host) GROUP BY host, region`,
+			rewrite: `SELECT mean::float FROM (SELECT mean(value1::float) FROM cpu GROUP BY host) GROUP BY host`,
 		},
 	}