From: Simon J Mudd <sjmudd@pobox.com>
Date: Wed, 14 Jan 2015 23:01:19 +0000 (+0100)
Subject: rename files/objects to simplify a bit
X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=dde216b3b7ec75702a633abf3c57a408c528a011;p=pstop.git

rename files/objects to simplify a bit
---

diff --git a/p_s/events_waits_summary_global_by_event_name/events_waits_summary_global_by_event_name_row.go b/p_s/events_waits_summary_global_by_event_name/private.go
similarity index 64%
rename from p_s/events_waits_summary_global_by_event_name/events_waits_summary_global_by_event_name_row.go
rename to p_s/events_waits_summary_global_by_event_name/private.go
index 7cbda5e..523a20f 100644
--- a/p_s/events_waits_summary_global_by_event_name/events_waits_summary_global_by_event_name_row.go
+++ b/p_s/events_waits_summary_global_by_event_name/private.go
@@ -15,15 +15,15 @@ import (
 // a row from performance_schema.events_waits_summary_global_by_event_name
 // Note: upper case names to match the performance_schema column names.
 // This type is _not_ meant to be exported.
-type events_waits_summary_global_by_event_name_row struct {
+type table_row struct {
 	EVENT_NAME     string
 	SUM_TIMER_WAIT uint64
 	COUNT_STAR     uint64
 }
-type events_waits_summary_global_by_event_name_rows []events_waits_summary_global_by_event_name_row
+type table_rows []table_row
 
 // trim off the leading 'wait/synch/mutex/innodb/'
-func (r *events_waits_summary_global_by_event_name_row) name() string {
+func (r *table_row) name() string {
 	var n string
 	if r.EVENT_NAME == "Totals" {
 		n += r.EVENT_NAME
@@ -33,7 +33,7 @@ func (r *events_waits_summary_global_by_event_name_row) name() string {
 	return n
 }
 
-func (r *events_waits_summary_global_by_event_name_row) pretty_name() string {
+func (r *table_row) pretty_name() string {
 	s := r.name()
 	if len(s) > 30 {
 		s = s[:29]
@@ -41,12 +41,12 @@ func (r *events_waits_summary_global_by_event_name_row) pretty_name() string {
 	return s
 }
 
-func (r *events_waits_summary_global_by_event_name_row) headings() string {
+func (r *table_row) headings() string {
 	return fmt.Sprintf("%-30s %10s %6s %6s", "Mutex Name", "Latency", "MtxCnt", "%")
 }
 
 // generate a printable result
-func (r *events_waits_summary_global_by_event_name_row) row_content(totals events_waits_summary_global_by_event_name_row) string {
+func (r *table_row) row_content(totals table_row) string {
 	name := r.pretty_name()
 	if r.COUNT_STAR == 0 && name != "Totals" {
 		name = ""
@@ -59,27 +59,27 @@ func (r *events_waits_summary_global_by_event_name_row) row_content(totals event
 		lib.FormatPct(lib.MyDivide(r.SUM_TIMER_WAIT, totals.SUM_TIMER_WAIT)))
 }
 
-func (this *events_waits_summary_global_by_event_name_row) add(other events_waits_summary_global_by_event_name_row) {
+func (this *table_row) add(other table_row) {
 	this.SUM_TIMER_WAIT += other.SUM_TIMER_WAIT
 	this.COUNT_STAR += other.COUNT_STAR
 }
 
 // subtract the countable values in one row from another
-func (this *events_waits_summary_global_by_event_name_row) subtract(other events_waits_summary_global_by_event_name_row) {
+func (this *table_row) subtract(other table_row) {
 	// check for issues here (we have a bug) and log it
 	// - this situation should not happen so there's a logic bug somewhere else
 	if this.SUM_TIMER_WAIT >= other.SUM_TIMER_WAIT {
 		this.SUM_TIMER_WAIT -= other.SUM_TIMER_WAIT
 		this.COUNT_STAR -= other.COUNT_STAR
 	} else {
-		lib.Logger.Println("WARNING: events_waits_summary_global_by_event_name_row.subtract() - subtraction problem! (not subtracting)")
+		lib.Logger.Println("WARNING: table_row.subtract() - subtraction problem! (not subtracting)")
 		lib.Logger.Println("this=", this)
 		lib.Logger.Println("other=", other)
 	}
 }
 
-func (t events_waits_summary_global_by_event_name_rows) totals() events_waits_summary_global_by_event_name_row {
-	var totals events_waits_summary_global_by_event_name_row
+func (t table_rows) totals() table_row {
+	var totals table_row
 	totals.EVENT_NAME = "Totals"
 
 	for i := range t {
@@ -89,8 +89,8 @@ func (t events_waits_summary_global_by_event_name_rows) totals() events_waits_su
 	return totals
 }
 
-func select_tiwsbt_rows(dbh *sql.DB) events_waits_summary_global_by_event_name_rows {
-	var t events_waits_summary_global_by_event_name_rows
+func select_rows(dbh *sql.DB) table_rows {
+	var t table_rows
 
 	// we collect all information even if it's mainly empty as we may reference it later
 	sql := "SELECT EVENT_NAME, SUM_TIMER_WAIT, COUNT_STAR FROM events_waits_summary_global_by_event_name WHERE SUM_TIMER_WAIT > 0 AND EVENT_NAME LIKE 'wait/synch/mutex/innodb/%'"
@@ -102,7 +102,7 @@ func select_tiwsbt_rows(dbh *sql.DB) events_waits_summary_global_by_event_name_r
 	defer rows.Close()
 
 	for rows.Next() {
-		var r events_waits_summary_global_by_event_name_row
+		var r table_row
 		if err := rows.Scan(
 			&r.EVENT_NAME,
 			&r.SUM_TIMER_WAIT,
@@ -119,21 +119,21 @@ func select_tiwsbt_rows(dbh *sql.DB) events_waits_summary_global_by_event_name_r
 	return t
 }
 
-func (t events_waits_summary_global_by_event_name_rows) Len() int      { return len(t) }
-func (t events_waits_summary_global_by_event_name_rows) Swap(i, j int) { t[i], t[j] = t[j], t[i] }
+func (t table_rows) Len() int      { return len(t) }
+func (t table_rows) Swap(i, j int) { t[i], t[j] = t[j], t[i] }
 
 // sort by value (descending) but also by "name" (ascending) if the values are the same
-func (t events_waits_summary_global_by_event_name_rows) Less(i, j int) bool {
+func (t table_rows) Less(i, j int) bool {
 	return t[i].SUM_TIMER_WAIT > t[j].SUM_TIMER_WAIT
 }
 
-func (t events_waits_summary_global_by_event_name_rows) Sort() {
+func (t table_rows) Sort() {
 	sort.Sort(t)
 }
 
 // remove the initial values from those rows where there's a match
 // - if we find a row we can't match ignore it
-func (this *events_waits_summary_global_by_event_name_rows) subtract(initial events_waits_summary_global_by_event_name_rows) {
+func (this *table_rows) subtract(initial table_rows) {
 	initial_by_name := make(map[string]int)
 
 	// iterate over rows by name
@@ -152,7 +152,7 @@ func (this *events_waits_summary_global_by_event_name_rows) subtract(initial eve
 
 // if the data in t2 is "newer", "has more values" than t then it needs refreshing.
 // check this by comparing totals.
-func (t events_waits_summary_global_by_event_name_rows) needs_refresh(t2 events_waits_summary_global_by_event_name_rows) bool {
+func (t table_rows) needs_refresh(t2 table_rows) bool {
 	my_totals := t.totals()
 	t2_totals := t2.totals()
 
@@ -160,7 +160,7 @@ func (t events_waits_summary_global_by_event_name_rows) needs_refresh(t2 events_
 }
 
 // describe a whole row
-func (r events_waits_summary_global_by_event_name_row) String() string {
+func (r table_row) String() string {
 	return fmt.Sprintf("%-30s|%10s %10s %10s %10s %10s|%10s %10s|%10s %10s %10s %10s %10s|%10s %10s",
 		r.pretty_name(),
 		lib.FormatTime(r.SUM_TIMER_WAIT),
@@ -168,7 +168,7 @@ func (r events_waits_summary_global_by_event_name_row) String() string {
 }
 
 // describe a whole table
-func (t events_waits_summary_global_by_event_name_rows) String() string {
+func (t table_rows) String() string {
 	s := make([]string, len(t))
 
 	for i := range t {
diff --git a/p_s/events_waits_summary_global_by_event_name/events_waits_summary_global_by_event_name.go b/p_s/events_waits_summary_global_by_event_name/public.go
similarity index 51%
rename from p_s/events_waits_summary_global_by_event_name/events_waits_summary_global_by_event_name.go
rename to p_s/events_waits_summary_global_by_event_name/public.go
index 7560cdb..d3e27e2 100644
--- a/p_s/events_waits_summary_global_by_event_name/events_waits_summary_global_by_event_name.go
+++ b/p_s/events_waits_summary_global_by_event_name/public.go
@@ -14,43 +14,43 @@ import (
 )
 
 // a table of rows
-type Table_events_waits_summary_global_by_event_name struct {
+type Object struct {
 	p_s.RelativeStats
 	p_s.InitialTime
 	want_latency bool
-	initial      events_waits_summary_global_by_event_name_rows // initial data for relative values
-	current      events_waits_summary_global_by_event_name_rows // last loaded values
-	results      events_waits_summary_global_by_event_name_rows // results (maybe with subtraction)
-	totals       events_waits_summary_global_by_event_name_row  // totals of results
+	initial      table_rows // initial data for relative values
+	current      table_rows // last loaded values
+	results      table_rows // results (maybe with subtraction)
+	totals       table_row  // totals of results
 }
 
-func (t *Table_events_waits_summary_global_by_event_name) SetWantsLatency(want_latency bool) {
+func (t *Object) SetWantsLatency(want_latency bool) {
 	t.want_latency = want_latency
 }
 
-func (t Table_events_waits_summary_global_by_event_name) WantsLatency() bool {
+func (t Object) WantsLatency() bool {
 	return t.want_latency
 }
 
 // Collect() collects data from the db, updating initial
 // values if needed, and then subtracting initial values if we want
 // relative values, after which it stores totals.
-func (t *Table_events_waits_summary_global_by_event_name) Collect(dbh *sql.DB) {
+func (t *Object) Collect(dbh *sql.DB) {
 	start := time.Now()
-	// lib.Logger.Println("Table_events_waits_summary_global_by_event_name.Collect() BEGIN")
-	t.current = select_tiwsbt_rows(dbh)
+	// lib.Logger.Println("Object.Collect() BEGIN")
+	t.current = select_rows(dbh)
 	lib.Logger.Println("t.current collected", len(t.current), "row(s) from SELECT")
 
 	if len(t.initial) == 0 && len(t.current) > 0 {
 		lib.Logger.Println("t.initial: copying from t.current (initial setup)")
-		t.initial = make(events_waits_summary_global_by_event_name_rows, len(t.current))
+		t.initial = make(table_rows, len(t.current))
 		copy(t.initial, t.current)
 	}
 
 	// check for reload initial characteristics
 	if t.initial.needs_refresh(t.current) {
 		lib.Logger.Println("t.initial: copying from t.current (data needs refreshing)")
-		t.initial = make(events_waits_summary_global_by_event_name_rows, len(t.current))
+		t.initial = make(table_rows, len(t.current))
 		copy(t.initial, t.current)
 	}
 
@@ -62,12 +62,12 @@ func (t *Table_events_waits_summary_global_by_event_name) Collect(dbh *sql.DB) {
 	lib.Logger.Println("t.current.totals():", t.current.totals())
 	// lib.Logger.Println("t.results:", t.results)
 	// lib.Logger.Println("t.totals:", t.totals)
-	lib.Logger.Println("Table_events_waits_summary_global_by_event_name.Collect() END, took:", time.Duration(time.Since(start)).String())
+	lib.Logger.Println("Object.Collect() END, took:", time.Duration(time.Since(start)).String())
 }
 
-func (t *Table_events_waits_summary_global_by_event_name) make_results() {
+func (t *Object) make_results() {
 	// lib.Logger.Println( "- t.results set from t.current" )
-	t.results = make(events_waits_summary_global_by_event_name_rows, len(t.current))
+	t.results = make(table_rows, len(t.current))
 	copy(t.results, t.current)
 	if t.WantRelativeStats() {
 		// lib.Logger.Println( "- subtracting t.initial from t.results as WantRelativeStats()" )
@@ -81,29 +81,29 @@ func (t *Table_events_waits_summary_global_by_event_name) make_results() {
 }
 
 // reset the statistics to current values
-func (t *Table_events_waits_summary_global_by_event_name) SyncReferenceValues() {
-	// lib.Logger.Println( "Table_events_waits_summary_global_by_event_name.SyncReferenceValues() BEGIN" )
+func (t *Object) SyncReferenceValues() {
+	// lib.Logger.Println( "Object.SyncReferenceValues() BEGIN" )
 
 	t.SetNow()
-	t.initial = make(events_waits_summary_global_by_event_name_rows, len(t.current))
+	t.initial = make(table_rows, len(t.current))
 	copy(t.initial, t.current)
 
 	t.make_results()
 
-	// lib.Logger.Println( "Table_events_waits_summary_global_by_event_name.SyncReferenceValues() END" )
+	// lib.Logger.Println( "Object.SyncReferenceValues() END" )
 }
 
-func (t Table_events_waits_summary_global_by_event_name) EmptyRowContent() string {
+func (t Object) EmptyRowContent() string {
 	return t.emptyRowContent()
 }
 
-func (t *Table_events_waits_summary_global_by_event_name) Headings() string {
-	var r events_waits_summary_global_by_event_name_row
+func (t *Object) Headings() string {
+	var r table_row
 
 	return r.headings()
 }
 
-func (t Table_events_waits_summary_global_by_event_name) RowContent(max_rows int) []string {
+func (t Object) RowContent(max_rows int) []string {
 	rows := make([]string, 0, max_rows)
 
 	for i := range t.results {
@@ -115,22 +115,22 @@ func (t Table_events_waits_summary_global_by_event_name) RowContent(max_rows int
 	return rows
 }
 
-func (t Table_events_waits_summary_global_by_event_name) emptyRowContent() string {
-	var r events_waits_summary_global_by_event_name_row
+func (t Object) emptyRowContent() string {
+	var r table_row
 
 	return r.row_content(r)
 }
 
-func (t Table_events_waits_summary_global_by_event_name) TotalRowContent() string {
+func (t Object) TotalRowContent() string {
 	return t.totals.row_content(t.totals)
 }
 
-func (t Table_events_waits_summary_global_by_event_name) Description() string {
+func (t Object) Description() string {
 	count := t.count_rows()
 	return fmt.Sprintf("Mutex Latency (events_waits_summary_global_by_event_name) %d rows", count)
 }
 
-func (t Table_events_waits_summary_global_by_event_name) count_rows() int {
+func (t Object) count_rows() int {
 	var count int
 	for row := range t.results {
 		if t.results[row].SUM_TIMER_WAIT > 0 {
diff --git a/state/state.go b/state/state.go
index 362ec10..d3677c1 100644
--- a/state/state.go
+++ b/state/state.go
@@ -69,7 +69,7 @@ func (state *State) Setup(dbh *sql.DB) {
 	// setup to their initial types/values
 	state.fsbi = fsbi.NewFileSummaryByInstance(variables)
 	state.tlwsbt = new(tlwsbt.Table_lock_waits_summary_by_table)
-	state.ewsgben = new(ewsgben.Table_events_waits_summary_global_by_event_name)
+	state.ewsgben = new(ewsgben.Object)
 	state.essgben = new(essgben.Object)
 
 	state.want_relative_stats = true // we show info from the point we start collecting data