From cdb67650c5eab9de71a5a44411027478df406283 Mon Sep 17 00:00:00 2001 From: lexluo09 <39718951+lexluo09@users.noreply.github.com> Date: Thu, 8 Aug 2024 15:31:53 +0800 Subject: [PATCH] (improvement)(chat) The existing data uses partition_time for time, resolving the issue of models being unable to query. (#1536) --- .../headless/core/utils/SysTimeDimensionBuilder.java | 8 ++++---- .../headless/server/service/ModelServiceImplTest.java | 10 +++++----- .../java/com/tencent/supersonic/demo/CspiderDemo.java | 4 ++-- .../java/com/tencent/supersonic/demo/DuSQLDemo.java | 8 ++++---- .../java/com/tencent/supersonic/demo/S2VisitsDemo.java | 10 +++++----- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SysTimeDimensionBuilder.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SysTimeDimensionBuilder.java index e86298418..53a50d7b9 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SysTimeDimensionBuilder.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SysTimeDimensionBuilder.java @@ -32,7 +32,7 @@ public class SysTimeDimensionBuilder { private static Dim generateSysDayDimension(Dim timeDim, DbAdaptor engineAdaptor) { Dim dim = new Dim(); dim.setBizName(TimeDimensionEnum.DAY.getName()); - dim.setType(DimensionType.time.name()); + dim.setType(DimensionType.partition_time.name()); dim.setExpr(generateTimeExpr(timeDim, TimeDimensionEnum.DAY.name().toLowerCase(), engineAdaptor)); DimensionTimeTypeParams typeParams = new DimensionTimeTypeParams(); typeParams.setTimeGranularity(TimeDimensionEnum.DAY.name().toLowerCase()); @@ -44,7 +44,7 @@ public class SysTimeDimensionBuilder { private static Dim generateSysWeekDimension(Dim timeDim, DbAdaptor engineAdaptor) { Dim dim = new Dim(); dim.setBizName(TimeDimensionEnum.WEEK.getName()); - dim.setType(DimensionType.time.name()); + dim.setType(DimensionType.partition_time.name()); dim.setExpr(generateTimeExpr(timeDim, TimeDimensionEnum.WEEK.name().toLowerCase(), engineAdaptor)); DimensionTimeTypeParams typeParams = new DimensionTimeTypeParams(); typeParams.setTimeGranularity(TimeDimensionEnum.WEEK.name().toLowerCase()); @@ -56,7 +56,7 @@ public class SysTimeDimensionBuilder { private static Dim generateSysMonthDimension(Dim timeDim, DbAdaptor engineAdaptor) { Dim dim = new Dim(); dim.setBizName(TimeDimensionEnum.MONTH.getName()); - dim.setType(DimensionType.time.name()); + dim.setType(DimensionType.partition_time.name()); dim.setExpr(generateTimeExpr(timeDim, TimeDimensionEnum.MONTH.name().toLowerCase(), engineAdaptor)); DimensionTimeTypeParams typeParams = new DimensionTimeTypeParams(); typeParams.setTimeGranularity(TimeDimensionEnum.MONTH.name().toLowerCase()); @@ -73,7 +73,7 @@ public class SysTimeDimensionBuilder { private static Dim getTimeDim(List timeDims) { for (Dim dim : timeDims) { - if (dim.getType().equalsIgnoreCase(DimensionType.time.name())) { + if (dim.getType().equalsIgnoreCase(DimensionType.partition_time.name())) { return dim; } } diff --git a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java index b9e76b9bd..219987564 100644 --- a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java +++ b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java @@ -96,7 +96,7 @@ class ModelServiceImplTest { identifiers.add(new Identify("用户名", IdentifyType.primary.name(), "user_name")); modelDetail.setIdentifiers(identifiers); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date", DimensionType.partition_time.name(), 0); dimension1.setTypeParams(new DimensionTimeTypeParams()); dimensions.add(dimension1); Dim dimension2 = new Dim("", "page", DimensionType.categorical.name(), 0); @@ -134,7 +134,7 @@ class ModelServiceImplTest { modelDetail.setIdentifiers(identifiers); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date_a", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date_a", DimensionType.partition_time.name(), 0); dimension1.setTypeParams(new DimensionTimeTypeParams()); dimensions.add(dimension1); Dim dimension2 = new Dim("", "page_a", DimensionType.categorical.name(), 0); @@ -169,7 +169,7 @@ class ModelServiceImplTest { identifiers.add(new Identify("用户名", IdentifyType.primary.name(), "user_name")); modelDetail.setIdentifiers(identifiers); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date", DimensionType.partition_time.name(), 0); dimension1.setTypeParams(new DimensionTimeTypeParams()); dimensions.add(dimension1); Dim dimension2 = new Dim("", "page", DimensionType.categorical.name(), 0); @@ -207,7 +207,7 @@ class ModelServiceImplTest { modelDetail.setIdentifiers(identifiers); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date", DimensionType.partition_time.name(), 0); dimension1.setTypeParams(new DimensionTimeTypeParams()); dimensions.add(dimension1); Dim dimension2 = new Dim("", "page", DimensionType.categorical.name(), 0); @@ -250,7 +250,7 @@ class ModelServiceImplTest { modelDetail.setIdentifiers(identifiers); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date_a", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date_a", DimensionType.partition_time.name(), 0); dimension1.setTypeParams(new DimensionTimeTypeParams()); dimensions.add(dimension1); Dim dimension2 = new Dim("", "page_a", DimensionType.categorical.name(), 0); diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/CspiderDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/CspiderDemo.java index 16082198a..2c272ae25 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/CspiderDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/CspiderDemo.java @@ -89,7 +89,7 @@ public class CspiderDemo extends S2BaseDemo { modelReq.setAdminOrgs(Collections.emptyList()); ModelDetail modelDetail = new ModelDetail(); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date", DimensionType.partition_time.name(), 0); dimension1.setTypeParams(new DimensionTimeTypeParams()); dimensions.add(dimension1); dimensions.add(new Dim("活跃区域", "most_popular_in", DimensionType.categorical.name(), 1)); @@ -174,7 +174,7 @@ public class CspiderDemo extends S2BaseDemo { modelReq.setDatabaseId(s2Database.getId()); ModelDetail modelDetail = new ModelDetail(); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date", DimensionType.partition_time.name(), 0); dimension1.setTypeParams(new DimensionTimeTypeParams()); dimensions.add(dimension1); dimensions.add(new Dim("歌曲名称", "song_name", DimensionType.categorical.name(), 1)); diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/DuSQLDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/DuSQLDemo.java index b0de1cfb6..677e814fd 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/DuSQLDemo.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/DuSQLDemo.java @@ -94,7 +94,7 @@ public class DuSQLDemo extends S2BaseDemo { modelReq.setAdminOrgs(Collections.emptyList()); ModelDetail modelDetail = new ModelDetail(); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date", DimensionType.partition_time.name(), 0); DimensionTimeTypeParams dimensionTimeTypeParams = new DimensionTimeTypeParams("false", "none"); dimension1.setTypeParams(dimensionTimeTypeParams); dimensions.add(dimension1); @@ -136,7 +136,7 @@ public class DuSQLDemo extends S2BaseDemo { modelReq.setAdminOrgs(Collections.emptyList()); ModelDetail modelDetail = new ModelDetail(); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date", DimensionType.partition_time.name(), 0); DimensionTimeTypeParams dimensionTimeTypeParams = new DimensionTimeTypeParams("false", "none"); dimension1.setTypeParams(dimensionTimeTypeParams); dimensions.add(dimension1); @@ -175,7 +175,7 @@ public class DuSQLDemo extends S2BaseDemo { modelReq.setAdminOrgs(Collections.emptyList()); ModelDetail modelDetail = new ModelDetail(); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date", DimensionType.partition_time.name(), 0); DimensionTimeTypeParams dimensionTimeTypeParams = new DimensionTimeTypeParams("false", "none"); dimension1.setTypeParams(dimensionTimeTypeParams); dimensions.add(dimension1); @@ -220,7 +220,7 @@ public class DuSQLDemo extends S2BaseDemo { modelReq.setAdminOrgs(Collections.emptyList()); ModelDetail modelDetail = new ModelDetail(); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date", DimensionType.partition_time.name(), 0); DimensionTimeTypeParams dimensionTimeTypeParams = new DimensionTimeTypeParams("false", "none"); dimension1.setTypeParams(dimensionTimeTypeParams); dimensions.add(dimension1); diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java index 25d0e1013..273ee8e49 100644 --- 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"); @@ -238,7 +238,7 @@ public class S2VisitsDemo extends S2BaseDemo { modelDetail.setIdentifiers(identifiers); List dimensions = new ArrayList<>(); - Dim dimension1 = new Dim("", "imp_date", DimensionType.time.name(), 0); + Dim dimension1 = new Dim("", "imp_date", DimensionType.partition_time.name(), 0); dimension1.setTypeParams(new DimensionTimeTypeParams()); dimensions.add(dimension1); Dim dimension2 = new Dim("", "page", DimensionType.categorical.name(), 0); @@ -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("人均访问次数");