(improvement)(headless | chat ) 向量数据被重置后，记忆不会再次添加到向量数据库 (#2164)

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SelectCorrector.java

@@ -1,5 +1,6 @@
 package com.tencent.supersonic.headless.chat.corrector;
 
+import com.tencent.supersonic.common.jsqlparser.FieldExpression;
 import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.common.jsqlparser.SqlValidHelper;
@@ -8,10 +9,7 @@ import com.tencent.supersonic.headless.chat.ChatQueryContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /** Perform SQL corrections on the "Select" section in S2SQL. */
 @Slf4j
@@ -46,10 +44,28 @@ public class SelectCorrector extends BaseSemanticCorrector {
             return correctS2SQL;
         }
         needAddFields.removeAll(selectFields);
-        String addFieldsToSelectSql =
-                SqlAddHelper.addFieldsToSelect(correctS2SQL, new ArrayList<>(needAddFields));
-        semanticParseInfo.getSqlInfo().setCorrectedS2SQL(addFieldsToSelectSql);
-        return addFieldsToSelectSql;
+
+        if (!SqlSelectHelper.hasSubSelect(correctS2SQL)) { //优化内容 ， 如果sql 条件包含了这个字段，而且是全等，则不再查询该字段
+            List<FieldExpression> tmp4 = SqlSelectHelper.getWhereExpressions(correctS2SQL);
+            Iterator<String> it = needAddFields.iterator();
+            while (it.hasNext()) {
+                String field = it.next();
+                long size = tmp4.stream()
+                        .filter(e -> e.getFieldName().equals(field) && "=".equals(e.getOperator()))
+                        .count();
+                if (size == 1) {
+                    it.remove();
+                }
+            }
+        }
+        if (needAddFields.size() > 0) {
+            String addFieldsToSelectSql =
+                    SqlAddHelper.addFieldsToSelect(correctS2SQL, new ArrayList<>(needAddFields));
+            semanticParseInfo.getSqlInfo().setCorrectedS2SQL(addFieldsToSelectSql);
+            return addFieldsToSelectSql;
+        } else {
+            return correctS2SQL;
+        }
     }
 
 }

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/KeywordMapper.java

@@ -75,6 +75,7 @@ public class KeywordMapper extends BaseMapper {
                     continue;
                 }
                 Long elementID = NatureHelper.getElementID(nature);
+                if (elementID == null)continue; //  判空优化
                 SchemaElement element = getSchemaElement(dataSetId, elementType, elementID,
                         chatQueryContext.getSemanticSchema());
                 if (Objects.isNull(element)) {