(improvement)(chat) Enable partition dates in the demo and support partition dates at the dataset granularity. (#1513)

2026-04-29 12:34:28 +08:00 · 2024-08-04 23:01:54 +08:00
parent e2e45a40ab
commit 0a4272c25e
11 changed files with 125 additions and 117 deletions
--- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java
+++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java
@@ -189,7 +189,7 @@ public class S2VisitsDemo extends S2BaseDemo {
    }

    public ModelResp addModel_1(DomainResp s2Domain, DatabaseResp s2Database,
-                                TagObjectResp s2TagObject) throws Exception {
+            TagObjectResp s2TagObject) throws Exception {
        ModelReq modelReq = new ModelReq();
        modelReq.setName("用户部门");
        modelReq.setBizName("user_department");
@@ -282,7 +282,7 @@ public class S2VisitsDemo extends S2BaseDemo {
        modelDetail.setIdentifiers(identifiers);

        List<Dim> dimensions = new ArrayList<>();
-        Dim dimension1 = new Dim("", "imp_date", DimensionType.time.name(), 0);
+        Dim dimension1 = new Dim("数据日期", "imp_date", DimensionType.partition_time.name(), 1);
        dimension1.setTypeParams(new DimensionTimeTypeParams());
        dimensions.add(dimension1);
        Dim dimension2 = new Dim("页面", "page", DimensionType.categorical.name(), 1);
@@ -352,7 +352,7 @@ public class S2VisitsDemo extends S2BaseDemo {
    }

    public void updateMetric(ModelResp stayTimeModel, DimensionResp departmentDimension,
-                             DimensionResp userDimension) throws Exception {
+            DimensionResp userDimension) throws Exception {
        MetricResp stayHoursMetric =
                metricService.getMetric(stayTimeModel.getId(), "stay_hours");
        MetricReq metricReq = new MetricReq();
@@ -378,7 +378,7 @@ public class S2VisitsDemo extends S2BaseDemo {
    }

    public void updateMetric_pv(ModelResp pvUvModel, DimensionResp departmentDimension,
-                                DimensionResp userDimension, MetricResp metricPv) throws Exception {
+            DimensionResp userDimension, MetricResp metricPv) throws Exception {
        MetricReq metricReq = new MetricReq();
        metricReq.setModelId(pvUvModel.getId());
        metricReq.setId(metricPv.getId());
@@ -420,7 +420,7 @@ public class S2VisitsDemo extends S2BaseDemo {
    }

    public MetricResp addMetric_pv_avg(MetricResp metricPv, MetricResp metricUv,
-                                       DimensionResp departmentDimension, ModelResp pvModel) throws Exception {
+            DimensionResp departmentDimension, ModelResp pvModel) throws Exception {
        MetricReq metricReq = new MetricReq();
        metricReq.setModelId(pvModel.getId());
        metricReq.setName("人均访问次数");
--- a/launchers/standalone/src/main/resources/data/dictionary/custom/DimValue_1_2.txt
+++ b/launchers/standalone/src/main/resources/data/dictionary/custom/DimValue_1_2.txt
@@ -5,14 +5,14 @@ dean _1_2 36
 john _1_2 50
 jack _1_2 38
 admin _1_2 70
-周杰伦 _4_7 100
-陈奕迅 _4_7 100
-林俊杰 _4_7 100
-张碧晨 _4_7 100
-程响 _4_7 100
-Taylor#Swift _4_7 100
-内地 _4_4 100
-欧美 _4_4 100
-港台 _4_4 100
-流行 _4_6 100
-国风 _4_6 100
+周杰伦 _4_8 100
+陈奕迅 _4_8 100
+林俊杰 _4_8 100
+张碧晨 _4_8 100
+程响 _4_8 100
+Taylor#Swift _4_8 100
+内地 _4_5 100
+欧美 _4_5 100
+港台 _4_5 100
+流行 _4_7 100
+国风 _4_7 100
--- a/launchers/standalone/src/main/resources/data/dictionary/custom/DimValue_1_3.txt
+++ b/launchers/standalone/src/main/resources/data/dictionary/custom/DimValue_1_3.txt
@@ -1,6 +1,6 @@
-p1 _3_3 52
-p2 _3_3 47
-p3 _3_3 31
-p4 _3_3 36
-p5 _3_3 50
-p6 _3_3 38
+p1 _3_4 52
+p2 _3_4 47
+p3 _3_4 31
+p4 _3_4 36
+p5 _3_4 50
+p6 _3_4 38
--- a/launchers/standalone/src/main/resources/data/dictionary/custom/DimValue_4_8.txt
+++ b/launchers/standalone/src/main/resources/data/dictionary/custom/DimValue_4_8.txt
@@ -0,0 +1,9 @@
+周杰伦 _4_8 9000
+周深 _4_8 8000
+周传雄 _4_8 7000
+周华建 _4_8 6000
+陈奕迅 _4_8 8000
+林俊杰 _4_8 7000
+张碧晨 _4_8 7000
+程响 _4_8 7000
+Taylor#Swift _4_8 7000
--- a/launchers/standalone/src/main/resources/data/dictionary/custom/DimValue_4_9.txt
+++ b/launchers/standalone/src/main/resources/data/dictionary/custom/DimValue_4_9.txt
@@ -1,9 +0,0 @@
-周杰伦 _4_7 9000
-周深 _4_7 8000
-周传雄 _4_7 7000
-周华建 _4_7 6000
-陈奕迅 _4_7 8000
-林俊杰 _4_7 7000
-张碧晨 _4_7 7000
-程响 _4_7 7000
-Taylor#Swift _4_7 7000
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/chat/TagTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/chat/TagTest.java
@@ -33,7 +33,7 @@ public class TagTest extends BaseTest {
        expectedParseInfo.setAggType(AggregateTypeEnum.NONE);

        QueryFilter dimensionFilter = DataUtils.getFilter("genre", FilterOperatorEnum.EQUALS,
-                "流行", "风格", 6L);
+                "流行", "风格", 7L);
        expectedParseInfo.getDimensionFilters().add(dimensionFilter);

        SchemaElement metric = SchemaElement.builder().name("播放量").build();
--- a/launchers/standalone/src/test/resources/data/dictionary/custom/DimValue_1_2.txt
+++ b/launchers/standalone/src/test/resources/data/dictionary/custom/DimValue_1_2.txt
@@ -5,14 +5,14 @@ dean _1_2 36
 john _1_2 50
 jack _1_2 38
 admin _1_2 70
-周杰伦 _4_7 100
-陈奕迅 _4_7 100
-林俊杰 _4_7 100
-张碧晨 _4_7 100
-程响 _4_7 100
-Taylor#Swift _4_7 100
-内地 _4_4 100
-欧美 _4_4 100
-港台 _4_4 100
-流行 _4_6 100
-国风 _4_6 100
+周杰伦 _4_8 100
+陈奕迅 _4_8 100
+林俊杰 _4_8 100
+张碧晨 _4_8 100
+程响 _4_8 100
+Taylor#Swift _4_8 100
+内地 _4_5 100
+欧美 _4_5 100
+港台 _4_5 100
+流行 _4_7 100
+国风 _4_7 100
--- a/launchers/standalone/src/test/resources/data/dictionary/custom/DimValue_1_3.txt
+++ b/launchers/standalone/src/test/resources/data/dictionary/custom/DimValue_1_3.txt
@@ -1,6 +1,6 @@
-p1 _3_3 52
-p2 _3_3 47
-p3 _3_3 31
-p4 _3_3 36
-p5 _3_3 50
-p6 _3_3 38
+p1 _3_4 52
+p2 _3_4 47
+p3 _3_4 31
+p4 _3_4 36
+p5 _3_4 50
+p6 _3_4 38
--- a/launchers/standalone/src/test/resources/data/dictionary/custom/DimValue_4_8.txt
+++ b/launchers/standalone/src/test/resources/data/dictionary/custom/DimValue_4_8.txt
@@ -0,0 +1,9 @@
+周杰伦 _4_8 9000
+周深 _4_8 8000
+周传雄 _4_8 7000
+周华建 _4_8 6000
+陈奕迅 _4_8 8000
+林俊杰 _4_8 7000
+张碧晨 _4_8 7000
+程响 _4_8 7000
+Taylor#Swift _4_8 7000
--- a/launchers/standalone/src/test/resources/data/dictionary/custom/DimValue_4_9.txt
+++ b/launchers/standalone/src/test/resources/data/dictionary/custom/DimValue_4_9.txt
@@ -1,9 +0,0 @@
-周杰伦 _4_7 9000
-周深 _4_7 8000
-周传雄 _4_7 7000
-周华建 _4_7 6000
-陈奕迅 _4_7 8000
-林俊杰 _4_7 7000
-张碧晨 _4_7 7000
-程响 _4_7 7000
-Taylor#Swift _4_7 7000