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

[improvement] fix name conflict (#1031)

Browse Source 
Co-authored-by: zuopengge <hwzuopengge@tencent.com>
This commit is contained in:
mainmain
2024-05-24 17:48:24 +08:00
committed by GitHub
parent 5a332f6abf
commit be7629eb65
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java
View File

@@ -139,7 +139,7 @@ public class BenchMarkDemoDataLoader {
ModelDetail modelDetail = new ModelDetail(); ModelDetail modelDetail = new ModelDetail();
List<Dim> dimensions = new ArrayList<>(); List<Dim> dimensions = new ArrayList<>();
dimensions.add(new Dim("艺术家名称", "artist_name", DimensionType.categorical.name(), 1)); dimensions.add(new Dim("艺术家名称", "artist_name", DimensionType.categorical.name(), 1));
dimensions.add(new Dim("国籍", "country", DimensionType.categorical.name(), 1)); dimensions.add(new Dim("国籍", "citizenship", DimensionType.categorical.name(), 1));
dimensions.add(new Dim("性别", "gender", DimensionType.categorical.name(), 1)); dimensions.add(new Dim("性别", "gender", DimensionType.categorical.name(), 1));
modelDetail.setDimensions(dimensions); modelDetail.setDimensions(dimensions);
@@ -151,7 +151,7 @@ public class BenchMarkDemoDataLoader {
modelDetail.setMeasures(Collections.emptyList()); modelDetail.setMeasures(Collections.emptyList());
modelDetail.setQueryType("sql_query"); modelDetail.setQueryType("sql_query");
modelDetail.setSqlQuery("SELECT artist_name, country, gender, g_name FROM artist"); modelDetail.setSqlQuery("SELECT artist_name, citizenship, gender, g_name FROM artist");
modelReq.setModelDetail(modelDetail); modelReq.setModelDetail(modelDetail);
return modelService.createModel(modelReq, user); return modelService.createModel(modelReq, user);
} }
@@ -167,7 +167,7 @@ public class BenchMarkDemoDataLoader {
List<Dim> dimensions = new ArrayList<>(); List<Dim> dimensions = new ArrayList<>();
dimensions.add(new Dim("持续时间", "duration", DimensionType.categorical.name(), 1)); dimensions.add(new Dim("持续时间", "duration", DimensionType.categorical.name(), 1));
dimensions.add(new Dim("文件格式", "formats", DimensionType.categorical.name(), 1)); dimensions.add(new Dim("文件格式", "formats", DimensionType.categorical.name(), 1));
dimensions.add(new Dim("艺术家名称", "artist_name", DimensionType.categorical.name(), 1)); //dimensions.add(new Dim("艺术家名称", "artist_name", DimensionType.categorical.name(), 1));
modelDetail.setDimensions(dimensions); modelDetail.setDimensions(dimensions);
List<Identify> identifiers = new ArrayList<>(); List<Identify> identifiers = new ArrayList<>();
@@ -205,7 +205,7 @@ public class BenchMarkDemoDataLoader {
identifiers.add(new Identify("歌曲名称", IdentifyType.primary.name(), "song_name")); identifiers.add(new Identify("歌曲名称", IdentifyType.primary.name(), "song_name"));
identifiers.add(new Identify("歌曲ID", IdentifyType.foreign.name(), "f_id")); identifiers.add(new Identify("歌曲ID", IdentifyType.foreign.name(), "f_id"));
identifiers.add(new Identify("艺术家名称", IdentifyType.foreign.name(), "artist_name")); identifiers.add(new Identify("艺术家名称", IdentifyType.foreign.name(), "artist_name"));
identifiers.add(new Identify("艺术家名称", IdentifyType.foreign.name(), "artist_name")); //identifiers.add(new Identify("艺术家名称", IdentifyType.foreign.name(), "artist_name"));
modelDetail.setIdentifiers(identifiers); modelDetail.setIdentifiers(identifiers);

12
launchers/standalone/src/main/resources/db/data-h2.sql
View File

@@ -1090,12 +1090,12 @@ MERGE INTO genre(g_name,rating,most_popular_in) VALUES ('现代',8,'孟加拉国
MERGE INTO genre(g_name,rating,most_popular_in) VALUES ('蓝调',7,'加拿大'); MERGE INTO genre(g_name,rating,most_popular_in) VALUES ('蓝调',7,'加拿大');
MERGE INTO genre(g_name,rating,most_popular_in) VALUES ('流行',9,'美国'); MERGE INTO genre(g_name,rating,most_popular_in) VALUES ('流行',9,'美国');
MERGE INTO artist(artist_name,country,gender,g_name) VALUES ('Shrikanta','印度','男性','tagore'); MERGE INTO artist(artist_name,citizenship,gender,g_name) VALUES ('Shrikanta','印度','男性','tagore');
MERGE INTO artist(artist_name,country,gender,g_name) VALUES ('Prity','孟加拉国','女性','nazrul'); MERGE INTO artist(artist_name,citizenship,gender,g_name) VALUES ('Prity','孟加拉国','女性','nazrul');
MERGE INTO artist(artist_name,country,gender,g_name) VALUES ('Farida','孟加拉国','女性','民间'); MERGE INTO artist(artist_name,citizenship,gender,g_name) VALUES ('Farida','孟加拉国','女性','民间');
MERGE INTO artist(artist_name,country,gender,g_name) VALUES ('Topu','印度','女性','现代'); MERGE INTO artist(artist_name,citizenship,gender,g_name) VALUES ('Topu','印度','女性','现代');
MERGE INTO artist(artist_name,country,gender,g_name) VALUES ('Enrique','美国','男性','蓝调'); MERGE INTO artist(artist_name,citizenship,gender,g_name) VALUES ('Enrique','美国','男性','蓝调');
MERGE INTO artist(artist_name,country,gender,g_name) VALUES ('Michel','英国','男性','流行'); MERGE INTO artist(artist_name,citizenship,gender,g_name) VALUES ('Michel','英国','男性','流行');
MERGE INTO files(f_id,artist_name,file_size,duration,formats) VALUES (1,'Shrikanta','3.78 MB','3:45','mp4'); MERGE INTO files(f_id,artist_name,file_size,duration,formats) VALUES (1,'Shrikanta','3.78 MB','3:45','mp4');
MERGE INTO files(f_id,artist_name,file_size,duration,formats) VALUES (2,'Prity','4.12 MB','2:56','mp3'); MERGE INTO files(f_id,artist_name,file_size,duration,formats) VALUES (2,'Prity','4.12 MB','2:56','mp3');

12
launchers/standalone/src/main/resources/db/data-mysql.sql
View File

@@ -1181,12 +1181,12 @@ insert into genre(g_name,rating,most_popular_in) VALUES ('现代',8,'孟加拉
insert into genre(g_name,rating,most_popular_in) VALUES ('蓝调',7,'加拿大'); insert into genre(g_name,rating,most_popular_in) VALUES ('蓝调',7,'加拿大');
insert into genre(g_name,rating,most_popular_in) VALUES ('流行',9,'美国'); insert into genre(g_name,rating,most_popular_in) VALUES ('流行',9,'美国');
insert into artist(artist_name,country,gender,g_name) VALUES ('Shrikanta','印度','男性','tagore'); insert into artist(artist_name,citizenship,gender,g_name) VALUES ('Shrikanta','印度','男性','tagore');
insert into artist(artist_name,country,gender,g_name) VALUES ('Prity','孟加拉国','女性','nazrul'); insert into artist(artist_name,citizenship,gender,g_name) VALUES ('Prity','孟加拉国','女性','nazrul');
insert into artist(artist_name,country,gender,g_name) VALUES ('Farida','孟加拉国','女性','民间'); insert into artist(artist_name,citizenship,gender,g_name) VALUES ('Farida','孟加拉国','女性','民间');
insert into artist(artist_name,country,gender,g_name) VALUES ('Topu','印度','女性','现代'); insert into artist(artist_name,citizenship,gender,g_name) VALUES ('Topu','印度','女性','现代');
insert into artist(artist_name,country,gender,g_name) VALUES ('Enrique','美国','男性','蓝调'); insert into artist(artist_name,citizenship,gender,g_name) VALUES ('Enrique','美国','男性','蓝调');
insert into artist(artist_name,country,gender,g_name) VALUES ('Michel','英国','男性','流行'); insert into artist(artist_name,citizenship,gender,g_name) VALUES ('Michel','英国','男性','流行');
insert into files(f_id,artist_name,file_size,duration,formats) VALUES (1,'Shrikanta','3.78 MB','3:45','mp4'); insert into files(f_id,artist_name,file_size,duration,formats) VALUES (1,'Shrikanta','3.78 MB','3:45','mp4');
insert into files(f_id,artist_name,file_size,duration,formats) VALUES (2,'Prity','4.12 MB','2:56','mp3'); insert into files(f_id,artist_name,file_size,duration,formats) VALUES (2,'Prity','4.12 MB','2:56','mp3');

4
launchers/standalone/src/main/resources/db/schema-h2.sql
View File

@@ -441,10 +441,10 @@ COMMENT ON TABLE genre IS 'genre';
CREATE TABLE IF NOT EXISTS `artist` ( CREATE TABLE IF NOT EXISTS `artist` (
`artist_name` varchar(50) NOT NULL , -- genre name `artist_name` varchar(50) NOT NULL , -- genre name
`country` varchar(20) , `citizenship` varchar(20) ,
`gender` varchar(20) , `gender` varchar(20) ,
`g_name` varchar(50), `g_name` varchar(50),
PRIMARY KEY (`artist_name`,`country`) PRIMARY KEY (`artist_name`,`citizenship`)
); );
COMMENT ON TABLE artist IS 'artist'; COMMENT ON TABLE artist IS 'artist';

2
launchers/standalone/src/main/resources/db/schema-mysql.sql
View File

@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS `genre` (
CREATE TABLE IF NOT EXISTS `artist` ( CREATE TABLE IF NOT EXISTS `artist` (
`artist_name` varchar(50) NOT NULL , -- genre name `artist_name` varchar(50) NOT NULL , -- genre name
`country` varchar(20) , `citizenship` varchar(20) ,
`gender` varchar(20) , `gender` varchar(20) ,
`g_name` varchar(50) `g_name` varchar(50)
)ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; )ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;