From 6763ea0f7b0156707da7155386b4fc96ed855b2a Mon Sep 17 00:00:00 2001
From: LXW <1264174498@qq.com>
Date: Tue, 21 Nov 2023 22:06:36 +0800
Subject: [PATCH] (improvement)(semantic) Support dimension search by tag or
 not (#413)

Co-authored-by: jolunoluo
---
 .../chat/postprocessor/MetricCheckPostProcessor.java        | 6 ++++--
 .../semantic/api/model/request/PageDimensionReq.java        | 1 +
 .../semantic/model/domain/pojo/DimensionFilter.java         | 1 +
 .../resources/mapper/custom/DimensionDOCustomMapper.xml     | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/postprocessor/MetricCheckPostProcessor.java b/chat/core/src/main/java/com/tencent/supersonic/chat/postprocessor/MetricCheckPostProcessor.java
index 5b07bc493..f5664da85 100644
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/postprocessor/MetricCheckPostProcessor.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/postprocessor/MetricCheckPostProcessor.java
@@ -75,7 +75,8 @@ public class MetricCheckPostProcessor implements PostProcessor {
             }
         }
         for (String dimensionName : whereFields) {
-            if (TimeDimensionEnum.getNameList().contains(dimensionName)) {
+            if (TimeDimensionEnum.getNameList().contains(dimensionName)
+                    || TimeDimensionEnum.getChNameList().contains(dimensionName)) {
                 continue;
             }
             if (!checkInModelSchema(dimensionName, SchemaElementType.DIMENSION, modelSchema)) {
@@ -86,7 +87,8 @@ public class MetricCheckPostProcessor implements PostProcessor {
             }
         }
         for (String dimensionName : groupByFields) {
-            if (TimeDimensionEnum.getNameList().contains(dimensionName)) {
+            if (TimeDimensionEnum.getNameList().contains(dimensionName)
+                    || TimeDimensionEnum.getChNameList().contains(dimensionName)) {
                 continue;
             }
             if (!checkInModelSchema(dimensionName, SchemaElementType.DIMENSION, modelSchema)) {
diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageDimensionReq.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageDimensionReq.java
index 0178fdeb3..f9a22d0cd 100644
--- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageDimensionReq.java
+++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageDimensionReq.java
@@ -7,5 +7,6 @@ import lombok.Data;
 @Data
 public class PageDimensionReq extends PageSchemaItemReq {
 
+    private Integer isTag;
 
 }
diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/DimensionFilter.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/DimensionFilter.java
index 9cb20e45b..f0b570bbb 100644
--- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/DimensionFilter.java
+++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/DimensionFilter.java
@@ -6,5 +6,6 @@ import lombok.Data;
 @Data
 public class DimensionFilter extends MetaFilter {
 
+    private Integer isTag;
 
 }
diff --git a/semantic/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml b/semantic/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml
index db1786a2d..29f996814 100644
--- a/semantic/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml
+++ b/semantic/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml
@@ -164,6 +164,9 @@
         <if test="datasourceId != null">
             and datasource_id = #{datasourceId}
         </if>
+        <if test="isTag != null">
+            and is_tag = #{isTag}
+        </if>
     </select>