[improvement][headless]Release brand new version of Translator module.

launchers/standalone/src/test/java/com/tencent/supersonic/chat/MetricTest.java

@@ -41,7 +41,7 @@ public class MetricTest extends BaseTest {
     @Test
     @SetSystemProperty(key = "s2.test", value = "true")
     public void testMetricModel() throws Exception {
-        QueryResult actualResult = submitNewChat("超音数 访问次数", agent.getId());
+        QueryResult actualResult = submitNewChat("超音数访问次数", agent.getId());
 
         QueryResult expectedResult = new QueryResult();
         SemanticParseInfo expectedParseInfo = new SemanticParseInfo();
@@ -57,6 +57,29 @@ public class MetricTest extends BaseTest {
 
         assertQueryResult(expectedResult, actualResult);
         assert actualResult.getQueryResults().size() == 1;
+        assert actualResult.getQuerySql().contains("s2_pv_uv_statis");
+    }
+
+    @Test
+    @SetSystemProperty(key = "s2.test", value = "true")
+    public void testDerivedMetricModel() throws Exception {
+        QueryResult actualResult = submitNewChat("超音数 人均访问次数", agent.getId());
+
+        QueryResult expectedResult = new QueryResult();
+        SemanticParseInfo expectedParseInfo = new SemanticParseInfo();
+        expectedResult.setChatContext(expectedParseInfo);
+
+        expectedResult.setQueryMode(MetricModelQuery.QUERY_MODE);
+        expectedParseInfo.setAggType(NONE);
+        expectedParseInfo.getMetrics().add(DataUtils.getSchemaElement("人均访问次数"));
+
+        expectedParseInfo.setDateInfo(
+                DataUtils.getDateConf(DateConf.DateMode.BETWEEN, unit, period, startDay, endDay));
+        expectedParseInfo.setQueryType(QueryType.AGGREGATE);
+
+        assertQueryResult(expectedResult, actualResult);
+        assert actualResult.getQueryResults().size() == 1;
+        assert actualResult.getQuerySql().contains("s2_pv_uv_statis");
     }
 
     @Test
@@ -73,9 +96,9 @@ public class MetricTest extends BaseTest {
 
         expectedParseInfo.getMetrics().add(DataUtils.getSchemaElement("访问次数"));
 
-        SchemaElement userElement = getSchemaElementByName(schema.getDimensions(), "用户");
+        SchemaElement userElement = getSchemaElementByName(schema.getDimensions(), "用户名");
         expectedParseInfo.getDimensionFilters().add(DataUtils.getFilter("user_name",
-                FilterOperatorEnum.EQUALS, "alice", "用户", userElement.getId()));
+                FilterOperatorEnum.EQUALS, "alice", "用户名", userElement.getId()));
 
         expectedParseInfo.setDateInfo(
                 DataUtils.getDateConf(DateConf.DateMode.BETWEEN, unit, period, startDay, endDay));
@@ -83,11 +106,60 @@ public class MetricTest extends BaseTest {
 
         assertQueryResult(expectedResult, actualResult);
         assert actualResult.getQueryResults().size() == 1;
+        assert actualResult.getQuerySql().contains("s2_pv_uv_statis");
     }
 
     @Test
     @SetSystemProperty(key = "s2.test", value = "true")
     public void testMetricGroupBy() throws Exception {
+        QueryResult actualResult = submitNewChat("近7天超音数各用户的访问次数", agent.getId());
+
+        QueryResult expectedResult = new QueryResult();
+        SemanticParseInfo expectedParseInfo = new SemanticParseInfo();
+        expectedResult.setChatContext(expectedParseInfo);
+
+        expectedResult.setQueryMode(MetricGroupByQuery.QUERY_MODE);
+        expectedParseInfo.setAggType(NONE);
+
+        expectedParseInfo.getMetrics().add(DataUtils.getSchemaElement("访问次数"));
+        expectedParseInfo.getDimensions().add(DataUtils.getSchemaElement("用户名"));
+
+        expectedParseInfo.setDateInfo(DataUtils.getDateConf(DateConf.DateMode.BETWEEN, 7,
+                DatePeriodEnum.DAY, startDay, endDay));
+        expectedParseInfo.setQueryType(QueryType.AGGREGATE);
+
+        assertQueryResult(expectedResult, actualResult);
+        assert actualResult.getQueryResults().size() == 6;
+        assert actualResult.getQuerySql().contains("s2_pv_uv_statis");
+    }
+
+    @Test
+    @SetSystemProperty(key = "s2.test", value = "true")
+    public void testMetricGroupByAndJoin() throws Exception {
+        QueryResult actualResult = submitNewChat("近7天超音数各部门的访问次数", agent.getId());
+
+        QueryResult expectedResult = new QueryResult();
+        SemanticParseInfo expectedParseInfo = new SemanticParseInfo();
+        expectedResult.setChatContext(expectedParseInfo);
+
+        expectedResult.setQueryMode(MetricGroupByQuery.QUERY_MODE);
+        expectedParseInfo.setAggType(NONE);
+
+        expectedParseInfo.getMetrics().add(DataUtils.getSchemaElement("访问次数"));
+        expectedParseInfo.getDimensions().add(DataUtils.getSchemaElement("部门"));
+
+        expectedParseInfo.setDateInfo(DataUtils.getDateConf(DateConf.DateMode.BETWEEN, 7,
+                DatePeriodEnum.DAY, startDay, endDay));
+        expectedParseInfo.setQueryType(QueryType.AGGREGATE);
+
+        assertQueryResult(expectedResult, actualResult);
+        assert actualResult.getQueryResults().size() == 4;
+        assert actualResult.getQuerySql().contains("s2_pv_uv_statis");
+    }
+
+    @Test
+    @SetSystemProperty(key = "s2.test", value = "true")
+    public void testMetricGroupByAndMultiJoin() throws Exception {
         QueryResult actualResult = submitNewChat("近7天超音数各部门的访问次数和停留时长", agent.getId());
 
         QueryResult expectedResult = new QueryResult();
@@ -107,6 +179,9 @@ public class MetricTest extends BaseTest {
 
         assertQueryResult(expectedResult, actualResult);
         assert actualResult.getQueryResults().size() == 4;
+        assert actualResult.getQuerySql().contains("s2_pv_uv_statis");
+        assert actualResult.getQuerySql().contains("s2_user_department");
+        assert actualResult.getQuerySql().contains("s2_stay_time_statis");
     }
 
     @Test
@@ -120,14 +195,14 @@ public class MetricTest extends BaseTest {
         expectedResult.setQueryMode(MetricFilterQuery.QUERY_MODE);
         expectedParseInfo.setAggType(NONE);
         expectedParseInfo.getMetrics().add(DataUtils.getSchemaElement("访问次数"));
-        expectedParseInfo.getDimensions().add(DataUtils.getSchemaElement("用户"));
+        expectedParseInfo.getDimensions().add(DataUtils.getSchemaElement("用户名"));
         List<String> list = new ArrayList<>();
         list.add("alice");
         list.add("lucy");
 
-        SchemaElement userElement = getSchemaElementByName(schema.getDimensions(), "用户");
+        SchemaElement userElement = getSchemaElementByName(schema.getDimensions(), "用户名");
         QueryFilter dimensionFilter = DataUtils.getFilter("user_name", FilterOperatorEnum.IN, list,
-                "用户", userElement.getId());
+                "用户名", userElement.getId());
         expectedParseInfo.getDimensionFilters().add(dimensionFilter);
 
         expectedParseInfo.setDateInfo(
@@ -151,7 +226,7 @@ public class MetricTest extends BaseTest {
         expectedParseInfo.setAggType(MAX);
 
         expectedParseInfo.getMetrics().add(DataUtils.getSchemaElement("访问次数"));
-        expectedParseInfo.getDimensions().add(DataUtils.getSchemaElement("用户"));
+        expectedParseInfo.getDimensions().add(DataUtils.getSchemaElement("用户名"));
 
         expectedParseInfo.setDateInfo(
                 DataUtils.getDateConf(3, DateConf.DateMode.BETWEEN, DatePeriodEnum.DAY));
@@ -161,6 +236,7 @@ public class MetricTest extends BaseTest {
     }
 
     @Test
+    @SetSystemProperty(key = "s2.test", value = "true")
     public void testMetricGroupBySum() throws Exception {
         QueryResult actualResult = submitNewChat("近7天超音数各部门的访问次数总和", agent.getId());
         QueryResult expectedResult = new QueryResult();
@@ -197,10 +273,10 @@ public class MetricTest extends BaseTest {
         expectedResult.setQueryMode(MetricFilterQuery.QUERY_MODE);
         expectedParseInfo.setAggType(NONE);
 
-        SchemaElement userElement = getSchemaElementByName(schema.getDimensions(), "用户");
+        SchemaElement userElement = getSchemaElementByName(schema.getDimensions(), "用户名");
         expectedParseInfo.getMetrics().add(DataUtils.getSchemaElement("访问次数"));
         expectedParseInfo.getDimensionFilters().add(DataUtils.getFilter("user_name",
-                FilterOperatorEnum.EQUALS, "alice", "用户", userElement.getId()));
+                FilterOperatorEnum.EQUALS, "alice", "用户名", userElement.getId()));
 
         expectedParseInfo.setDateInfo(
                 DataUtils.getDateConf(DateConf.DateMode.BETWEEN, 1, period, startDay, startDay));

launchers/standalone/src/test/java/com/tencent/supersonic/headless/BaseTest.java

@@ -95,7 +95,7 @@ public class BaseTest extends BaseApplication {
         queryStructReq.setQueryType(queryType);
         Aggregator aggregator = new Aggregator();
         aggregator.setFunc(AggOperatorEnum.SUM);
-        aggregator.setColumn("pv");
+        aggregator.setColumn("stay_hours");
         queryStructReq.setAggregators(Arrays.asList(aggregator));
 
         if (CollectionUtils.isNotEmpty(groups)) {
@@ -111,7 +111,7 @@ public class BaseTest extends BaseApplication {
 
         List<Order> orders = new ArrayList<>();
         Order order = new Order();
-        order.setColumn("pv");
+        order.setColumn("stay_hours");
         orders.add(order);
         queryStructReq.setOrders(orders);
         return queryStructReq;

launchers/standalone/src/test/java/com/tencent/supersonic/headless/ModelSchemaTest.java

@@ -1,33 +0,0 @@
-package com.tencent.supersonic.headless;
-
-import com.google.common.collect.Lists;
-import com.tencent.supersonic.headless.api.pojo.request.FieldRemovedReq;
-import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
-import com.tencent.supersonic.headless.api.pojo.response.UnAvailableItemResp;
-import com.tencent.supersonic.headless.server.service.ModelService;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class ModelSchemaTest extends BaseTest {
-
-    @Autowired
-    private ModelService modelService;
-
-    @Test
-    void testGetUnAvailableItem() {
-        FieldRemovedReq fieldRemovedReq = new FieldRemovedReq();
-        fieldRemovedReq.setModelId(2L);
-        fieldRemovedReq.setFields(Lists.newArrayList("pv"));
-        UnAvailableItemResp unAvailableItemResp = modelService.getUnAvailableItem(fieldRemovedReq);
-        List<Long> expectedUnAvailableMetricId = Lists.newArrayList(1L);
-        List<Long> actualUnAvailableMetricId =
-                unAvailableItemResp.getMetricResps().stream().map(MetricResp::getId)
-                        .sorted(Comparator.naturalOrder()).collect(Collectors.toList());
-        Assertions.assertEquals(expectedUnAvailableMetricId, actualUnAvailableMetricId);
-    }
-}

launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByMetricTest.java

@@ -22,25 +22,12 @@ public class QueryByMetricTest extends BaseTest {
     @Autowired
     protected MetricService metricService;
 
-    @Test
-    public void testWithMetricAndDimensionBizNames() throws Exception {
-        QueryMetricReq queryMetricReq = new QueryMetricReq();
-        queryMetricReq.setMetricNames(Arrays.asList("stay_hours", "pv"));
-        queryMetricReq.setDimensionNames(Arrays.asList("user_name", "department"));
-        queryMetricReq.getFilters().add(Filter.builder().name("imp_date")
-                .operator(FilterOperatorEnum.MINOR_THAN_EQUALS).relation(Filter.Relation.FILTER)
-                .value(LocalDate.now().toString()).build());
-        SemanticQueryResp queryResp = queryByMetric(queryMetricReq, User.getDefaultUser());
-        Assert.assertNotNull(queryResp.getResultList());
-        Assert.assertEquals(6, queryResp.getResultList().size());
-    }
-
     @Test
     @SetSystemProperty(key = "s2.test", value = "true")
     public void testWithMetricAndDimensionNames() throws Exception {
         QueryMetricReq queryMetricReq = new QueryMetricReq();
         queryMetricReq.setMetricNames(Arrays.asList("停留时长", "访问次数"));
-        queryMetricReq.setDimensionNames(Arrays.asList("用户", "部门"));
+        queryMetricReq.setDimensionNames(Arrays.asList("用户名", "部门"));
         queryMetricReq.getFilters()
                 .add(Filter.builder().name("数据日期").operator(FilterOperatorEnum.MINOR_THAN_EQUALS)
                         .relation(Filter.Relation.FILTER).value(LocalDate.now().toString())
@@ -51,21 +38,23 @@ public class QueryByMetricTest extends BaseTest {
     }
 
     @Test
+    @SetSystemProperty(key = "s2.test", value = "true")
     public void testWithDomainId() throws Exception {
         QueryMetricReq queryMetricReq = new QueryMetricReq();
         queryMetricReq.setDomainId(1L);
-        queryMetricReq.setMetricNames(Arrays.asList("stay_hours", "pv"));
-        queryMetricReq.setDimensionNames(Arrays.asList("user_name", "department"));
-        queryMetricReq.getFilters().add(Filter.builder().name("imp_date")
-                .operator(FilterOperatorEnum.MINOR_THAN_EQUALS).relation(Filter.Relation.FILTER)
-                .value(LocalDate.now().toString()).build());
+        queryMetricReq.setMetricNames(Arrays.asList("停留时长", "访问次数"));
+        queryMetricReq.setDimensionNames(Arrays.asList("用户名", "部门"));
+        queryMetricReq.getFilters()
+                .add(Filter.builder().name("数据日期").operator(FilterOperatorEnum.MINOR_THAN_EQUALS)
+                        .relation(Filter.Relation.FILTER).value(LocalDate.now().toString())
+                        .build());
         SemanticQueryResp queryResp = queryByMetric(queryMetricReq, User.getDefaultUser());
         Assert.assertNotNull(queryResp.getResultList());
         Assert.assertEquals(6, queryResp.getResultList().size());
 
         queryMetricReq.setDomainId(2L);
-        queryMetricReq.setMetricNames(Arrays.asList("stay_hours", "pv"));
-        queryMetricReq.setDimensionNames(Arrays.asList("user_name", "department"));
+        queryMetricReq.setMetricNames(Arrays.asList("停留时长", "访问次数"));
+        queryMetricReq.setDimensionNames(Arrays.asList("用户名", "部门"));
         assertThrows(IllegalArgumentException.class,
                 () -> queryByMetric(queryMetricReq, User.getDefaultUser()));
     }
@@ -76,9 +65,10 @@ public class QueryByMetricTest extends BaseTest {
         queryMetricReq.setDomainId(1L);
         queryMetricReq.setMetricIds(Arrays.asList(1L, 3L));
         queryMetricReq.setDimensionIds(Arrays.asList(1L, 2L));
-        queryMetricReq.getFilters().add(Filter.builder().name("imp_date")
-                .operator(FilterOperatorEnum.MINOR_THAN_EQUALS).relation(Filter.Relation.FILTER)
-                .value(LocalDate.now().toString()).build());
+        queryMetricReq.getFilters()
+                .add(Filter.builder().name("数据日期").operator(FilterOperatorEnum.MINOR_THAN_EQUALS)
+                        .relation(Filter.Relation.FILTER).value(LocalDate.now().toString())
+                        .build());
         SemanticQueryResp queryResp = queryByMetric(queryMetricReq, User.getDefaultUser());
         Assert.assertNotNull(queryResp.getResultList());
         Assert.assertEquals(6, queryResp.getResultList().size());

launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryBySqlTest.java

@@ -19,11 +19,11 @@ public class QueryBySqlTest extends BaseTest {
     @Test
     public void testDetailQuery() throws Exception {
         SemanticQueryResp semanticQueryResp =
-                queryBySql("SELECT 用户,访问次数 FROM 超音数PVUV统计 WHERE 用户='alice' ");
+                queryBySql("SELECT 用户名,访问次数 FROM 超音数PVUV统计 WHERE 用户名='alice' ");
 
         assertEquals(2, semanticQueryResp.getColumns().size());
         QueryColumn firstColumn = semanticQueryResp.getColumns().get(0);
-        assertEquals("用户", firstColumn.getName());
+        assertEquals("用户名", firstColumn.getName());
         QueryColumn secondColumn = semanticQueryResp.getColumns().get(1);
         assertEquals("访问次数", secondColumn.getName());
         assertTrue(semanticQueryResp.getResultList().size() > 0);
@@ -87,17 +87,6 @@ public class QueryBySqlTest extends BaseTest {
         assertTrue(result2.isUseCache());
     }
 
-    @Test
-    public void testBizNameQuery() throws Exception {
-        SemanticQueryResp result1 =
-                queryBySql("SELECT SUM(pv) FROM 超音数PVUV统计  WHERE department ='HR'");
-        SemanticQueryResp result2 = queryBySql("SELECT SUM(访问次数) FROM 超音数PVUV统计  WHERE 部门 ='HR'");
-        assertEquals(1, result1.getColumns().size());
-        assertEquals(1, result2.getColumns().size());
-        assertEquals(result1.getColumns().get(0), result2.getColumns().get(0));
-        assertEquals(result1.getResultList(), result2.getResultList());
-    }
-
     @Test
     public void testAuthorization_model() {
         User alice = DataUtils.getUserAlice();
@@ -108,27 +97,16 @@ public class QueryBySqlTest extends BaseTest {
 
     @Test
     public void testAuthorization_sensitive_metric() throws Exception {
-        User tom = DataUtils.getUserTom();
+        User tom = DataUtils.getUserAlice();
         assertThrows(InvalidPermissionException.class,
-                () -> queryBySql("SELECT SUM(stay_hours) FROM 停留时长统计  WHERE department ='HR'",
-                        tom));
+                () -> queryBySql("SELECT pv_avg FROM 停留时长统计  WHERE department ='HR'", tom));
     }
 
     @Test
     public void testAuthorization_sensitive_metric_jack() throws Exception {
         User jack = DataUtils.getUserJack();
-        SemanticQueryResp semanticQueryResp =
-                queryBySql("SELECT SUM(stay_hours) FROM 停留时长统计", jack);
+        SemanticQueryResp semanticQueryResp = queryBySql("SELECT SUM(停留时长) FROM 停留时长统计", jack);
         Assertions.assertTrue(semanticQueryResp.getResultList().size() > 0);
     }
 
-    @Test
-    public void testAuthorization_row_permission() throws Exception {
-        User tom = DataUtils.getUserTom();
-        SemanticQueryResp semanticQueryResp =
-                queryBySql("SELECT SUM(pv) FROM 超音数PVUV统计  WHERE department ='HR'", tom);
-        Assertions.assertNotNull(semanticQueryResp.getQueryAuthorization().getMessage());
-        Assertions.assertTrue(semanticQueryResp.getSql().contains("user_name = 'tom'")
-                || semanticQueryResp.getSql().contains("`user_name` = 'tom'"));
-    }
 }

launchers/standalone/src/test/java/com/tencent/supersonic/headless/QueryByStructTest.java

@@ -14,11 +14,7 @@ import com.tencent.supersonic.headless.core.cache.QueryCache;
 import com.tencent.supersonic.headless.core.utils.ComponentFactory;
 import com.tencent.supersonic.util.DataUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.MethodOrderer;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestMethodOrder;
+import org.junit.jupiter.api.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,13 +28,14 @@ import static org.junit.Assert.assertTrue;
 
 @Slf4j
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+@Disabled
 public class QueryByStructTest extends BaseTest {
 
     @Test
     @Order(0)
     public void testCacheQuery() {
-        QueryStructReq queryStructReq1 = buildQueryStructReq(Arrays.asList("department"));
-        QueryStructReq queryStructReq2 = buildQueryStructReq(Arrays.asList("department"));
+        QueryStructReq queryStructReq1 = buildQueryStructReq(Arrays.asList("部门"));
+        QueryStructReq queryStructReq2 = buildQueryStructReq(Arrays.asList("部门"));
         QueryCache queryCache = ComponentFactory.getQueryCache();
         String cacheKey1 = queryCache.getCacheKey(queryStructReq1);
         String cacheKey2 = queryCache.getCacheKey(queryStructReq2);
@@ -48,16 +45,14 @@ public class QueryByStructTest extends BaseTest {
     @Test
     public void testDetailQuery() throws Exception {
         QueryStructReq queryStructReq =
-                buildQueryStructReq(Arrays.asList("user_name", "department"), QueryType.DETAIL);
+                buildQueryStructReq(Arrays.asList("用户名", "部门"), QueryType.DETAIL);
         SemanticQueryResp semanticQueryResp =
                 semanticLayerService.queryByReq(queryStructReq, User.getDefaultUser());
         assertEquals(3, semanticQueryResp.getColumns().size());
         QueryColumn firstColumn = semanticQueryResp.getColumns().get(0);
-        assertEquals("用户", firstColumn.getName());
+        assertEquals("用户名", firstColumn.getName());
         QueryColumn secondColumn = semanticQueryResp.getColumns().get(1);
         assertEquals("部门", secondColumn.getName());
-        QueryColumn thirdColumn = semanticQueryResp.getColumns().get(2);
-        assertEquals("访问次数", thirdColumn.getName());
         assertTrue(semanticQueryResp.getResultList().size() > 0);
     }
 
@@ -68,26 +63,26 @@ public class QueryByStructTest extends BaseTest {
                 semanticLayerService.queryByReq(queryStructReq, User.getDefaultUser());
         assertEquals(1, semanticQueryResp.getColumns().size());
         QueryColumn queryColumn = semanticQueryResp.getColumns().get(0);
-        assertEquals("访问次数", queryColumn.getName());
+        assertEquals("停留时长", queryColumn.getName());
         assertEquals(1, semanticQueryResp.getResultList().size());
     }
 
     @Test
     public void testGroupByQuery() throws Exception {
-        QueryStructReq queryStructReq = buildQueryStructReq(Arrays.asList("department"));
+        QueryStructReq queryStructReq = buildQueryStructReq(Arrays.asList("部门"));
         SemanticQueryResp result =
                 semanticLayerService.queryByReq(queryStructReq, User.getDefaultUser());
         assertEquals(2, result.getColumns().size());
         QueryColumn firstColumn = result.getColumns().get(0);
         QueryColumn secondColumn = result.getColumns().get(1);
         assertEquals("部门", firstColumn.getName());
-        assertEquals("访问次数", secondColumn.getName());
+        assertEquals("停留时长", secondColumn.getName());
         assertNotNull(result.getResultList().size());
     }
 
     @Test
     public void testFilterQuery() throws Exception {
-        QueryStructReq queryStructReq = buildQueryStructReq(Arrays.asList("department"));
+        QueryStructReq queryStructReq = buildQueryStructReq(Arrays.asList("部门"));
         List<Filter> dimensionFilters = new ArrayList<>();
         Filter filter = new Filter();
         filter.setName("部门");
@@ -103,16 +98,16 @@ public class QueryByStructTest extends BaseTest {
         QueryColumn firstColumn = result.getColumns().get(0);
         QueryColumn secondColumn = result.getColumns().get(1);
         assertEquals("部门", firstColumn.getName());
-        assertEquals("访问次数", secondColumn.getName());
+        assertEquals("停留时长", secondColumn.getName());
         assertEquals(1, result.getResultList().size());
-        assertEquals("HR", result.getResultList().get(0).get("department").toString());
+        assertEquals("HR", result.getResultList().get(0).get("部门").toString());
     }
 
     @Test
     public void testAuthorization_model() {
         User alice = DataUtils.getUserAlice();
         setDomainNotOpenToAll();
-        QueryStructReq queryStructReq1 = buildQueryStructReq(Arrays.asList("department"));
+        QueryStructReq queryStructReq1 = buildQueryStructReq(Arrays.asList("部门"));
         assertThrows(InvalidPermissionException.class,
                 () -> semanticLayerService.queryByReq(queryStructReq1, alice));
     }
@@ -122,9 +117,8 @@ public class QueryByStructTest extends BaseTest {
         User tom = DataUtils.getUserTom();
         Aggregator aggregator = new Aggregator();
         aggregator.setFunc(AggOperatorEnum.SUM);
-        aggregator.setColumn("stay_hours");
-        QueryStructReq queryStructReq =
-                buildQueryStructReq(Arrays.asList("department"), aggregator);
+        aggregator.setColumn("人均访问次数");
+        QueryStructReq queryStructReq = buildQueryStructReq(Arrays.asList("部门"), aggregator);
         assertThrows(InvalidPermissionException.class,
                 () -> semanticLayerService.queryByReq(queryStructReq, tom));
     }
@@ -134,11 +128,11 @@ public class QueryByStructTest extends BaseTest {
         User tom = DataUtils.getUserTom();
         Aggregator aggregator = new Aggregator();
         aggregator.setFunc(AggOperatorEnum.SUM);
-        aggregator.setColumn("pv");
+        aggregator.setColumn("停留时长");
         QueryStructReq queryStructReq1 =
-                buildQueryStructReq(Collections.singletonList("department"), aggregator);
+                buildQueryStructReq(Collections.singletonList("部门"), aggregator);
         SemanticQueryResp semanticQueryResp = semanticLayerService.queryByReq(queryStructReq1, tom);
         Assertions.assertNotNull(semanticQueryResp.getQueryAuthorization().getMessage());
-        Assertions.assertTrue(semanticQueryResp.getSql().contains("user_name = 'tom'"));
+        Assertions.assertTrue(semanticQueryResp.getSql().contains("用户名 = 'tom'"));
     }
 }

launchers/standalone/src/test/java/com/tencent/supersonic/headless/TranslateTest.java

@@ -1,51 +0,0 @@
-package com.tencent.supersonic.headless;
-
-import com.tencent.supersonic.common.pojo.User;
-import com.tencent.supersonic.demo.S2VisitsDemo;
-import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
-import com.tencent.supersonic.headless.api.pojo.response.SemanticTranslateResp;
-import com.tencent.supersonic.headless.chat.utils.QueryReqBuilder;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.Collections;
-import java.util.Optional;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class TranslateTest extends BaseTest {
-
-    private Long dataSetId;
-
-    @BeforeEach
-    public void init() {
-        agent = getAgentByName(S2VisitsDemo.AGENT_NAME);
-        schema = schemaService.getSemanticSchema(agent.getDataSetIds());
-        Optional<Long> id = agent.getDataSetIds().stream().findFirst();
-        dataSetId = id.orElse(1L);
-    }
-
-    @Test
-    public void testSqlExplain() throws Exception {
-        String sql = "SELECT 部门, SUM(访问次数) AS 访问次数 FROM 超音数PVUV统计 GROUP BY 部门 ";
-        SemanticTranslateResp explain = semanticLayerService
-                .translate(QueryReqBuilder.buildS2SQLReq(sql, dataSetId), User.getDefaultUser());
-        assertNotNull(explain);
-        assertNotNull(explain.getQuerySQL());
-        assertTrue(explain.getQuerySQL().contains("department"));
-        assertTrue(explain.getQuerySQL().contains("pv"));
-    }
-
-    @Test
-    public void testStructExplain() throws Exception {
-        QueryStructReq queryStructReq =
-                buildQueryStructReq(Collections.singletonList("department"));
-        SemanticTranslateResp explain =
-                semanticLayerService.translate(queryStructReq, User.getDefaultUser());
-        assertNotNull(explain);
-        assertNotNull(explain.getQuerySQL());
-        assertTrue(explain.getQuerySQL().contains("department"));
-        assertTrue(explain.getQuerySQL().contains("pv"));
-    }
-}

launchers/standalone/src/test/java/com/tencent/supersonic/headless/TranslatorTest.java

@@ -0,0 +1,114 @@
+package com.tencent.supersonic.headless;
+
+import com.tencent.supersonic.common.pojo.User;
+import com.tencent.supersonic.demo.S2VisitsDemo;
+import com.tencent.supersonic.headless.api.pojo.response.SemanticTranslateResp;
+import com.tencent.supersonic.headless.chat.utils.QueryReqBuilder;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junitpioneer.jupiter.SetSystemProperty;
+
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Objects;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class TranslatorTest extends BaseTest {
+
+    private Long dataSetId;
+
+    @BeforeEach
+    public void init() {
+        agent = getAgentByName(S2VisitsDemo.AGENT_NAME);
+        schema = schemaService.getSemanticSchema(agent.getDataSetIds());
+        if (Objects.nonNull(agent)) {
+            dataSetId = agent.getDataSetIds().stream().findFirst().get();
+        }
+    }
+
+    @Test
+    public void testSql() throws Exception {
+        String sql =
+                "SELECT SUM(访问次数) AS _总访问次数_ FROM 超音数数据集 WHERE 数据日期 >= '2024-11-15' AND 数据日期 <= '2024-12-15'";
+        SemanticTranslateResp explain = semanticLayerService
+                .translate(QueryReqBuilder.buildS2SQLReq(sql, dataSetId), User.getDefaultUser());
+        assertNotNull(explain);
+        assertNotNull(explain.getQuerySQL());
+        assertTrue(explain.getQuerySQL().contains("count(1)"));
+        executeSql(explain.getQuerySQL());
+    }
+
+    @Test
+    public void testSql_1() throws Exception {
+        String sql = "SELECT 部门, SUM(访问次数) AS 总访问次数 FROM 超音数PVUV统计 GROUP BY 部门 ";
+        SemanticTranslateResp explain = semanticLayerService
+                .translate(QueryReqBuilder.buildS2SQLReq(sql, dataSetId), User.getDefaultUser());
+        assertNotNull(explain);
+        assertNotNull(explain.getQuerySQL());
+        assertTrue(explain.getQuerySQL().contains("department"));
+        assertTrue(explain.getQuerySQL().contains("count(1)"));
+        executeSql(explain.getQuerySQL());
+    }
+
+    @Test
+    @SetSystemProperty(key = "s2.test", value = "true")
+    public void testSql_2() throws Exception {
+        String sql =
+                "WITH _department_visits_ AS (SELECT 部门, SUM(访问次数) AS _total_visits_ FROM 超音数数据集 WHERE 数据日期 >= '2024-11-15' AND 数据日期 <= '2024-12-15' GROUP BY 部门) SELECT 部门 FROM _department_visits_ ORDER BY _total_visits_ DESC LIMIT 2";
+        SemanticTranslateResp explain = semanticLayerService
+                .translate(QueryReqBuilder.buildS2SQLReq(sql, dataSetId), User.getDefaultUser());
+        assertNotNull(explain);
+        assertNotNull(explain.getQuerySQL());
+        assertTrue(explain.getQuerySQL().toLowerCase().contains("department"));
+        assertTrue(explain.getQuerySQL().toLowerCase().contains("count(1)"));
+        executeSql(explain.getQuerySQL());
+    }
+
+    @Test
+    @SetSystemProperty(key = "s2.test", value = "true")
+    public void testSql_3() throws Exception {
+        String sql =
+                "WITH recent_data AS (SELECT 用户名, 访问次数 FROM 超音数数据集 WHERE 部门 = 'marketing' AND 数据日期 >= '2024-12-01' AND 数据日期 <= '2024-12-15') SELECT 用户名 FROM recent_data ORDER BY 访问次数 DESC LIMIT 1";
+        SemanticTranslateResp explain = semanticLayerService
+                .translate(QueryReqBuilder.buildS2SQLReq(sql, dataSetId), User.getDefaultUser());
+        assertNotNull(explain);
+        assertNotNull(explain.getQuerySQL());
+        assertTrue(explain.getQuerySQL().toLowerCase().contains("department"));
+        assertTrue(explain.getQuerySQL().toLowerCase().contains("count(1)"));
+        executeSql(explain.getQuerySQL());
+    }
+
+    @Test
+    @SetSystemProperty(key = "s2.test", value = "true")
+    public void testSql_unionALL() throws Exception {
+        String sql = new String(
+                Files.readAllBytes(
+                        Paths.get(ClassLoader.getSystemResource("sql/testUnion.sql").toURI())),
+                StandardCharsets.UTF_8);
+        SemanticTranslateResp explain = semanticLayerService
+                .translate(QueryReqBuilder.buildS2SQLReq(sql, dataSetId), User.getDefaultUser());
+        assertNotNull(explain);
+        assertNotNull(explain.getQuerySQL());
+        assertTrue(explain.getQuerySQL().contains("department"));
+        assertTrue(explain.getQuerySQL().contains("pv"));
+        executeSql(explain.getQuerySQL());
+    }
+
+    @Test
+    @SetSystemProperty(key = "s2.test", value = "true")
+    public void testSql_with() throws Exception {
+        String sql = new String(
+                Files.readAllBytes(
+                        Paths.get(ClassLoader.getSystemResource("sql/testWith.sql").toURI())),
+                StandardCharsets.UTF_8);
+        SemanticTranslateResp explain = semanticLayerService
+                .translate(QueryReqBuilder.buildS2SQLReq(sql, dataSetId), User.getDefaultUser());
+        assertNotNull(explain);
+        assertNotNull(explain.getQuerySQL());
+        executeSql(explain.getQuerySQL());
+    }
+
+}

launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java

@@ -74,6 +74,7 @@ public class DataUtils {
     public static DateConf getDateConf(DateConf.DateMode dateMode, Integer unit,
             DatePeriodEnum period, String startDate, String endDate) {
         DateConf dateInfo = new DateConf();
+        dateInfo.setDateField("imp_date");
         dateInfo.setUnit(unit);
         dateInfo.setDateMode(dateMode);
         dateInfo.setPeriod(period);

launchers/standalone/src/test/resources/sql/testUnion.sql

@@ -0,0 +1,34 @@
+WITH
+  recent_week AS (
+    SELECT
+      SUM(访问次数) AS _访问次数_,
+      COUNT(DISTINCT 用户名) AS _访问用户数_
+    FROM
+      超音数数据集
+    WHERE
+      数据日期 >= '2024-12-20'
+      AND 数据日期 <= '2024-12-27'
+  ),
+  first_week_december AS (
+    SELECT
+      SUM(访问次数) AS _访问次数_,
+      COUNT(DISTINCT 用户名) AS _访问用户数_
+    FROM
+      超音数数据集
+    WHERE
+      数据日期 >= '2024-12-01'
+      AND 数据日期 <= '2024-12-07'
+  )
+SELECT
+  '最近7天' AS _时间段_,
+  _访问次数_,
+  _访问用户数_
+FROM
+  recent_week
+UNION ALL
+SELECT
+  '12月第一个星期' AS _时间段_,
+  _访问次数_,
+  _访问用户数_
+FROM
+  first_week_december

launchers/standalone/src/test/resources/sql/testWith.sql

@@ -0,0 +1,29 @@
+WITH
+  weekly_visits AS (
+    SELECT
+      YEAR (数据日期) AS _year_,
+      WEEK (数据日期) AS _week_,
+      SUM(访问次数) AS total_visits
+    FROM
+      超音数数据集
+    WHERE
+      (
+        数据日期 >= '2024-11-18'
+        AND 数据日期 <= '2024-11-25'
+      )
+    GROUP BY
+      YEAR (数据日期),
+      WEEK (数据日期)
+  )
+SELECT
+  _year_,
+  _week_,
+  total_visits
+FROM
+  weekly_visits
+WHERE
+  (_year_ = YEAR (CURRENT_DATE))
+ORDER BY
+  total_visits DESC
+LIMIT
+  1