From 86c438e3f9b643e39d961e296b2182cf962d4ade Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Tue, 7 Dec 2021 14:59:26 +0800 Subject: [PATCH] =?UTF-8?q?[collector]=20bugfix-=E9=87=87=E9=9B=86?= =?UTF-8?q?=E5=99=A8=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8E=E5=80=BClist=E6=98=A0=E5=B0=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E5=BA=A6=E9=81=87=E7=A9=BAjob=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/usthe/collector/dispatch/MetricsCollect.java | 9 ++++++--- .../warehouse/controller/MetricsDataController.java | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/collector/server/src/main/java/com/usthe/collector/dispatch/MetricsCollect.java b/collector/server/src/main/java/com/usthe/collector/dispatch/MetricsCollect.java index eced034..19f0c10 100644 --- a/collector/server/src/main/java/com/usthe/collector/dispatch/MetricsCollect.java +++ b/collector/server/src/main/java/com/usthe/collector/dispatch/MetricsCollect.java @@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.Collections; import java.util.HashMap; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -148,9 +149,11 @@ public class MetricsCollect implements Runnable, Comparable { * @param collectData 采集数据 */ private void calculateFields(Metrics metrics, CollectRep.MetricsData.Builder collectData) { - collectData.addAllFields(metrics.getFields().stream().map(item -> - CollectRep.Field.newBuilder().setName(item.getField()).setType(item.getType()).build() - ).collect(Collectors.toSet())); + List fieldList = new LinkedList<>(); + for (Metrics.Field field : metrics.getFields()) { + fieldList.add(CollectRep.Field.newBuilder().setName(field.getField()).setType(field.getType()).build()); + } + collectData.addAllFields(fieldList); List aliasRowList = collectData.getValuesList(); if (aliasRowList == null || aliasRowList.isEmpty()) { return; diff --git a/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java b/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java index ec4f3b0..9146d6d 100644 --- a/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java +++ b/warehouse/src/main/java/com/usthe/warehouse/controller/MetricsDataController.java @@ -53,7 +53,8 @@ public class MetricsDataController { .time(redisData.getTime()); List fields = redisData.getFieldsList().stream().map(redisField -> Field.builder().name(redisField.getName()) - .type(Integer.valueOf(redisField.getType()).byteValue()).build()) + .type(Integer.valueOf(redisField.getType()).byteValue()) + .build()) .collect(Collectors.toList()); dataBuilder.fields(fields); List valueRows = redisData.getValuesList().stream().map(redisValueRow ->