rename files/objects to simplify a bit

[pstop.git] / p_s / table_lock_waits_summary_by_table / public.go

diff --git a/p_s/table_lock_waits_summary_by_table/table_lock_waits_summary_by_table.go b/p_s/table_lock_waits_summary_by_table/public.go
similarity index 54%
rename from p_s/table_lock_waits_summary_by_table/table_lock_waits_summary_by_table.go
rename to p_s/table_lock_waits_summary_by_table/public.go
index a4aacbd..1ee9f4a 100644 (file)
--- a/p_s/table_lock_waits_summary_by_table/table_lock_waits_summary_by_table.go
+++ b/p_s/table_lock_waits_summary_by_table/public.go
@@ -12,38 +12,38 @@ import (
 )
 
 // a table of rows
-type Table_lock_waits_summary_by_table struct {
+type Object struct {
        p_s.RelativeStats
        p_s.InitialTime
-       initial table_lock_waits_summary_by_table_rows // initial data for relative values
-       current table_lock_waits_summary_by_table_rows // last loaded values
-       results table_lock_waits_summary_by_table_rows // results (maybe with subtraction)
-       totals  table_lock_waits_summary_by_table_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
 }
 
 // Collect data from the db, then merge it in.
-func (t *Table_lock_waits_summary_by_table) Collect(dbh *sql.DB) {
+func (t *Object) Collect(dbh *sql.DB) {
        start := time.Now()
        t.current = select_tlwsbt_rows(dbh)
 
        if len(t.initial) == 0 && len(t.current) > 0 {
-               t.initial = make(table_lock_waits_summary_by_table_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) {
-               t.initial = make(table_lock_waits_summary_by_table_rows, len(t.current))
+               t.initial = make(table_rows, len(t.current))
                copy(t.initial, t.current)
        }
 
        t.make_results()
-       lib.Logger.Println("Table_lock_waits_summary_by_table.Collect() took:", time.Duration(time.Since(start)).String())
+       lib.Logger.Println("Object.Collect() took:", time.Duration(time.Since(start)).String())
 }
 
-func (t *Table_lock_waits_summary_by_table) make_results() {
+func (t *Object) make_results() {
        // lib.Logger.Println( "- t.results set from t.current" )
-       t.results = make(table_lock_waits_summary_by_table_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()" )
@@ -57,23 +57,23 @@ func (t *Table_lock_waits_summary_by_table) make_results() {
 }
 
 // reset the statistics to current values
-func (t *Table_lock_waits_summary_by_table) SyncReferenceValues() {
+func (t *Object) SyncReferenceValues() {
        t.SetNow()
-       t.initial = make(table_lock_waits_summary_by_table_rows, len(t.current))
+       t.initial = make(table_rows, len(t.current))
        copy(t.initial, t.current)
 
        t.make_results()
 }
 
 // return the headings for a table
-func (t Table_lock_waits_summary_by_table) Headings() string {
-       var r table_lock_waits_summary_by_table_row
+func (t Object) Headings() string {
+       var r table_row
 
        return r.headings()
 }
 
 // return the rows we need for displaying
-func (t Table_lock_waits_summary_by_table) RowContent(max_rows int) []string {
+func (t Object) RowContent(max_rows int) []string {
        rows := make([]string, 0, max_rows)
 
        for i := range t.results {
@@ -86,16 +86,16 @@ func (t Table_lock_waits_summary_by_table) RowContent(max_rows int) []string {
 }
 
 // return all the totals
-func (t Table_lock_waits_summary_by_table) TotalRowContent() string {
+func (t Object) TotalRowContent() string {
        return t.totals.row_content(t.totals)
 }
 
 // return an empty string of data (for filling in)
-func (t Table_lock_waits_summary_by_table) EmptyRowContent() string {
-       var emtpy table_lock_waits_summary_by_table_row
+func (t Object) EmptyRowContent() string {
+       var emtpy table_row
        return emtpy.row_content(emtpy)
 }
 
-func (t Table_lock_waits_summary_by_table) Description() string {
+func (t Object) Description() string {
        return "Locks by Table Name (table_lock_waits_summary_by_table)"
 }