Merge branch 'dmius-l003' into 'master'

fix: l003 sort

See merge request postgres-ai/postgres-checkup!451

Author: NikolayS

pghrep/src/checkup/checkuputil.go

@@ -274,8 +274,9 @@ func SortItemsByInt(data interface{}, field string, reverse bool) []string {
 // Get map keys sorted by defined float64 field inside struct
 func SortItemsByFloat64(data interface{}, field string, reverse bool) []string {
 	var result []string
-	var numData map[float64]string = map[float64]string{}
+	var numData map[float64]int = map[float64]int{}
 	var keys []float64
+	var values []string
 
 	v := reflect.ValueOf(data)
 
@@ -298,7 +299,16 @@ func SortItemsByFloat64(data interface{}, field string, reverse bool) []string {
 
 			num := valNum.Interface()
 			floatNum := num.(float64)
-			numData[floatNum] = id.(string)
+			for true {
+				if _, ok := numData[floatNum]; ok {
+					floatNum = floatNum * 1.000001
+				} else {
+					break
+				}
+			}
+
+			values = append(values, id.(string))
+			numData[floatNum] = len(values) - 1
 			keys = append(keys, floatNum)
 		}
 
@@ -309,7 +319,7 @@ func SortItemsByFloat64(data interface{}, field string, reverse bool) []string {
 		}
 
 		for _, key := range keys {
-			result = append(result, numData[key])
+			result = append(result, values[numData[key]])
 		}
 	}
 

pghrep/src/checkup/l003/l003.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	checkup ".."
+	"../../pyraconv"
 	"github.com/dustin/go-humanize/english"
 )
 
@@ -41,6 +42,18 @@ func L003Process(report L003Report) (checkup.ReportResult, error) {
 	return result, nil
 }
 
+func L003ProcessSortTables(data map[string]interface{}, report L003Report) (map[string]interface{}, error) {
+	for host, hostData := range report.Results {
+		sortedTables := checkup.SortItemsByFloat64(hostData.Data.Tables, "CapacityUsedPercent", true)
+		results := pyraconv.ToInterfaceMap(data["results"])
+		rawHostData := pyraconv.ToInterfaceMap(results[host])
+		tablesData := pyraconv.ToInterfaceMap(rawHostData["data"])
+		tablesData["sortedTables"] = sortedTables
+	}
+
+	return data, nil
+}
+
 func L003PreprocessReportData(data map[string]interface{}) {
 	var report L003Report
 	filePath := data["source_path_full"].(string)
@@ -56,5 +69,6 @@ func L003PreprocessReportData(data map[string]interface{}) {
 		return
 	}
 
+	data, _ = L003ProcessSortTables(data, report)
 	checkup.SaveReportResult(data, result)
 }

pghrep/templates/L003.tpl

@@ -8,18 +8,18 @@ Current database: {{ .database }}
 {{- if (index (index .results .hosts.master) "data") }}
 {{ if gt (Int (index (index (index .results .reorderedHosts.master) "data") "min_table_size_bytes")) 0 }}NOTICE: only tables larger than {{ ByteFormat (index (index (index .results .reorderedHosts.master) "data") "min_table_size_bytes") 0 }} are analyzed.  
   {{end}}
-{{- if (index (index (index .results .hosts.master) "data") "tables") }}
+{{- if (index (index (index .results .hosts.master) "data") "sortedTables") }}
 ### Master (`{{.hosts.master}}`) ###
 {{ if ge (len (index (index .results .hosts.master) "data")) .LISTLIMIT }}The list is limited to {{.LISTLIMIT}} items. Total: {{ Sub (len (index (index .results .hosts.master) "data")) 1 }}.{{ end }}  
 
 | Table | PK | Type | Current max value | ▼ Capacity used, % |
 |------|----|------|-------------------|-------------------------------|
-{{ range $i, $key := (index (index (index (index .results .hosts.master) "data") "tables") "_keys") }}
+{{ range $i, $table := (index (index (index .results .hosts.master) "data") "sortedTables") }}
 {{- if lt $i $.LISTLIMIT -}}
-{{- $value := (index (index (index (index $.results $.hosts.master) "data") "tables") $key) -}}
+{{- $value := (index (index (index (index $.results $.hosts.master) "data") "tables") $table) -}}
 |`{{ index $value "table"}}` | `{{ index $value "pk"}}` | {{ index $value "type"}} | {{- RawIntFormat (index $value "current_max_value")}} | {{ index $value "capacity_used_percent"}}|
-{{ end }}
 {{- end }}
+{{ end }}
 {{- else -}}{{/*Tables data*/}}
 Nothing found
 {{- end }}{{/*Tables data*/}}