From f4638b48d560371d71c87f8b03377eaa3d4c294e Mon Sep 17 00:00:00 2001
From: LXW <1264174498@qq.com>
Date: Fri, 20 Oct 2023 11:23:13 +0800
Subject: [PATCH] (improvement)(chat) async save time statistic and update
 parse info (#264)

Co-authored-by: jolunoluo
---
 .../chat/persistence/repository/StatisticsRepository.java | 2 +-
 .../repository/impl/StatisticsRepositoryImpl.java         | 5 ++---
 .../supersonic/chat/service/StatisticsService.java        | 2 +-
 .../supersonic/chat/service/impl/ChatServiceImpl.java     | 1 +
 .../chat/service/impl/StatisticsServiceImpl.java          | 6 ++++--
 chat/core/src/main/resources/mapper/ChatParseMapper.xml   | 2 +-
 .../java/com/tencent/supersonic/StandaloneLauncher.java   | 2 ++
 .../semantic/model/application/DatabaseServiceImpl.java   | 2 +-
 .../semantic/model/application/DatasourceServiceImpl.java | 5 +++++
 .../semantic/model/domain/DatasourceService.java          | 4 +++-
 .../model/domain/repository/DatasourceRepository.java     | 2 ++
 .../semantic/model/domain/utils/DatasourceConverter.java  | 8 ++++----
 .../repository/DatasourceRepositoryImpl.java              | 7 +++++++
 13 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/StatisticsRepository.java b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/StatisticsRepository.java
index e6b457754..2b5967808 100644
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/StatisticsRepository.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/StatisticsRepository.java
@@ -7,5 +7,5 @@ import java.util.List;
 
 public interface StatisticsRepository {
 
-    boolean batchSaveStatistics(List<StatisticsDO> list);
+    void batchSaveStatistics(List<StatisticsDO> list);
 }
diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/StatisticsRepositoryImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/StatisticsRepositoryImpl.java
index 7a8593944..476a80267 100644
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/StatisticsRepositoryImpl.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/persistence/repository/impl/StatisticsRepositoryImpl.java
@@ -20,10 +20,9 @@ public class StatisticsRepositoryImpl implements StatisticsRepository {
         this.statisticsMapper = statisticsMapper;
     }
 
-    public boolean batchSaveStatistics(List<StatisticsDO> list) {
-        return statisticsMapper.batchSaveStatistics(list);
+    public void batchSaveStatistics(List<StatisticsDO> list) {
+        statisticsMapper.batchSaveStatistics(list);
     }
 
-    ;
 
 }
diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/StatisticsService.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/StatisticsService.java
index ce62d9e8b..d3908fe49 100644
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/StatisticsService.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/StatisticsService.java
@@ -5,5 +5,5 @@ import com.tencent.supersonic.chat.persistence.dataobject.StatisticsDO;
 import java.util.List;
 
 public interface StatisticsService {
-    boolean batchSaveStatistics(List<StatisticsDO> list);
+    void batchSaveStatistics(List<StatisticsDO> list);
 }
diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java
index 220d10bce..209262b8f 100644
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java
@@ -33,6 +33,7 @@ import com.tencent.supersonic.common.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.context.annotation.Primary;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/StatisticsServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/StatisticsServiceImpl.java
index 9309152e4..cb162d237 100644
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/StatisticsServiceImpl.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/StatisticsServiceImpl.java
@@ -4,6 +4,7 @@ import com.tencent.supersonic.chat.persistence.dataobject.StatisticsDO;
 import com.tencent.supersonic.chat.persistence.repository.StatisticsRepository;
 import com.tencent.supersonic.chat.service.StatisticsService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -18,8 +19,9 @@ public class StatisticsServiceImpl implements StatisticsService {
         this.statisticsRepository = statisticsRepository;
     }
 
+    @Async
     @Override
-    public boolean batchSaveStatistics(List<StatisticsDO> list) {
-        return statisticsRepository.batchSaveStatistics(list);
+    public void batchSaveStatistics(List<StatisticsDO> list) {
+        statisticsRepository.batchSaveStatistics(list);
     }
 }
diff --git a/chat/core/src/main/resources/mapper/ChatParseMapper.xml b/chat/core/src/main/resources/mapper/ChatParseMapper.xml
index 88f8dbc86..3c442fe2a 100644
--- a/chat/core/src/main/resources/mapper/ChatParseMapper.xml
+++ b/chat/core/src/main/resources/mapper/ChatParseMapper.xml
@@ -28,7 +28,7 @@
     <update id="updateParseInfo" parameterType="com.tencent.supersonic.chat.persistence.dataobject.ChatParseDO">
         update s2_chat_parse
         set parse_info = #{parseInfo}
-        where parse_id = #{parseId}
+        where question_id = #{questionId} and parse_id = #{parseId}
     </update>
 
     <select id="getParseInfo" resultMap="ChatParse">
diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/StandaloneLauncher.java b/launchers/standalone/src/main/java/com/tencent/supersonic/StandaloneLauncher.java
index cb3c96d6e..3a8134f17 100644
--- a/launchers/standalone/src/main/java/com/tencent/supersonic/StandaloneLauncher.java
+++ b/launchers/standalone/src/main/java/com/tencent/supersonic/StandaloneLauncher.java
@@ -4,11 +4,13 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(scanBasePackages = {"com.tencent.supersonic"},
         exclude = {MongoAutoConfiguration.class, MongoDataAutoConfiguration.class})
 @EnableScheduling
+@EnableAsync
 public class StandaloneLauncher {
 
     public static void main(String[] args) {
diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java
index 2ca6eeccc..5c4fd9edb 100644
--- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java
+++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java
@@ -88,7 +88,7 @@ public class DatabaseServiceImpl implements DatabaseService {
 
     @Override
     public void deleteDatabase(Long databaseId) {
-        List<DatasourceResp> datasourceResps = datasourceService.getDatasourceList(databaseId);
+        List<DatasourceResp> datasourceResps = datasourceService.getDatasourceByDatabase(databaseId);
         if (!CollectionUtils.isEmpty(datasourceResps)) {
             List<String> datasourceNames = datasourceResps.stream()
                     .map(DatasourceResp::getName).collect(Collectors.toList());
diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatasourceServiceImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatasourceServiceImpl.java
index cbeb769a4..314206c10 100644
--- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatasourceServiceImpl.java
+++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatasourceServiceImpl.java
@@ -261,6 +261,11 @@ public class DatasourceServiceImpl implements DatasourceService {
         return DatasourceConverter.convertList(datasourceRepository.getDatasourceList());
     }
 
+    @Override
+    public List<DatasourceResp> getDatasourceByDatabase(Long databaseId) {
+        return DatasourceConverter.convertList(datasourceRepository.getDatasourceByDatabase(databaseId));
+    }
+
     @Override
     public List<DatasourceResp> getDatasourceListNoMeasurePrefix(Long modelId) {
         List<DatasourceResp> datasourceResps = getDatasourceList(modelId);
diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DatasourceService.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DatasourceService.java
index d321a6d94..40a9b4c61 100644
--- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DatasourceService.java
+++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DatasourceService.java
@@ -28,13 +28,15 @@ public interface DatasourceService {
 
     List<DatasourceResp> getDatasourceList(Long modelId);
 
+    List<DatasourceResp> getDatasourceByDatabase(Long databaseId);
+
     Map<Long, DatasourceResp> getDatasourceMap();
 
     void deleteDatasource(Long id) throws Exception;
 
     DatasourceRelaResp createOrUpdateDatasourceRela(DatasourceRelaReq datasourceRelaReq, User user);
 
-    List<DatasourceRelaResp> getDatasourceRelaList(Long domainId);
+    List<DatasourceRelaResp> getDatasourceRelaList(Long modelId);
 
     void deleteDatasourceRela(Long id);
 
diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DatasourceRepository.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DatasourceRepository.java
index e5f3fed00..f87eaf82d 100644
--- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DatasourceRepository.java
+++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DatasourceRepository.java
@@ -15,6 +15,8 @@ public interface DatasourceRepository {
 
     List<DatasourceDO> getDatasourceList(Long modelId);
 
+    List<DatasourceDO> getDatasourceByDatabase(Long databaseId);
+
     DatasourceDO getDatasourceById(Long id);
 
     void deleteDatasource(Long id);
diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatasourceConverter.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatasourceConverter.java
index cc1602bb0..32f2f6ffa 100644
--- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatasourceConverter.java
+++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatasourceConverter.java
@@ -150,26 +150,26 @@ public class DatasourceConverter {
     }
 
 
-    private static boolean isCraeteDimension(Dim dim) {
+    private static boolean isCreateDimension(Dim dim) {
         return dim.getIsCreateDimension() == 1
                 && StringUtils.isNotBlank(dim.getName())
                 && !dim.getType().equalsIgnoreCase("time");
     }
 
-    private static boolean isCraeteMetric(Measure measure) {
+    private static boolean isCreateMetric(Measure measure) {
         return measure.getIsCreateMetric() == 1
                 && StringUtils.isNotBlank(measure.getName());
     }
 
     public static List<Dim> getDimToCreateDimension(Datasource datasource) {
         return datasource.getDatasourceDetail().getDimensions().stream()
-                .filter(DatasourceConverter::isCraeteDimension)
+                .filter(DatasourceConverter::isCreateDimension)
                 .collect(Collectors.toList());
     }
 
     public static List<Measure> getMeasureToCreateMetric(Datasource datasource) {
         return datasource.getDatasourceDetail().getMeasures().stream()
-                .filter(DatasourceConverter::isCraeteMetric)
+                .filter(DatasourceConverter::isCreateMetric)
                 .collect(Collectors.toList());
     }
 
diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DatasourceRepositoryImpl.java b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DatasourceRepositoryImpl.java
index 8d39ec0bc..61c2d4cb6 100644
--- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DatasourceRepositoryImpl.java
+++ b/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DatasourceRepositoryImpl.java
@@ -51,6 +51,13 @@ public class DatasourceRepositoryImpl implements DatasourceRepository {
         return datasourceMapper.selectByExampleWithBLOBs(datasourceExample);
     }
 
+    @Override
+    public List<DatasourceDO> getDatasourceByDatabase(Long databaseId) {
+        DatasourceDOExample datasourceExample = new DatasourceDOExample();
+        datasourceExample.createCriteria().andDatabaseIdEqualTo(databaseId);
+        return datasourceMapper.selectByExampleWithBLOBs(datasourceExample);
+    }
+
     @Override
     public DatasourceDO getDatasourceById(Long id) {
         return datasourceMapper.selectByPrimaryKey(id);