From 01d37eeef0f073677eb6eb188b84d36d6feef324 Mon Sep 17 00:00:00 2001
From: lexluo09 <39718951+lexluo09@users.noreply.github.com>
Date: Wed, 24 Apr 2024 11:32:38 +0800
Subject: [PATCH] (improvement)(Headless) Delete code:
 removeFilterIfNotInLinkingValue. (#938)

---
 .../headless/core/chat/corrector/SchemaCorrector.java      | 2 --
 .../server/service/impl/MetaDiscoveryServiceImpl.java      | 7 ++++---
 .../standalone/src/main/resources/application-local.yaml   | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/corrector/SchemaCorrector.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/corrector/SchemaCorrector.java
index 3275622bc..73349199b 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/corrector/SchemaCorrector.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/chat/corrector/SchemaCorrector.java
@@ -36,8 +36,6 @@ public class SchemaCorrector extends BaseSemanticCorrector {
     @Override
     public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
 
-        removeFilterIfNotInLinkingValue(queryContext, semanticParseInfo);
-
         correctAggFunction(semanticParseInfo);
 
         replaceAlias(semanticParseInfo);
diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetaDiscoveryServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetaDiscoveryServiceImpl.java
index 424231200..2ae812854 100644
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetaDiscoveryServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetaDiscoveryServiceImpl.java
@@ -85,13 +85,14 @@ public class MetaDiscoveryServiceImpl implements MetaDiscoveryService {
     private Map<String, List<SchemaElementMatch>> getTopFields(Integer topN,
                                                                SchemaMapInfo mapInfo,
                                                                Map<Long, String> dataSetMap) {
-        Set<Long> dataSetIds = mapInfo.getDataSetElementMatches().keySet();
         Map<String, List<SchemaElementMatch>> result = new HashMap<>();
 
         SemanticSchema semanticSchema = semanticService.getSemanticSchema();
-        for (Long dataSetId : dataSetIds) {
+        for (Map.Entry<Long, List<SchemaElementMatch>> entry : mapInfo.getDataSetElementMatches().entrySet()) {
+            Long dataSetId = entry.getKey();
+            List<SchemaElementMatch> values = entry.getValue();
             String dataSetName = dataSetMap.get(dataSetId);
-            if (StringUtils.isBlank(dataSetName)) {
+            if (StringUtils.isBlank(dataSetName) || CollectionUtils.isEmpty(values)) {
                 continue;
             }
             //topN dimensions
diff --git a/launchers/standalone/src/main/resources/application-local.yaml b/launchers/standalone/src/main/resources/application-local.yaml
index 1acba84ae..af496a83e 100644
--- a/launchers/standalone/src/main/resources/application-local.yaml
+++ b/launchers/standalone/src/main/resources/application-local.yaml
@@ -72,6 +72,7 @@ s2:
 #      inProcess:
 #        modelPath: /data/model.onnx
 #        vocabularyPath: /data/onnx_vocab.txt
+#        shibing624/text2vec-base-chinese
     #2.2 open_ai
     #  embedding-model:
     #    provider: open_ai