Rework 5+ items in conclusions, the sorting in L003 implemented.

Author: dmius

pghrep/src/checkup/checkuputil.go

@@ -153,12 +153,12 @@ func GetUniques(array []string) []string {
 }
 
 func LimitList(array []string) []string {
-	if len(array) <= RECOMMENDATION_ITEMS_LIMIT {
-		return array
-	} else {
+	if len(array) > (RECOMMENDATION_ITEMS_LIMIT + 1) {
 		limitedArray := array[0:RECOMMENDATION_ITEMS_LIMIT]
 		limitedArray = append(limitedArray, MSG_ETC_ITEM)
 		return limitedArray
+	} else {
+		return array
 	}
 }
 
@@ -226,8 +226,8 @@ func GetMasterHostName(hosts ReportHosts) string {
 	return firstHostName
 }
 
-// Get map keys sorted by field num inside struct
-func GetItemsSortedByNum(data interface{}) []string {
+// Get map keys sorted by defined int field inside struct
+func SortItemsByInt(data interface{}, field string, reverse bool) []string {
 	var result []string
 	var numData map[int]string = map[int]string{}
 	var keys []int
@@ -245,7 +245,7 @@ func GetItemsSortedByNum(data interface{}) []string {
 				continue
 			}
 
-			valNum := val.FieldByName("Num")
+			valNum := val.FieldByName(field)
 
 			if valNum.Kind() == reflect.Invalid {
 				continue
@@ -259,10 +259,64 @@ func GetItemsSortedByNum(data interface{}) []string {
 
 		sort.Ints(keys)
 
+		if reverse {
+			sort.Sort(sort.Reverse(sort.IntSlice(keys)))
+		}
+
+		for _, key := range keys {
+			result = append(result, numData[key])
+		}
+	}
+
+	return result
+}
+
+// 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 keys []float64
+
+	v := reflect.ValueOf(data)
+
+	if v.Kind() == reflect.Map {
+		v2 := v.MapKeys()
+
+		for _, itemData := range v2 {
+			id := itemData.Interface()
+			val := v.MapIndex(itemData)
+
+			if val.Kind() != reflect.Struct {
+				continue
+			}
+
+			valNum := val.FieldByName(field)
+
+			if valNum.Kind() == reflect.Invalid {
+				continue
+			}
+
+			num := valNum.Interface()
+			floatNum := num.(float64)
+			numData[floatNum] = id.(string)
+			keys = append(keys, floatNum)
+		}
+
+		sort.Float64s(keys)
+
+		if reverse {
+			sort.Sort(sort.Reverse(sort.Float64Slice(keys)))
+		}
+
 		for _, key := range keys {
 			result = append(result, numData[key])
 		}
 	}
 
 	return result
 }
+
+// Get map keys sorted by field num inside struct
+func GetItemsSortedByNum(data interface{}) []string {
+	return SortItemsByInt(data, "Num", false)
+}

pghrep/src/checkup/f004/f004_test.go

@@ -138,7 +138,7 @@ func TestF004Warnig(t *testing.T) {
 			BloatRatioFactor:  2.46177370030581,
 		},
 		"table_3": F004HeapBloat{
-			Num:               2,
+			Num:               3,
 			IsNa:              "",
 			TableName:         "table_3",
 			ExtraSizeBytes:    3915776,
@@ -153,7 +153,7 @@ func TestF004Warnig(t *testing.T) {
 			BloatRatioFactor:  2.46177370030581,
 		},
 		"table_4": F004HeapBloat{
-			Num:               2,
+			Num:               4,
 			IsNa:              "",
 			TableName:         "table_4",
 			ExtraSizeBytes:    3915776,
@@ -168,7 +168,7 @@ func TestF004Warnig(t *testing.T) {
 			BloatRatioFactor:  2.46177370030581,
 		},
 		"table_5": F004HeapBloat{
-			Num:               2,
+			Num:               5,
 			IsNa:              "",
 			TableName:         "table_5",
 			ExtraSizeBytes:    3915776,
@@ -183,7 +183,7 @@ func TestF004Warnig(t *testing.T) {
 			BloatRatioFactor:  2.46177370030581,
 		},
 		"table_6": F004HeapBloat{
-			Num:               2,
+			Num:               6,
 			IsNa:              "",
 			TableName:         "table_6",
 			ExtraSizeBytes:    3915776,

pghrep/src/checkup/l003/l003.go

@@ -18,7 +18,9 @@ func L003Process(report L003Report) (checkup.ReportResult, error) {
 	var tables []string
 
 	for _, hostData := range report.Results {
-		for _, tableData := range hostData.Data.Tables {
+		sortedTables := checkup.SortItemsByFloat64(hostData.Data.Tables, "CapacityUsedPercent", true)
+		for _, table := range sortedTables {
+			tableData := hostData.Data.Tables[table]
 			if tableData.CapacityUsedPercent <= MAX_RATIO_PERCENT {
 				continue
 			}

pghrep/src/checkup/l003/l003_test.go

@@ -82,20 +82,20 @@ func TestL003P1_N(t *testing.T) {
 	var hostResult L003ReportHostResult = L003ReportHostResult{
 		Data: L003ReportHostResultData{
 			Tables: map[string]L003Table{
-				"test_schema.orders": L003Table{
-					Table:               "test_schema.orders",
-					Pk:                  "id",
-					Type:                "int4",
-					CurrentMaxValue:     80000000,
-					CapacityUsedPercent: 37.25,
-				},
 				"test_schema.orders_A": L003Table{
 					Table:               "test_schema.orders_A",
 					Pk:                  "id",
 					Type:                "int4",
 					CurrentMaxValue:     300000000,
 					CapacityUsedPercent: 13.97,
 				},
+				"test_schema.ordersB": L003Table{
+					Table:               "test_schema.orders_B",
+					Pk:                  "id",
+					Type:                "int4",
+					CurrentMaxValue:     80000000,
+					CapacityUsedPercent: 37.25,
+				},
 			},
 			MinTableSizeBytes: 0,
 		},