groupby debug

grafadruid · Nov 24, 2020 · 5c29e1b · 5c29e1b
1 parent 9c00981
commit 5c29e1b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 17 deletions.
diff --git a/builder/query/group_by.go b/builder/query/group_by.go
@@ -23,7 +23,7 @@ type GroupBy struct {
 	PostAggregations []builder.PostAggregator `json:"postAggregations"`
 	Having           builder.HavingSpec       `json:"having"`
 	LimitSpec        builder.LimitSpec        `json:"limitSpec"`
-	SubtotalsSpec    [][]string               `json:"subtotalsSpec"`
+	SubtotalsSpec    [][]string               `json:"subtotalsSpec",omitempty`
 }
 
 func NewGroupBy() *GroupBy {
@@ -88,8 +88,8 @@ func (g *GroupBy) SetSubtotalsSpec(subtotalsSpec [][]string) *GroupBy {
 }
 
 func (g *GroupBy) UnmarshalJSON(data []byte) error {
+	var err error
 	var tmp struct {
-		Base
 		VirtualColumns   []json.RawMessage `json:"virtualColumns"`
 		Filter           json.RawMessage   `json:"filter"`
 		Granularity      json.RawMessage   `json:"granularity"`
@@ -99,10 +99,9 @@ func (g *GroupBy) UnmarshalJSON(data []byte) error {
 		LimitSpec        json.RawMessage   `json:"limitSpec"`
 		SubtotalsSpec    [][]string        `json:"subtotalsSpec"`
 	}
-	if err := json.Unmarshal(data, &tmp); err != nil {
+	if err = json.Unmarshal(data, &tmp); err != nil {
 		return err
 	}
-	var err error
 	var v builder.VirtualColumn
 	vv := make([]builder.VirtualColumn, len(tmp.VirtualColumns))
 	for i := range tmp.VirtualColumns {
@@ -111,9 +110,12 @@ func (g *GroupBy) UnmarshalJSON(data []byte) error {
 		}
 		vv[i] = v
 	}
-	f, err := filter.Load(tmp.Filter)
-	if err != nil {
-		return err
+	var f builder.Filter
+	if tmp.Filter != nil {
+		f, err = filter.Load(tmp.Filter)
+		if err != nil {
+			return err
+		}
 	}
 	gr, err := granularity.Load(tmp.Granularity)
 	if err != nil {
@@ -135,15 +137,24 @@ func (g *GroupBy) UnmarshalJSON(data []byte) error {
 		}
 		pp[i] = p
 	}
-	h, err := havingspec.Load(tmp.Having)
-	if err != nil {
-		return err
+	var h builder.HavingSpec
+	if tmp.Having != nil {
+		h, err = havingspec.Load(tmp.Having)
+		if err != nil {
+			return err
+		}
 	}
-	l, err := limitspec.Load(tmp.LimitSpec)
-	if err != nil {
-		return err
+	var l builder.LimitSpec
+	if tmp.LimitSpec != nil {
+		l, err = limitspec.Load(tmp.LimitSpec)
+		if err != nil {
+			return err
+		}
+	}
+	if len(tmp.SubtotalsSpec) == 0 {
+		tmp.SubtotalsSpec = nil
 	}
-	g.Base = tmp.Base
+	g.Base.UnmarshalJSON(data)
 	g.VirtualColumns = vv
 	g.Filter = f
 	g.Granularity = gr

diff --git a/builder/query/timeseries.go b/builder/query/timeseries.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/davecgh/go-spew/spew"
 	"github.com/grafadruid/go-druid/builder"
 	"github.com/grafadruid/go-druid/builder/aggregation"
 	"github.com/grafadruid/go-druid/builder/filter"
@@ -139,6 +138,5 @@ func (t *Timeseries) UnmarshalJSON(data []byte) error {
 	t.Aggregations = aa
 	t.PostAggregations = pp
 	t.Limit = tmp.Limit
-	spew.Dump(t)
 	return nil
 }
diff --git a/examples/main.go b/examples/main.go
@@ -57,7 +57,12 @@ func main() {
 	d.Query().Execute(q, &results)
 	spew.Dump(results)
 
-	q, err = d.Query().Load([]byte("{\"aggregations\":[{\"fieldName\":\"sum_delta\",\"name\":\"delta\",\"type\":\"longSum\"}],\"context\":{\"plop\":\"plep\"},\"dataSource\":{\"name\":\"wikipedia\",\"type\":\"table\"},\"dimension\":{\"dimension\":\"regionName\",\"outputName\":\"region\",\"outputType\":\"STRING\",\"type\":\"default\"},\"filter\":{\"dimension\":\"countryName\",\"extractionFn\":null,\"type\":\"selector\",\"value\":\"France\"},\"granularity\":\"day\",\"intervals\":[\"2016-06-26T23:46:21.573Z/2016-06-27T16:03:59.999Z\"],\"metric\":{\"metric\":\"delta\",\"type\":\"numeric\"},\"postAggregations\":[],\"queryType\":\"topN\",\"threshold\":50,\"virtualColumns\":[]}"))
+	q, err = d.Query().Load([]byte("{\"aggregations\":[{\"fieldName\":\"sum_delta\",\"name\":\"delta\",\"type\":\"longSum\"}],\"context\":{\"plop\":\"plep\"},\"dataSource\":{\"name\":\"wikipedia\",\"type\":\"table\"},\"dimension\":{\"dimension\":\"regionName\",\"outputName\":\"region\",\"outputType\":\"STRING\",\"type\":\"default\"},\"filter\":{\"dimension\":\"countryName\",\"extractionFn\":null,\"type\":\"selector\",\"value\":\"France\"},\"granularity\":\"hour\",\"intervals\":[\"2016-06-26T23:46:21.573Z/2016-07-27T16:03:59.999Z\"],\"metric\":{\"metric\":\"delta\",\"type\":\"numeric\"},\"postAggregations\":[],\"queryType\":\"topN\",\"threshold\":50,\"virtualColumns\":[]}"))
+	spew.Dump(q, err)
+	d.Query().Execute(q, &results)
+	spew.Dump(results)
+
+	q, err = d.Query().Load([]byte("{\"aggregations\":[{\"fieldName\":\"sum_delta\",\"name\":\"delta\",\"type\":\"longSum\"}],\"context\":{\"plop\":\"plep\"},\"dataSource\":{\"name\":\"wikipedia\",\"type\":\"table\"},\"dimensions\":[{\"dimension\":\"countryName\",\"outputName\":\"country\",\"outputType\":\"STRING\",\"type\":\"default\"},{\"dimension\":\"regionName\",\"outputName\":\"region\",\"outputType\":\"STRING\",\"type\":\"default\"}],\"filter\":{\"dimension\":\"countryName\",\"extractionFn\":null,\"type\":\"selector\",\"value\":\"France\"},\"granularity\":\"minute\",\"intervals\":[\"2016-06-26T23:58:44.369Z/2016-06-27T21:02:53.165Z\"],\"postAggregations\":[],\"queryType\":\"groupBy\",\"subtotalsSpec\":[],\"virtualColumns\":[]}"))
 	spew.Dump(q, err)
 	d.Query().Execute(q, &results)
 	spew.Dump(results)