From fbd13013fa5ad379737cb967412a6b900706f5c1 Mon Sep 17 00:00:00 2001
From: unknown <qiji2@DC=corp,DC=conbagroup,DC=com.com>
Date: Fri, 9 May 2025 17:17:11 +0800
Subject: [PATCH] =?UTF-8?q?(fix)(headless)=E4=BF=AE=E5=A4=8D=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E7=9A=84SQL=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=9C=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=86=85=EF=BC=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E7=94=B1=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=88=A4=E6=96=AD=E6=9B=B4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5=E6=98=AF=E5=90=A6=E5=8C=85?=
 =?UTF-8?q?=E5=90=AB=E7=BB=B4=E5=BA=A6=E5=92=8C=E5=BA=A6=E9=87=8F=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../headless/core/translator/parser/SqlQueryParser.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/SqlQueryParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/SqlQueryParser.java
index b52e9bbea..2aaef6b52 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/SqlQueryParser.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/SqlQueryParser.java
@@ -47,12 +47,16 @@ public class SqlQueryParser implements QueryParser {
         SqlQuery sqlQuery = queryStatement.getSqlQuery();
         List<String> queryFields = SqlSelectHelper.getAllSelectFields(sqlQuery.getSql());
         Set<String> queryAliases = SqlSelectHelper.getAliasFields(sqlQuery.getSql());
+        Set<String> ontologyMetricsDimensions = Collections.synchronizedSet(new HashSet<String>());
         queryFields.removeAll(queryAliases);
         Ontology ontology = queryStatement.getOntology();
         OntologyQuery ontologyQuery = buildOntologyQuery(ontology, queryFields);
+        Set<String> queryFieldsSet = new HashSet<>(queryFields);
+        ontologyQuery.getMetrics().forEach(m -> ontologyMetricsDimensions.add(m.getName()));
+        ontologyQuery.getDimensions().forEach(d -> ontologyMetricsDimensions.add(d.getName()));
         // check if there are fields not matched with any metric or dimension
-        if (queryFields.size() > ontologyQuery.getMetrics().size()
-                + ontologyQuery.getDimensions().size()) {
+
+        if (!queryFieldsSet.containsAll(ontologyMetricsDimensions)) {
             List<String> semanticFields = Lists.newArrayList();
             ontologyQuery.getMetrics().forEach(m -> semanticFields.add(m.getName()));
             ontologyQuery.getDimensions().forEach(d -> semanticFields.add(d.getName()));