X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=p_s%2Fevents_stages_summary_global_by_event_name%2Fprivate.go;h=a1f417d5ac6ea8b79857b8ec201b8371fef33005;hb=HEAD;hp=51028b6157a66c776f1c497ff81618506658822d;hpb=23d4cb81352e26f3b76b41858988f8aca5797f41;p=pstop.git

diff --git a/p_s/events_stages_summary_global_by_event_name/private.go b/p_s/events_stages_summary_global_by_event_name/private.go
index 51028b6..a1f417d 100644
--- a/p_s/events_stages_summary_global_by_event_name/private.go
+++ b/p_s/events_stages_summary_global_by_event_name/private.go
@@ -19,27 +19,29 @@ Create Table: CREATE TABLE `events_stages_summary_global_by_event_name` (
   `EVENT_NAME` varchar(128) NOT NULL,
   `COUNT_STAR` bigint(20) unsigned NOT NULL,
   `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
-  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL, // not used
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL, // not used
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL  // not used
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 1 row in set (0.00 sec)
 
 **************************************************************************/
 
+// one row of data
 type table_row struct {
 	EVENT_NAME     string
 	COUNT_STAR     uint64
 	SUM_TIMER_WAIT uint64
 }
 
+// a table of rows
 type table_rows []table_row
 
+// select the rows into table
 func select_rows(dbh *sql.DB) table_rows {
 	var t table_rows
 
 	lib.Logger.Println("events_stages_summary_global_by_event_name.select_rows()")
-	// we collect all information even if it's mainly empty as we may reference it later
 	sql := "SELECT EVENT_NAME, COUNT_STAR, SUM_TIMER_WAIT FROM events_stages_summary_global_by_event_name WHERE SUM_TIMER_WAIT > 0"
 
 	rows, err := dbh.Query(sql)
@@ -76,6 +78,7 @@ func (t table_rows) needs_refresh(t2 table_rows) bool {
 	return my_totals.SUM_TIMER_WAIT > t2_totals.SUM_TIMER_WAIT
 }
 
+// generate the totals of a table
 func (t table_rows) totals() table_row {
 	var totals table_row
 	totals.EVENT_NAME = "Totals"
@@ -87,18 +90,16 @@ func (t table_rows) totals() table_row {
 	return totals
 }
 
-func (this *table_row) name() string {
-	return this.EVENT_NAME
-}
-
-func (r *table_row) pretty_name() string {
-	s := r.name()
-	if len(s) > 30 {
-		s = s[:29]
+// return the stage name, removing any leading stage/sql/
+func (r *table_row) name() string {
+	if len(r.EVENT_NAME) > 10 && r.EVENT_NAME[0:10] == "stage/sql/" {
+		return r.EVENT_NAME[10:]
+	} else {
+		return r.EVENT_NAME
 	}
-	return s
 }
 
+// add the values of one row to another one
 func (this *table_row) add(other table_row) {
 	this.SUM_TIMER_WAIT += other.SUM_TIMER_WAIT
 	this.COUNT_STAR += other.COUNT_STAR
@@ -150,30 +151,31 @@ func (this *table_rows) subtract(initial table_rows) {
 	}
 }
 
+// stage headings
 func (r *table_row) headings() string {
-	return fmt.Sprintf("%-30s %10s %6s %6s", "Stage Name", "Latency", "%", "Count")
+	return fmt.Sprintf("%10s %6s %8s|%s", "Latency", "%", "Counter", "Stage Name")
 }
 
 // generate a printable result
 func (r *table_row) row_content(totals table_row) string {
-	name := r.pretty_name()
+	name := r.name()
 	if r.COUNT_STAR == 0 && name != "Totals" {
 		name = ""
 	}
 
-	return fmt.Sprintf("%-30s|%10s %6s %6s",
-		name,
+	return fmt.Sprintf("%10s %6s %8s|%s",
 		lib.FormatTime(r.SUM_TIMER_WAIT),
 		lib.FormatPct(lib.MyDivide(r.SUM_TIMER_WAIT, totals.SUM_TIMER_WAIT)),
-		lib.FormatAmount(r.COUNT_STAR))
+		lib.FormatAmount(r.COUNT_STAR),
+		name)
 }
 
 // describe a whole row
 func (r table_row) String() string {
-	return fmt.Sprintf("%-30s %10s %10s",
-		r.pretty_name(),
+	return fmt.Sprintf("%10s %10s %s",
 		lib.FormatTime(r.SUM_TIMER_WAIT),
-		lib.FormatAmount(r.COUNT_STAR))
+		lib.FormatAmount(r.COUNT_STAR),
+		r.name())
 }
 
 // describe a whole table