[fix][chat] Fix the issue with the order of parallel execution in the…

… map. (#1976)
tencentmusic · Dec 25, 2024 · c483bb8 · c483bb8
1 parent 6738aba
commit c483bb8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/...ess/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/BaseMatchStrategy.java b/...ess/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/BaseMatchStrategy.java
@@ -27,7 +27,7 @@ public abstract class BaseMatchStrategy<T extends MapResult> implements MatchStr
 
     @Override
     public Map<MatchText, List<T>> match(ChatQueryContext chatQueryContext, List<S2Term> terms,
-            Set<Long> detectDataSetIds) {
+                                         Set<Long> detectDataSetIds) {
         String text = chatQueryContext.getRequest().getQueryText();
         if (Objects.isNull(terms) || StringUtils.isEmpty(text)) {
             return null;
@@ -43,7 +43,7 @@ public Map<MatchText, List<T>> match(ChatQueryContext chatQueryContext, List<S2T
     }
 
     public List<T> detect(ChatQueryContext chatQueryContext, List<S2Term> terms,
-            Set<Long> detectDataSetIds) {
+                          Set<Long> detectDataSetIds) {
         throw new RuntimeException("Not implemented");
     }
 
@@ -73,11 +73,15 @@ public void selectResultInOneRound(Set<T> existResults, List<T> oneRoundResults)
     protected void executeTasks(List<Callable<Void>> tasks) {
         try {
             threadPoolConfig.getMapExecutor().invokeAll(tasks);
-        } catch (InterruptedException e) {
+            for (Callable<Void> future : tasks) {
+                future.call();
+            }
+        } catch (Exception e) {
             Thread.currentThread().interrupt();
             throw new RuntimeException("Task execution interrupted", e);
         }
     }
+
     public double getThreshold(Double threshold, Double minThreshold, MapModeEnum mapModeEnum) {
         if (MapModeEnum.STRICT.equals(mapModeEnum)) {
             return 1.0d;