Remove histogramValue

benchmark/stats/histogram.go

@@ -9,20 +9,35 @@ import (
 	"strings"
 )
 
-// HistogramValue is the value of Histogram objects.
+// Histogram accumulates values in the form of a histogram with
-type HistogramValue struct {
+// exponentially increased bucket sizes.
-	// Count is the total number of values added to the histogram.
+// The first bucket (with index 0) is [0, n) where n = baseBucketSize.
-	Count int64
+// Bucket i (i>=1) contains [n * m^(i-1), n * m^i), where m = 1 + GrowthFactor.
-	// Sum is the sum of all the values added to the histogram.
+// The type of the values is int64.
-	Sum int64
+type Histogram struct {
-	// SumOfSquares is the sum of squares of all values.
+	opts         HistogramOptions
+	Buckets      []HistogramBucket
+	Count        int64
+	Sum          int64
 	SumOfSquares int64
-	// Min is the minimum of all the values added to the histogram.
+	Min          int64
-	Min int64
+	Max          int64
-	// Max is the maximum of all the values added to the histogram.
+
-	Max int64
+	logBaseBucketSize             float64
-	// Buckets contains all the buckets of the histogram.
+	oneOverLogOnePlusGrowthFactor float64
-	Buckets []HistogramBucket
+}
+
+// HistogramOptions contains the parameters that define the histogram's buckets.
+type HistogramOptions struct {
+	// NumBuckets is the number of buckets.
+	NumBuckets int
+	// GrowthFactor is the growth factor of the buckets. A value of 0.1
+	// indicates that bucket N+1 will be 10% larger than bucket N.
+	GrowthFactor float64
+	// BaseBucketSize is the size of the first bucket.
+	BaseBucketSize float64
+	// MinValue is the lower bound of the first bucket.
+	MinValue int64
 }
 
 // HistogramBucket is one histogram bucket.
@@ -34,7 +49,7 @@ type HistogramBucket struct {
 }
 
 // Print writes textual output of the histogram values.
-func (v HistogramValue) Print(w io.Writer) {
+func (v Histogram) Print(w io.Writer) {
 	avg := float64(v.Sum) / float64(v.Count)
 	fmt.Fprintf(w, "Count: %d  Min: %d  Max: %d  Avg: %.2f\n", v.Count, v.Min, v.Max, avg)
 	fmt.Fprintf(w, "%s\n", strings.Repeat("-", 60))
@@ -69,50 +84,12 @@ func (v HistogramValue) Print(w io.Writer) {
 }
 
 // String returns the textual output of the histogram values as string.
-func (v HistogramValue) String() string {
+func (v Histogram) String() string {
 	var b bytes.Buffer
 	v.Print(&b)
 	return b.String()
 }
 
-// Histogram accumulates values in the form of a histogram with
-// exponentially increased bucket sizes.
-// The first bucket (with index 0) is [0, n) where n = baseBucketSize.
-// Bucket i (i>=1) contains [n * m^(i-1), n * m^i), where m = 1 + GrowthFactor.
-// The type of the values is int64.
-type Histogram struct {
-	opts         HistogramOptions
-	buckets      []bucketInternal
-	count        int64
-	sum          int64
-	sumOfSquares int64
-	min          int64
-	max          int64
-
-	logBaseBucketSize             float64
-	oneOverLogOnePlusGrowthFactor float64
-}
-
-// HistogramOptions contains the parameters that define the histogram's buckets.
-type HistogramOptions struct {
-	// NumBuckets is the number of buckets.
-	NumBuckets int
-	// GrowthFactor is the growth factor of the buckets. A value of 0.1
-	// indicates that bucket N+1 will be 10% larger than bucket N.
-	GrowthFactor float64
-	// BaseBucketSize is the size of the first bucket.
-	BaseBucketSize float64
-	// MinValue is the lower bound of the first bucket.
-	MinValue int64
-}
-
-// bucketInternal is the internal representation of a bucket, which includes a
-// rate counter.
-type bucketInternal struct {
-	lowBound float64
-	count    int64
-}
-
 // NewHistogram returns a pointer to a new Histogram object that was created
 // with the provided options.
 func NewHistogram(opts HistogramOptions) *Histogram {
@@ -124,18 +101,18 @@ func NewHistogram(opts HistogramOptions) *Histogram {
 	}
 	h := Histogram{
 		opts:    opts,
-		buckets: make([]bucketInternal, opts.NumBuckets),
+		Buckets: make([]HistogramBucket, opts.NumBuckets),
-		min:     math.MaxInt64,
+		Min:     math.MaxInt64,
-		max:     math.MinInt64,
+		Max:     math.MinInt64,
 
 		logBaseBucketSize:             math.Log(opts.BaseBucketSize),
 		oneOverLogOnePlusGrowthFactor: 1 / math.Log(1+opts.GrowthFactor),
 	}
 	m := 1.0 + opts.GrowthFactor
 	delta := opts.BaseBucketSize
-	h.buckets[0].lowBound = float64(opts.MinValue)
+	h.Buckets[0].LowBound = float64(opts.MinValue)
 	for i := 1; i < opts.NumBuckets; i++ {
-		h.buckets[i].lowBound = float64(opts.MinValue) + delta
+		h.Buckets[i].LowBound = float64(opts.MinValue) + delta
 		delta = delta * m
 	}
 	return &h
@@ -143,14 +120,14 @@ func NewHistogram(opts HistogramOptions) *Histogram {
 
 // Clear resets all the content of histogram.
 func (h *Histogram) Clear() {
-	h.count = 0
+	h.Count = 0
-	h.sum = 0
+	h.Sum = 0
-	h.sumOfSquares = 0
+	h.SumOfSquares = 0
-	h.max = 0
+	h.Max = 0
-	h.min = math.MaxInt64
+	h.Min = math.MaxInt64
-	h.max = math.MinInt64
+	h.Max = math.MinInt64
-	for _, v := range h.buckets {
+	for _, v := range h.Buckets {
-		v.count = 0
+		v.Count = 0
 	}
 }
 
@@ -165,40 +142,19 @@ func (h *Histogram) Add(value int64) error {
 	if err != nil {
 		return err
 	}
-	h.buckets[bucket].count++
+	h.Buckets[bucket].Count++
-	h.count++
+	h.Count++
-	h.sum += value
+	h.Sum += value
-	h.sumOfSquares += value * value
+	h.SumOfSquares += value * value
-	if value < h.min {
+	if value < h.Min {
-		h.min = value
+		h.Min = value
 	}
-	if value > h.max {
+	if value > h.Max {
-		h.max = value
+		h.Max = value
 	}
 	return nil
 }
 
-// Value returns the accumulated state of the histogram since it was created.
-func (h *Histogram) Value() HistogramValue {
-	b := make([]HistogramBucket, len(h.buckets))
-	for i, v := range h.buckets {
-		b[i] = HistogramBucket{
-			LowBound: v.lowBound,
-			Count:    v.count,
-		}
-	}
-
-	v := HistogramValue{
-		Count:        h.count,
-		Sum:          h.sum,
-		SumOfSquares: h.sumOfSquares,
-		Min:          h.min,
-		Max:          h.max,
-		Buckets:      b,
-	}
-	return v
-}
-
 func (h *Histogram) findBucket(value int64) (int, error) {
 	delta := float64(value - h.opts.MinValue)
 	var b int
@@ -208,7 +164,7 @@ func (h *Histogram) findBucket(value int64) (int, error) {
 		//   = (log(delta) - log(baseBucketSize)) * (1 / log(1+growthFactor)) + 1
 		b = int((math.Log(delta)-h.logBaseBucketSize)*h.oneOverLogOnePlusGrowthFactor + 1)
 	}
-	if b >= len(h.buckets) {
+	if b >= len(h.Buckets) {
 		return 0, fmt.Errorf("no bucket for value: %d", value)
 	}
 	return b, nil

benchmark/stats/stats.go

@@ -104,7 +104,7 @@ func (stats *Stats) Print(w io.Writer) {
 		fmt.Fprint(w, "Histogram (empty)\n")
 	} else {
 		fmt.Fprintf(w, "Histogram (unit: %s)\n", fmt.Sprintf("%v", stats.unit)[1:])
-		stats.histogram.Value().Print(w)
+		stats.histogram.Print(w)
 	}
 }
 

benchmark/worker/benchmark_client.go

@@ -318,19 +318,18 @@ func (bc *benchmarkClient) getStats() *testpb.ClientStats {
 	defer bc.mu.RUnlock()
 	timeElapsed := time.Since(bc.lastResetTime).Seconds()
 
-	histogramValue := bc.histogram.Value()
+	b := make([]uint32, len(bc.histogram.Buckets))
-	b := make([]uint32, len(histogramValue.Buckets))
+	for i, v := range bc.histogram.Buckets {
-	for i, v := range histogramValue.Buckets {
 		b[i] = uint32(v.Count)
 	}
 	return &testpb.ClientStats{
 		Latencies: &testpb.HistogramData{
 			Bucket:       b,
-			MinSeen:      float64(histogramValue.Min),
+			MinSeen:      float64(bc.histogram.Min),
-			MaxSeen:      float64(histogramValue.Max),
+			MaxSeen:      float64(bc.histogram.Max),
-			Sum:          float64(histogramValue.Sum),
+			Sum:          float64(bc.histogram.Sum),
-			SumOfSquares: float64(histogramValue.SumOfSquares),
+			SumOfSquares: float64(bc.histogram.SumOfSquares),
-			Count:        float64(histogramValue.Count),
+			Count:        float64(bc.histogram.Count),
 		},
 		TimeElapsed: timeElapsed,
 		TimeUser:    0,