From 4267aa25474c9fe3e406d81e437ca0cfcb2206e1 Mon Sep 17 00:00:00 2001
From: daikon <1059907724@qq.com>
Date: Wed, 13 Mar 2024 21:59:33 +0800
Subject: [PATCH] opt fillTagInfo (#817)

---
 .../server/service/impl/DimensionServiceImpl.java  |  3 ++-
 .../server/service/impl/TagMetaServiceImpl.java    | 14 ++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java
index 3a5bb802b..44cfd26b4 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java
@@ -301,7 +301,8 @@ public class DimensionServiceImpl implements DimensionService {
         TagFilter tagFilter = new TagFilter();
         tagFilter.setTagDefineType(TagDefineType.DIMENSION);
         Map<String, TagResp> keyAndTagMap = tagMetaService.getTags(tagFilter).stream()
-                .collect(Collectors.toMap(tag -> tag.getModelId() + "_" + tag.getBizName(), tag -> tag));
+                .collect(Collectors.toMap(tag -> tag.getModelId() + "_" + tag.getBizName(), tag -> tag,
+                        (newTag, oldTag) -> newTag));
         if (Objects.nonNull(keyAndTagMap)) {
             dimensionResps.stream().forEach(dim -> {
                 String key = dim.getModelId() + "_" + dim.getBizName();
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java
index e28c44004..753443f74 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/TagMetaServiceImpl.java
@@ -252,7 +252,7 @@ public class TagMetaServiceImpl implements TagMetaService {
             metrics = metrics.stream().filter(metric -> tagLoadReq.getItemIds().contains(metric.getId()))
                     .collect(Collectors.toList());
         }
-        metrics.stream().forEach(metric -> {
+        metrics.parallelStream().forEach(metric -> {
             TagReq tagReq = new TagReq();
             BeanUtils.copyProperties(metric, tagReq);
             tagReq.setId(null);
@@ -261,9 +261,12 @@ public class TagMetaServiceImpl implements TagMetaService {
             TagDefineParams tagDefineParams = new TagDefineParams();
             tagDefineParams.setExpr(metric.getBizName());
             tagDefineParams.setDependencies(new ArrayList<>(Arrays.asList(metric.getId())));
-            // tagReq.setSensitiveLevel(metric.getSensitiveLevel());
             tagReq.setTagDefineParams(tagDefineParams);
-            create(tagReq, user);
+            try {
+                create(tagReq, user);
+            } catch (Exception e) {
+                log.info("loadMetricTagBatch, e:{}", e.getMessage());
+            }
         });
         return metrics.size();
     }
@@ -273,7 +276,7 @@ public class TagMetaServiceImpl implements TagMetaService {
             dimensions = dimensions.stream().filter(dim -> tagLoadReq.getItemIds().contains(dim.getId()))
                     .collect(Collectors.toList());
         }
-        dimensions.stream().forEach(dim -> {
+        dimensions.parallelStream().forEach(dim -> {
             TagReq tagReq = new TagReq();
             BeanUtils.copyProperties(dim, tagReq);
             tagReq.setId(null);
@@ -282,12 +285,11 @@ public class TagMetaServiceImpl implements TagMetaService {
             TagDefineParams tagDefineParams = new TagDefineParams();
             tagDefineParams.setExpr(dim.getBizName());
             tagDefineParams.setDependencies(new ArrayList<>(Arrays.asList(dim.getId())));
-            // tagReq.setSensitiveLevel(dim.getSensitiveLevel());
             tagReq.setTagDefineParams(tagDefineParams);
             try {
                 create(tagReq, user);
             } catch (Exception e) {
-                log.info("loadDimTagBatch, e:{}", e);
+                log.info("loadDimTagBatch, e:{}", e.getMessage());
             }
 
         });