diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java b/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java index 735fbd09a..72d0c0690 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java @@ -139,7 +139,7 @@ public class BenchMarkDemoDataLoader { ModelDetail modelDetail = new ModelDetail(); List dimensions = new ArrayList<>(); 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)); modelDetail.setDimensions(dimensions); @@ -151,7 +151,7 @@ public class BenchMarkDemoDataLoader { modelDetail.setMeasures(Collections.emptyList()); 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); return modelService.createModel(modelReq, user); } @@ -167,7 +167,7 @@ public class BenchMarkDemoDataLoader { List dimensions = new ArrayList<>(); dimensions.add(new Dim("持续时间", "duration", 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); List identifiers = new ArrayList<>(); @@ -205,7 +205,7 @@ public class BenchMarkDemoDataLoader { identifiers.add(new Identify("歌曲名称", IdentifyType.primary.name(), "song_name")); 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")); modelDetail.setIdentifiers(identifiers); diff --git a/launchers/standalone/src/main/resources/db/data-h2.sql b/launchers/standalone/src/main/resources/db/data-h2.sql index a3321f732..b02eb480d 100644 --- a/launchers/standalone/src/main/resources/db/data-h2.sql +++ b/launchers/standalone/src/main/resources/db/data-h2.sql @@ -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 ('流行',9,'美国'); -MERGE INTO artist(artist_name,country,gender,g_name) VALUES ('Shrikanta','印度','男性','tagore'); -MERGE INTO artist(artist_name,country,gender,g_name) VALUES ('Prity','孟加拉国','女性','nazrul'); -MERGE INTO artist(artist_name,country,gender,g_name) VALUES ('Farida','孟加拉国','女性','民间'); -MERGE INTO artist(artist_name,country,gender,g_name) VALUES ('Topu','印度','女性','现代'); -MERGE INTO artist(artist_name,country,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 ('Shrikanta','印度','男性','tagore'); +MERGE INTO artist(artist_name,citizenship,gender,g_name) VALUES ('Prity','孟加拉国','女性','nazrul'); +MERGE INTO artist(artist_name,citizenship,gender,g_name) VALUES ('Farida','孟加拉国','女性','民间'); +MERGE INTO artist(artist_name,citizenship,gender,g_name) VALUES ('Topu','印度','女性','现代'); +MERGE INTO artist(artist_name,citizenship,gender,g_name) VALUES ('Enrique','美国','男性','蓝调'); +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 (2,'Prity','4.12 MB','2:56','mp3'); diff --git a/launchers/standalone/src/main/resources/db/data-mysql.sql b/launchers/standalone/src/main/resources/db/data-mysql.sql index 1844d9f57..8ad7a7fd8 100644 --- a/launchers/standalone/src/main/resources/db/data-mysql.sql +++ b/launchers/standalone/src/main/resources/db/data-mysql.sql @@ -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 ('流行',9,'美国'); -insert into artist(artist_name,country,gender,g_name) VALUES ('Shrikanta','印度','男性','tagore'); -insert into artist(artist_name,country,gender,g_name) VALUES ('Prity','孟加拉国','女性','nazrul'); -insert into artist(artist_name,country,gender,g_name) VALUES ('Farida','孟加拉国','女性','民间'); -insert into artist(artist_name,country,gender,g_name) VALUES ('Topu','印度','女性','现代'); -insert into artist(artist_name,country,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 ('Shrikanta','印度','男性','tagore'); +insert into artist(artist_name,citizenship,gender,g_name) VALUES ('Prity','孟加拉国','女性','nazrul'); +insert into artist(artist_name,citizenship,gender,g_name) VALUES ('Farida','孟加拉国','女性','民间'); +insert into artist(artist_name,citizenship,gender,g_name) VALUES ('Topu','印度','女性','现代'); +insert into artist(artist_name,citizenship,gender,g_name) VALUES ('Enrique','美国','男性','蓝调'); +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 (2,'Prity','4.12 MB','2:56','mp3'); diff --git a/launchers/standalone/src/main/resources/db/schema-h2.sql b/launchers/standalone/src/main/resources/db/schema-h2.sql index 36289fd32..b3df0db95 100644 --- a/launchers/standalone/src/main/resources/db/schema-h2.sql +++ b/launchers/standalone/src/main/resources/db/schema-h2.sql @@ -441,10 +441,10 @@ COMMENT ON TABLE genre IS 'genre'; CREATE TABLE IF NOT EXISTS `artist` ( `artist_name` varchar(50) NOT NULL , -- genre name - `country` varchar(20) , + `citizenship` varchar(20) , `gender` varchar(20) , `g_name` varchar(50), - PRIMARY KEY (`artist_name`,`country`) + PRIMARY KEY (`artist_name`,`citizenship`) ); COMMENT ON TABLE artist IS 'artist'; @@ -643,4 +643,4 @@ CREATE TABLE IF NOT EXISTS `s2_term` ( `updated_by` varchar(100) DEFAULT NULL , PRIMARY KEY (`id`) ); -COMMENT ON TABLE s2_term IS 'term info'; \ No newline at end of file +COMMENT ON TABLE s2_term IS 'term info'; diff --git a/launchers/standalone/src/main/resources/db/schema-mysql.sql b/launchers/standalone/src/main/resources/db/schema-mysql.sql index b6efb1760..27430fbf9 100644 --- a/launchers/standalone/src/main/resources/db/schema-mysql.sql +++ b/launchers/standalone/src/main/resources/db/schema-mysql.sql @@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS `genre` ( CREATE TABLE IF NOT EXISTS `artist` ( `artist_name` varchar(50) NOT NULL , -- genre name - `country` varchar(20) , + `citizenship` varchar(20) , `gender` varchar(20) , `g_name` varchar(50) )ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; @@ -565,4 +565,4 @@ CREATE TABLE IF NOT EXISTS `s2_term` ( `updated_at` datetime DEFAULT NULL , `updated_by` varchar(100) DEFAULT NULL , PRIMARY KEY (`id`) -); \ No newline at end of file +);