topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-12 12:37:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(improvement)(Demo) Remove model set in demo (#1274)

Browse Source 
Co-authored-by: lxwcodemonkey
This commit is contained in:
LXW
2024-06-28 19:50:09 +08:00
committed by GitHub
parent 5bcb76a1de
commit e939869348
4 changed files with 15 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2ArtistDemo.java
View File

@@ -53,11 +53,10 @@ public class S2ArtistDemo extends S2BaseDemo {
public void doRun() { public void doRun() {
try { try {
DomainResp singerDomain = addDomain(); DomainResp singerDomain = addDomain();
DomainResp singerModelSet = addModelSet(singerDomain);
TagObjectResp singerTagObject = addTagObjectSinger(singerDomain); TagObjectResp singerTagObject = addTagObjectSinger(singerDomain);
ModelResp singerModel = addModel(singerModelSet, demoDatabaseResp, singerTagObject); ModelResp singerModel = addModel(singerDomain, demoDatabaseResp, singerTagObject);
addTags(singerModel); addTags(singerModel);
long dataSetId = addDataSet(singerDomain, singerModelSet, singerModel); long dataSetId = addDataSet(singerDomain, singerModel);
addAgent(dataSetId); addAgent(dataSetId);
} catch (Exception e) { } catch (Exception e) {
log.error("Failed to add model demo data", e); log.error("Failed to add model demo data", e);
@@ -99,15 +98,6 @@ public class S2ArtistDemo extends S2BaseDemo {
return domainService.createDomain(domainReq, user); return domainService.createDomain(domainReq, user);
} }
public DomainResp addModelSet(DomainResp singerDomain) {
DomainReq domainReq = new DomainReq();
domainReq.setName("标签模型集");
domainReq.setBizName("singer_info");
domainReq.setParentId(singerDomain.getId());
domainReq.setStatus(StatusEnum.ONLINE.getCode());
return domainService.createDomain(domainReq, user);
}
public ModelResp addModel(DomainResp singerDomain, public ModelResp addModel(DomainResp singerDomain,
DatabaseResp s2Database, TagObjectResp singerTagObject) throws Exception { DatabaseResp s2Database, TagObjectResp singerTagObject) throws Exception {
ModelReq modelReq = new ModelReq(); ModelReq modelReq = new ModelReq();
@@ -164,14 +154,14 @@ public class S2ArtistDemo extends S2BaseDemo {
TagDefineType.METRIC); TagDefineType.METRIC);
} }
public long addDataSet(DomainResp singerDomain, DomainResp singerModelSet, ModelResp singerModel) { public long addDataSet(DomainResp singerDomain, ModelResp singerModel) {
DataSetReq dataSetReq = new DataSetReq(); DataSetReq dataSetReq = new DataSetReq();
dataSetReq.setName("艺人库数据集"); dataSetReq.setName("艺人库数据集");
dataSetReq.setBizName("singer"); dataSetReq.setBizName("singer");
dataSetReq.setDomainId(singerDomain.getId()); dataSetReq.setDomainId(singerDomain.getId());
dataSetReq.setDescription("包含艺人相关标签和指标信息"); dataSetReq.setDescription("包含艺人相关标签和指标信息");
dataSetReq.setAdmins(Lists.newArrayList("admin", "jack")); dataSetReq.setAdmins(Lists.newArrayList("admin", "jack"));
List<DataSetModelConfig> dataSetModelConfigs = getDataSetModelConfigs(singerModelSet.getId()); List<DataSetModelConfig> dataSetModelConfigs = getDataSetModelConfigs(singerDomain.getId());
DataSetDetail dataSetDetail = new DataSetDetail(); DataSetDetail dataSetDetail = new DataSetDetail();
dataSetDetail.setDataSetModelConfigs(dataSetModelConfigs); dataSetDetail.setDataSetModelConfigs(dataSetModelConfigs);
dataSetReq.setDataSetDetail(dataSetDetail); dataSetReq.setDataSetDetail(dataSetDetail);

26
launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java
View File

@@ -74,15 +74,14 @@ public class S2VisitsDemo extends S2BaseDemo {
try { try {
// create domain // create domain
DomainResp s2Domain = addDomain(); DomainResp s2Domain = addDomain();
DomainResp s2ModelSet = addModelSet(s2Domain);
TagObjectResp s2TagObject = addTagObjectUser(s2Domain); TagObjectResp s2TagObject = addTagObjectUser(s2Domain);
// create models // create models
ModelResp userModel = addModel_1(s2ModelSet, demoDatabaseResp, s2TagObject); ModelResp userModel = addModel_1(s2Domain, demoDatabaseResp, s2TagObject);
ModelResp pvUvModel = addModel_2(s2ModelSet, demoDatabaseResp); ModelResp pvUvModel = addModel_2(s2Domain, demoDatabaseResp);
ModelResp stayTimeModel = addModel_3(s2ModelSet, demoDatabaseResp); ModelResp stayTimeModel = addModel_3(s2Domain, demoDatabaseResp);
addModelRela_1(s2ModelSet, userModel, pvUvModel); addModelRela_1(s2Domain, userModel, pvUvModel);
addModelRela_2(s2ModelSet, userModel, stayTimeModel); addModelRela_2(s2Domain, userModel, stayTimeModel);
addTags(userModel); addTags(userModel);
//create metrics and dimensions //create metrics and dimensions
@@ -98,7 +97,7 @@ public class S2VisitsDemo extends S2BaseDemo {
updateMetric_pv(pvUvModel, departmentDimension, userDimension, metricPv); updateMetric_pv(pvUvModel, departmentDimension, userDimension, metricPv);
//create data set //create data set
DataSetResp s2DataSet = addDataSet(s2Domain, s2ModelSet); DataSetResp s2DataSet = addDataSet(s2Domain);
addAuthGroup_1(stayTimeModel); addAuthGroup_1(stayTimeModel);
addAuthGroup_2(stayTimeModel); addAuthGroup_2(stayTimeModel);
@@ -183,15 +182,6 @@ public class S2VisitsDemo extends S2BaseDemo {
return domainService.createDomain(domainReq, user); return domainService.createDomain(domainReq, user);
} }
public DomainResp addModelSet(DomainResp s2Domain) {
DomainReq domainReq = new DomainReq();
domainReq.setName("埋点模型集");
domainReq.setBizName("visit_info");
domainReq.setParentId(s2Domain.getId());
domainReq.setStatus(StatusEnum.ONLINE.getCode());
return domainService.createDomain(domainReq, user);
}
public ModelResp addModel_1(DomainResp s2Domain, DatabaseResp s2Database, public ModelResp addModel_1(DomainResp s2Domain, DatabaseResp s2Database,
TagObjectResp s2TagObject) throws Exception { TagObjectResp s2TagObject) throws Exception {
ModelReq modelReq = new ModelReq(); ModelReq modelReq = new ModelReq();
@@ -448,14 +438,14 @@ public class S2VisitsDemo extends S2BaseDemo {
return metricService.createMetric(metricReq, user); return metricService.createMetric(metricReq, user);
} }
public DataSetResp addDataSet(DomainResp s2Domain, DomainResp s2ModelSet) { public DataSetResp addDataSet(DomainResp s2Domain) {
DataSetReq dataSetReq = new DataSetReq(); DataSetReq dataSetReq = new DataSetReq();
dataSetReq.setName("超音数数据集"); dataSetReq.setName("超音数数据集");
dataSetReq.setBizName("s2"); dataSetReq.setBizName("s2");
dataSetReq.setDomainId(s2Domain.getId()); dataSetReq.setDomainId(s2Domain.getId());
dataSetReq.setDescription("包含超音数访问统计相关的指标和维度等"); dataSetReq.setDescription("包含超音数访问统计相关的指标和维度等");
dataSetReq.setAdmins(Lists.newArrayList("admin")); dataSetReq.setAdmins(Lists.newArrayList("admin"));
List<DataSetModelConfig> dataSetModelConfigs = getDataSetModelConfigs(s2ModelSet.getId()); List<DataSetModelConfig> dataSetModelConfigs = getDataSetModelConfigs(s2Domain.getId());
DataSetDetail dataSetDetail = new DataSetDetail(); DataSetDetail dataSetDetail = new DataSetDetail();
dataSetDetail.setDataSetModelConfigs(dataSetModelConfigs); dataSetDetail.setDataSetModelConfigs(dataSetModelConfigs);
dataSetReq.setDataSetDetail(dataSetDetail); dataSetReq.setDataSetDetail(dataSetDetail);

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

@@ -48,7 +48,7 @@ public class QueryByMetricTest extends BaseTest {
Assert.assertNotNull(queryResp.getResultList()); Assert.assertNotNull(queryResp.getResultList());
Assert.assertEquals(6, queryResp.getResultList().size()); Assert.assertEquals(6, queryResp.getResultList().size());
queryMetricReq.setDomainId(3L); queryMetricReq.setDomainId(2L);
queryMetricReq.setMetricNames(Arrays.asList("stay_hours", "pv")); queryMetricReq.setMetricNames(Arrays.asList("stay_hours", "pv"));
queryMetricReq.setDimensionNames(Arrays.asList("user_name", "department")); queryMetricReq.setDimensionNames(Arrays.asList("user_name", "department"));
assertThrows(IllegalArgumentException.class, assertThrows(IllegalArgumentException.class,

4
launchers/standalone/src/test/java/com/tencent/supersonic/headless/SchemaAuthTest.java
View File

@@ -32,7 +32,7 @@ public class SchemaAuthTest extends BaseTest {
User user = DataUtils.getUserAlice(); User user = DataUtils.getUserAlice();
setDomainNotOpenToAll(); setDomainNotOpenToAll();
List<DomainResp> domainResps = domainService.getDomainListWithAdminAuth(user); List<DomainResp> domainResps = domainService.getDomainListWithAdminAuth(user);
List<String> expectedDomainBizNames = Lists.newArrayList("supersonic", "visit_info", "singer", "singer_info"); List<String> expectedDomainBizNames = Lists.newArrayList("supersonic", "singer");
Assertions.assertEquals(expectedDomainBizNames, Assertions.assertEquals(expectedDomainBizNames,
domainResps.stream().map(DomainResp::getBizName).collect(Collectors.toList())); domainResps.stream().map(DomainResp::getBizName).collect(Collectors.toList()));
} }
@@ -68,7 +68,7 @@ public class SchemaAuthTest extends BaseTest {
public void test_getDomainList_jack() { public void test_getDomainList_jack() {
User user = DataUtils.getUserJack(); User user = DataUtils.getUserJack();
List<DomainResp> domainResps = domainService.getDomainListWithAdminAuth(user); List<DomainResp> domainResps = domainService.getDomainListWithAdminAuth(user);
List<String> expectedDomainBizNames = Lists.newArrayList("supersonic", "visit_info"); List<String> expectedDomainBizNames = Lists.newArrayList("supersonic");
Assertions.assertEquals(expectedDomainBizNames, Assertions.assertEquals(expectedDomainBizNames,
domainResps.stream().map(DomainResp::getBizName).collect(Collectors.toList())); domainResps.stream().map(DomainResp::getBizName).collect(Collectors.toList()));
} }