From f944f1598102f7ff6316ae8b4def7f682ec74327 Mon Sep 17 00:00:00 2001 From: lexluo09 <39718951+lexluo09@users.noreply.github.com> Date: Tue, 26 Mar 2024 09:35:46 +0800 Subject: [PATCH] (improvement)(Headless) fix add information about whether dimensions are tags in fetchDataSetSchema (#860) --- .../server/service/impl/DimensionServiceImpl.java | 8 ++++---- .../src/main/resources/config.update/sql-update.sql | 2 +- 2 files changed, 5 insertions(+), 5 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 731d7e496..23810e5f6 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 @@ -244,15 +244,15 @@ public class DimensionServiceImpl implements DimensionService { List dimensionIds = dimensionResps.stream().map(dimensionResp -> dimensionResp.getId()) .collect(Collectors.toList()); - List tagItems = tagMetaService.getTagItems(User.getFakeUser(), dimensionIds, TagDefineType.METRIC); + List tagItems = tagMetaService.getTagItems(User.getFakeUser(), dimensionIds, TagDefineType.DIMENSION); Map itemIdToTagItem = tagItems.stream() .collect(Collectors.toMap(tag -> tag.getItemId(), tag -> tag, (newTag, oldTag) -> newTag)); if (Objects.nonNull(itemIdToTagItem)) { - dimensionResps.stream().forEach(metricResp -> { - Long metricRespId = metricResp.getId(); + dimensionResps.stream().forEach(dimensionResp -> { + Long metricRespId = dimensionResp.getId(); if (itemIdToTagItem.containsKey(metricRespId)) { - metricResp.setIsTag(itemIdToTagItem.get(metricRespId).getIsTag()); + dimensionResp.setIsTag(itemIdToTagItem.get(metricRespId).getIsTag()); } }); } diff --git a/launchers/standalone/src/main/resources/config.update/sql-update.sql b/launchers/standalone/src/main/resources/config.update/sql-update.sql index d22cf3388..2df048929 100644 --- a/launchers/standalone/src/main/resources/config.update/sql-update.sql +++ b/launchers/standalone/src/main/resources/config.update/sql-update.sql @@ -288,4 +288,4 @@ CREATE TABLE IF NOT EXISTS `s2_query_rule` ( COMMENT ON TABLE s2_query_rule IS 'tag query rule table'; --20240325 -ALTER TABLE s2_metric RENAME COLUMN tags TO classifications; +alter table s2_metric change tags classifications varchar(500) null; \ No newline at end of file