From 6c0274d6ae763dbfb5e48d0c0224e82f0612aaef Mon Sep 17 00:00:00 2001 From: Gao Hongtao Date: Tue, 9 Jun 2020 00:30:05 +0800 Subject: [PATCH] Sort linear metric query result (#4880) Signed-off-by: Gao Hongtao --- .../oap/query/graphql/resolver/MetricQuery.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java index 4f293f7a60..393fde52a4 100644 --- a/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java +++ b/oap-server/server-query-plugin/query-graphql-plugin/src/main/java/org/apache/skywalking/oap/query/graphql/resolver/MetricQuery.java @@ -99,10 +99,10 @@ public class MetricQuery implements GraphQLQueryResolver { final List metricsValues = query.readLabeledMetricsValues(condition, labels, duration); List response = new ArrayList<>(metricsValues.size()); - metricsValues.forEach(value -> { - response.add(value.getValues()); - }); - + labels.forEach(l -> metricsValues.stream() + .filter(m -> m.getLabel().equals(l)) + .findAny() + .ifPresent(values -> response.add(values.getValues()))); return response; } @@ -118,10 +118,10 @@ public class MetricQuery implements GraphQLQueryResolver { final List metricsValues = query.readLabeledMetricsValues(condition, labels, duration); List response = new ArrayList<>(metricsValues.size()); - metricsValues.forEach(value -> { - response.add(value.getValues()); - }); - + labels.forEach(l -> metricsValues.stream() + .filter(m -> m.getLabel().equals(l)) + .findAny() + .ifPresent(values -> response.add(values.getValues()))); return response; } -- GitLab