Add NewAggregateClass() to roll up classes. Test on latest two Go versions.

Author: daniel-nichter

.travis.yml

@@ -1,3 +1,4 @@
 language: go
 go:
-  - 1.7
+  - "1.11"
+  - "1.12"

class.go

@@ -1,5 +1,5 @@
 /*
-	Copyright 2017 Daniel Nichter
+	Copyright 2017, 2019 Daniel Nichter
 	Copyright 2014-2016 Percona LLC and/or its affiliates
 */
 
@@ -17,11 +17,11 @@ type Class struct {
 	Id            string   // 32-character hex checksum of fingerprint
 	Fingerprint   string   // canonical form of query: values replaced with "?"
 	Metrics       Metrics  // statistics for each metric, e.g. max Query_time
-	TotalQueries  uint     // total number of queries in class
+	TotalQueries  uint64   // total number of queries in class
 	UniqueQueries uint     // unique number of queries in class
 	Example       *Example `json:",omitempty"` // sample query with max Query_time
 	// --
-	outliers uint
+	outliers uint64
 	lastDb   string
 	sample   bool
 }
@@ -91,8 +91,69 @@ func (c *Class) Finalize(rateLimit uint) {
 		rateLimit = 1
 	}
 	c.Metrics.Finalize(rateLimit)
-	c.TotalQueries = (c.TotalQueries * rateLimit) + c.outliers
+	c.TotalQueries = (c.TotalQueries * uint64(rateLimit)) + c.outliers
 	if c.Example.QueryTime == 0 {
 		c.Example = nil
 	}
 }
+
+// NewAggregateClass makes a new Class from the given member classes.
+func NewAggregateClass(id, fingerprint string, members []*Class) *Class {
+	aggClass := &Class{
+		Id:            id,
+		Fingerprint:   fingerprint,
+		Metrics:       NewMetrics(),
+		UniqueQueries: uint(len(members)),
+		TotalQueries:  0,
+	}
+
+	for _, memberClass := range members {
+		aggClass.TotalQueries += memberClass.TotalQueries
+
+		for newMetric, newStats := range memberClass.Metrics.TimeMetrics {
+			stats, ok := aggClass.Metrics.TimeMetrics[newMetric]
+			if !ok {
+				m := *newStats
+				aggClass.Metrics.TimeMetrics[newMetric] = &m
+			} else {
+				stats.Sum += newStats.Sum
+				stats.Avg = stats.Sum / float64(aggClass.TotalQueries)
+				if newStats.Min < stats.Min {
+					stats.Min = newStats.Min
+				}
+				if newStats.Max > stats.Max {
+					stats.Max = newStats.Max
+				}
+			}
+		}
+
+		for newMetric, newStats := range memberClass.Metrics.NumberMetrics {
+			stats, ok := aggClass.Metrics.NumberMetrics[newMetric]
+			if !ok {
+				m := *newStats
+				aggClass.Metrics.NumberMetrics[newMetric] = &m
+			} else {
+				stats.Sum += newStats.Sum
+				stats.Avg = stats.Sum / aggClass.TotalQueries
+				if newStats.Min < stats.Min {
+					stats.Min = newStats.Min
+				}
+				if newStats.Max > stats.Max {
+					stats.Max = newStats.Max
+				}
+			}
+		}
+
+		for newMetric, newStats := range memberClass.Metrics.BoolMetrics {
+			stats, ok := aggClass.Metrics.BoolMetrics[newMetric]
+			if !ok {
+				m := *newStats
+				aggClass.Metrics.BoolMetrics[newMetric] = &m
+			} else {
+				stats.Sum += newStats.Sum
+			}
+		}
+	}
+
+	return aggClass
+}

class_test.go

@@ -0,0 +1,71 @@
+// Copyright 2019 Daniel Nichter
+
+package slowlog_test
+
+import (
+	"testing"
+
+	"github.com/go-mysql/slowlog"
+	"github.com/go-test/deep"
+)
+
+func TestAggregateClass(t *testing.T) {
+	c1 := &slowlog.Class{
+		Id:            "111",
+		Fingerprint:   "select *",
+		TotalQueries:  5,
+		UniqueQueries: 1,
+		Metrics: slowlog.Metrics{
+			TimeMetrics: map[string]*slowlog.TimeStats{
+				"Query_time": {Sum: 1.123, Min: 0.100, Avg: 0.2, Med: 0.155, P95: 0.101, Max: 3.222},
+			},
+			NumberMetrics: map[string]*slowlog.NumberStats{
+				"Rows_sent": {Sum: 90, Min: 4, Avg: 18, Med: 7, P95: 8, Max: 10},
+			},
+			BoolMetrics: map[string]*slowlog.BoolStats{
+				"Full_scan": {Sum: 10},
+			},
+		},
+	}
+	c2 := &slowlog.Class{
+		Id:            "222",
+		Fingerprint:   "insert t",
+		TotalQueries:  4,
+		UniqueQueries: 1,
+		Metrics: slowlog.Metrics{
+			TimeMetrics: map[string]*slowlog.TimeStats{
+				"Query_time": {Sum: 1.123, Min: 0.111, Avg: 0.2, Med: 5.555, P95: 9.999, Max: 5.222},
+			},
+			NumberMetrics: map[string]*slowlog.NumberStats{
+				"Rows_sent": {Sum: 100, Min: 0, Avg: 25, Med: 7, P95: 8, Max: 11},
+			},
+			BoolMetrics: map[string]*slowlog.BoolStats{
+				"Full_scan": {Sum: 10},
+			},
+		},
+	}
+
+	expect := &slowlog.Class{
+		Id:            "anId",
+		Fingerprint:   "aFingerprint",
+		TotalQueries:  9,
+		UniqueQueries: 2,
+		Metrics: slowlog.Metrics{
+			TimeMetrics: map[string]*slowlog.TimeStats{
+				"Query_time": {Sum: 2.246, Min: 0.100, Avg: 0.2495555, Med: 0.155, P95: 0.101, Max: 5.222},
+			},
+			NumberMetrics: map[string]*slowlog.NumberStats{
+				"Rows_sent": {Sum: 190, Min: 0, Avg: 21, Med: 7, P95: 8, Max: 11},
+			},
+			BoolMetrics: map[string]*slowlog.BoolStats{
+				"Full_scan": {Sum: 20},
+			},
+		},
+	}
+
+	got := slowlog.NewAggregateClass("anId", "aFingerprint", []*slowlog.Class{c1, c2})
+
+	if diff := deep.Equal(got, expect); diff != nil {
+		t.Error(diff)
+	}
+}

parser_test.go

@@ -1311,7 +1311,7 @@ func TestParserSlowLog001StartOffset(t *testing.T) {
 func TestParserSlowLog015(t *testing.T) {
 	got := parseSlowLog(t, "slow015.log", noOptions)
 	if len(got) != 2 {
-		t.Error("got %d expected 2", len(got))
+		t.Errorf("got %d expected 2", len(got))
 	}
 }