From f37495bc3211f43066e308679ab662c596fd04be Mon Sep 17 00:00:00 2001 From: larryliuqing Date: Fri, 25 Feb 2022 09:35:47 +0800 Subject: [PATCH 1/3] Fix the "index out of range" issue when sort metrics --- pkg/models/monitoring/sort_page.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/models/monitoring/sort_page.go b/pkg/models/monitoring/sort_page.go index 6926225f2..cac1bc3d4 100644 --- a/pkg/models/monitoring/sort_page.go +++ b/pkg/models/monitoring/sort_page.go @@ -120,8 +120,10 @@ func (raw *Metrics) Sort(target, order, identifier string) *Metrics { // Record ordinals in the final result v, ok := mv.Metadata[identifier] if ok && v != "" { - resourceOrdinal[v] = ordinal - ordinal++ + if _, ok1 := resourceOrdinal[v]; !ok1 { + resourceOrdinal[v] = ordinal + ordinal++ + } } } } From 29d2858215737b0832064dcba84a07bf3fec808e Mon Sep 17 00:00:00 2001 From: larryliuqing Date: Fri, 25 Feb 2022 09:35:47 +0800 Subject: [PATCH 2/3] Fix the "index out of range" issue when sort metrics --- pkg/models/monitoring/sort_page.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/models/monitoring/sort_page.go b/pkg/models/monitoring/sort_page.go index 6926225f2..cac1bc3d4 100644 --- a/pkg/models/monitoring/sort_page.go +++ b/pkg/models/monitoring/sort_page.go @@ -120,8 +120,10 @@ func (raw *Metrics) Sort(target, order, identifier string) *Metrics { // Record ordinals in the final result v, ok := mv.Metadata[identifier] if ok && v != "" { - resourceOrdinal[v] = ordinal - ordinal++ + if _, ok1 := resourceOrdinal[v]; !ok1 { + resourceOrdinal[v] = ordinal + ordinal++ + } } } } From 615298c530c650b78b15848a753517c5592f9215 Mon Sep 17 00:00:00 2001 From: larryliuqing Date: Fri, 25 Feb 2022 11:30:40 +0800 Subject: [PATCH 3/3] correct the variable name --- pkg/models/monitoring/sort_page.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/models/monitoring/sort_page.go b/pkg/models/monitoring/sort_page.go index cac1bc3d4..22e4afd8f 100644 --- a/pkg/models/monitoring/sort_page.go +++ b/pkg/models/monitoring/sort_page.go @@ -120,7 +120,7 @@ func (raw *Metrics) Sort(target, order, identifier string) *Metrics { // Record ordinals in the final result v, ok := mv.Metadata[identifier] if ok && v != "" { - if _, ok1 := resourceOrdinal[v]; !ok1 { + if _, ok := resourceOrdinal[v]; !ok { resourceOrdinal[v] = ordinal ordinal++ }