Merge branch 'dmius-k003-rec-repeat-host-fix' into 'master'

dmius · dmius · commit b321825490d2 · 2019-07-12T20:04:29.000Z
fix: show every host only once in conlusion of K003

See merge request postgres-ai/postgres-checkup!380
diff --git a/pghrep/src/checkup/k000/k000.go b/pghrep/src/checkup/k000/k000.go
@@ -26,7 +26,7 @@ func K000Process(report K000Report) (checkup.ReportResult, error) {
 
 	if result.P1 && len(hosts) > 0 {
 		result.AppendConclusion(K000_EXCESS_QUERY_TOTAL_TIME, MSG_EXCESS_QUERY_TOTAL_TIME_CONCLUSION, MAX_QUERY_TOTAL_TIME,
-			fmt.Sprintf(english.PluralWord(len(hosts), MSG_NODE, MSG_NODES), english.WordSeries(hosts, "and")),
+			fmt.Sprintf(english.PluralWord(len(checkup.GetUniques(hosts)), MSG_NODE, MSG_NODES), english.WordSeries(checkup.GetUniques(hosts), "and")),
 			MAX_QUERY_TOTAL_TIME, MAX_QUERY_TOTAL_TIME)
 		result.AppendRecommendation(K000_EXCESS_QUERY_TOTAL_TIME, MSG_EXCESS_QUERY_TOTAL_TIME_RECOMMENDATION, MAX_QUERY_TOTAL_TIME)
 	}
diff --git a/pghrep/src/checkup/k000/k000_test.go b/pghrep/src/checkup/k000/k000_test.go
@@ -2,6 +2,7 @@ package k000
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	checkup ".."
@@ -59,7 +60,7 @@ func TestK000TotalExcess(t *testing.T) {
 	checkup.PrintResultRecommendations(result)
 }
 
-func TestK000TotalExcessNodes(t *testing.T) {
+func TestK000HostTwice(t *testing.T) {
 	fmt.Println(t.Name())
 
 	var report K000Report
@@ -69,6 +70,9 @@ func TestK000TotalExcessNodes(t *testing.T) {
 			"1": K00Query{
 				RatioTotalTime: 40.0,
 			},
+			"2": K00Query{
+				RatioTotalTime: 34.0,
+			},
 		},
 	}
 
@@ -82,6 +86,14 @@ func TestK000TotalExcessNodes(t *testing.T) {
 		t.Fatal()
 	}
 
+	conclusion, err2 := checkup.GetResultItem(result.Conclusions, K000_EXCESS_QUERY_TOTAL_TIME)
+	if err2 != nil || strings.Contains(conclusion.Message, "`test-host-1`, `test-host-1`") ||
+		strings.Contains(conclusion.Message, "`test-host-2`, `test-host-2`") ||
+		strings.Contains(conclusion.Message, "`test-host-2` and `test-host-2`") ||
+		strings.Contains(conclusion.Message, "`test-host-1` and `test-host-1`") {
+		t.Fatal("Same host twice in conlusion")
+	}
+
 	checkup.PrintResultConclusions(result)
 	checkup.PrintResultRecommendations(result)
 }

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func K000Process(report K000Report) (checkup.ReportResult, error) {`
`26`	`26`
`27`	`27`	`if result.P1 && len(hosts) > 0 {`
`28`	`28`	`result.AppendConclusion(K000_EXCESS_QUERY_TOTAL_TIME, MSG_EXCESS_QUERY_TOTAL_TIME_CONCLUSION, MAX_QUERY_TOTAL_TIME,`
`29`		`- fmt.Sprintf(english.PluralWord(len(hosts), MSG_NODE, MSG_NODES), english.WordSeries(hosts, "and")),`
	`29`	`+ fmt.Sprintf(english.PluralWord(len(checkup.GetUniques(hosts)), MSG_NODE, MSG_NODES), english.WordSeries(checkup.GetUniques(hosts), "and")),`
`30`	`30`	`MAX_QUERY_TOTAL_TIME, MAX_QUERY_TOTAL_TIME)`
`31`	`31`	`result.AppendRecommendation(K000_EXCESS_QUERY_TOTAL_TIME, MSG_EXCESS_QUERY_TOTAL_TIME_RECOMMENDATION, MAX_QUERY_TOTAL_TIME)`
`32`	`32`	`}`