1 files changed, 133 insertions, 33 deletions
diff --git a/tools/bigquery/bigquery.go b/tools/bigquery/bigquery.go
index 935154acc..5aa1fe5dc 100644
--- a/tools/bigquery/bigquery.go
+++ b/tools/bigquery/bigquery.go
@@ -39,13 +39,113 @@ type Suite struct {
 	Timestamp  time.Time    `bq:"timestamp"`
 }
 
+func (s *Suite) String() string {
+	var sb strings.Builder
+	s.debugString(&sb, "")
+	return sb.String()
+}
+
+// writeLine writes a line of text to the given string builder with a prefix.
+func writeLine(sb *strings.Builder, prefix string, format string, values ...interface{}) {
+	if prefix != "" {
+		sb.WriteString(prefix)
+	}
+	sb.WriteString(fmt.Sprintf(format, values...))
+	sb.WriteString("\n")
+}
+
+// debugString writes debug information to the given string builder with the
+// given prefix.
+func (s *Suite) debugString(sb *strings.Builder, prefix string) {
+	writeLine(sb, prefix, "Benchmark suite %s:", s.Name)
+	writeLine(sb, prefix, "Timestamp: %v", s.Timestamp)
+	if !s.Official {
+		writeLine(sb, prefix, " **** NOTE: Data is not official. **** ")
+	}
+	if numConditions := len(s.Conditions); numConditions == 0 {
+		writeLine(sb, prefix, "Conditions: None.")
+	} else {
+		writeLine(sb, prefix, "Conditions (%d):", numConditions)
+		for _, condition := range s.Conditions {
+			condition.debugString(sb, prefix+"  ")
+		}
+	}
+	if numBenchmarks := len(s.Benchmarks); numBenchmarks == 0 {
+		writeLine(sb, prefix, "Benchmarks: None.")
+	} else {
+		writeLine(sb, prefix, "Benchmarks (%d):", numBenchmarks)
+		for _, benchmark := range s.Benchmarks {
+			benchmark.debugString(sb, prefix+"  ")
+		}
+	}
+	sb.WriteString(fmt.Sprintf("End of data for benchmark suite %s.", s.Name))
+}
+
 // Benchmark represents an individual benchmark in a suite.
 type Benchmark struct {
 	Name      string       `bq:"name"`
-	Condition []*Condition `bq:"condition"`
+	Condition []*Condition `bq:"cond"`
 	Metric    []*Metric    `bq:"metric"`
 }
 
+// String implements the String method for Benchmark
+func (bm *Benchmark) String() string {
+	var sb strings.Builder
+	bm.debugString(&sb, "")
+	return sb.String()
+}
+
+// debugString writes debug information to the given string builder with the
+// given prefix.
+func (bm *Benchmark) debugString(sb *strings.Builder, prefix string) {
+	writeLine(sb, prefix, "Benchmark: %s", bm.Name)
+	if numConditions := len(bm.Condition); numConditions == 0 {
+		writeLine(sb, prefix, "  Conditions: None.")
+	} else {
+		writeLine(sb, prefix, "  Conditions (%d):", numConditions)
+		for _, condition := range bm.Condition {
+			condition.debugString(sb, prefix+"    ")
+		}
+	}
+	if numMetrics := len(bm.Metric); numMetrics == 0 {
+		writeLine(sb, prefix, "  Metrics: None.")
+	} else {
+		writeLine(sb, prefix, "  Metrics (%d):", numMetrics)
+		for _, metric := range bm.Metric {
+			metric.debugString(sb, prefix+"    ")
+		}
+	}
+}
+
+// AddMetric adds a metric to an existing Benchmark.
+func (bm *Benchmark) AddMetric(metricName, unit string, sample float64) {
+	m := &Metric{
+		Name:   metricName,
+		Unit:   unit,
+		Sample: sample,
+	}
+	bm.Metric = append(bm.Metric, m)
+}
+
+// AddCondition adds a condition to an existing Benchmark.
+func (bm *Benchmark) AddCondition(name, value string) {
+	bm.Condition = append(bm.Condition, NewCondition(name, value))
+}
+
+// NewBenchmark initializes a new benchmark.
+func NewBenchmark(name string, iters int) *Benchmark {
+	return &Benchmark{
+		Name:   name,
+		Metric: make([]*Metric, 0),
+		Condition: []*Condition{
+			{
+				Name:  "iterations",
+				Value: strconv.Itoa(iters),
+			},
+		},
+	}
+}
+
 // Condition represents qualifiers for the benchmark or suite. For example:
 // Get_Pid/1/real_time would have Benchmark Name "Get_Pid" with "1"
 // and "real_time" parameters as conditions. Suite conditions include
@@ -55,6 +155,26 @@ type Condition struct {
 	Value string `bq:"value"`
 }
 
+// NewCondition returns a new Condition with the given name and value.
+func NewCondition(name, value string) *Condition {
+	return &Condition{
+		Name:  name,
+		Value: value,
+	}
+}
+
+func (c *Condition) String() string {
+	var sb strings.Builder
+	c.debugString(&sb, "")
+	return sb.String()
+}
+
+// debugString writes debug information to the given string builder with the
+// given prefix.
+func (c *Condition) debugString(sb *strings.Builder, prefix string) {
+	writeLine(sb, prefix, "Condition: %s = %s", c.Name, c.Value)
+}
+
 // Metric holds the actual metric data and unit information for this benchmark.
 type Metric struct {
 	Name   string  `bq:"name"`
@@ -62,6 +182,18 @@ type Metric struct {
 	Sample float64 `bq:"sample"`
 }
 
+func (m *Metric) String() string {
+	var sb strings.Builder
+	m.debugString(&sb, "")
+	return sb.String()
+}
+
+// debugString writes debug information to the given string builder with the
+// given prefix.
+func (m *Metric) debugString(sb *strings.Builder, prefix string) {
+	writeLine(sb, prefix, "Metric %s: %f %s", m.Name, m.Sample, m.Unit)
+}
+
 // InitBigQuery initializes a BigQuery dataset/table in the project. If the dataset/table already exists, it is not duplicated.
 func InitBigQuery(ctx context.Context, projectID, datasetID, tableID string, opts []option.ClientOption) error {
 	client, err := bq.NewClient(ctx, projectID, opts...)
@@ -87,38 +219,6 @@ func InitBigQuery(ctx context.Context, projectID, datasetID, tableID string, opt
 	return nil
 }
 
-// AddCondition adds a condition to an existing Benchmark.
-func (bm *Benchmark) AddCondition(name, value string) {
-	bm.Condition = append(bm.Condition, &Condition{
-		Name:  name,
-		Value: value,
-	})
-}
-
-// AddMetric adds a metric to an existing Benchmark.
-func (bm *Benchmark) AddMetric(metricName, unit string, sample float64) {
-	m := &Metric{
-		Name:   metricName,
-		Unit:   unit,
-		Sample: sample,
-	}
-	bm.Metric = append(bm.Metric, m)
-}
-
-// NewBenchmark initializes a new benchmark.
-func NewBenchmark(name string, iters int) *Benchmark {
-	return &Benchmark{
-		Name:   name,
-		Metric: make([]*Metric, 0),
-		Condition: []*Condition{
-			{
-				Name:  "iterations",
-				Value: strconv.Itoa(iters),
-			},
-		},
-	}
-}
-
 // NewBenchmarkWithMetric creates a new sending to BigQuery, initialized with a
 // single iteration and single metric.
 func NewBenchmarkWithMetric(name, metric, unit string, value float64) *Benchmark {