From d1e5e8777aa1e8e29248d70ad415016a84c97428 Mon Sep 17 00:00:00 2001
From: jerryjzhang <jerryjzhang@tencent.com>
Date: Tue, 18 Feb 2025 21:29:39 +0800
Subject: [PATCH] (improvement)(chat)Try to find all fields in the same model
 to avoid unnecessary join.

---
 .../translator/parser/SqlQueryParser.java     | 47 +++++++++++++------
 1 file changed, 32 insertions(+), 15 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 be950e75e..b52e9bbea 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
@@ -10,6 +10,7 @@ import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
+import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp;
 import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp;
 import com.tencent.supersonic.headless.api.pojo.response.QueryState;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticSchemaResp;
@@ -188,12 +189,10 @@ public class SqlQueryParser implements QueryParser {
             String modelName = entry.getKey();
             entry.getValue().forEach(m -> {
                 if (fields.contains(m.getName()) || fields.contains(m.getBizName())) {
-                    if (!ontologyQuery.getMetricMap().containsKey(modelName)) {
-                        ontologyQuery.getMetricMap().put(modelName, Sets.newHashSet());
-                    }
                     ontologyQuery.getModelMap().put(modelName,
                             ontology.getModelMap().get(modelName));
-                    ontologyQuery.getMetricMap().get(modelName).add(m);
+                    ontologyQuery.getMetricMap().computeIfAbsent(modelName, k -> Sets.newHashSet())
+                            .add(m);
                     fields.remove(m.getName());
                     fields.remove(m.getBizName());
                 }
@@ -207,33 +206,51 @@ public class SqlQueryParser implements QueryParser {
                     String modelName = entry.getKey();
                     entry.getValue().forEach(d -> {
                         if (fields.contains(d.getName()) || fields.contains(d.getBizName())) {
-                            if (!ontologyQuery.getDimensionMap().containsKey(entry.getKey())) {
-                                ontologyQuery.getDimensionMap().put(entry.getKey(),
-                                        Sets.newHashSet());
-                            }
                             ontologyQuery.getModelMap().put(modelName,
                                     ontology.getModelMap().get(modelName));
-                            ontologyQuery.getDimensionMap().get(entry.getKey()).add(d);
+                            ontologyQuery.getDimensionMap()
+                                    .computeIfAbsent(modelName, k -> Sets.newHashSet()).add(d);
                             fields.remove(d.getName());
                             fields.remove(d.getBizName());
                         }
                     });
                 });
 
-        // if there are still fields not found belonging models, try to find in the models without
-        // querying metrics.
+        // second, try to find a model that has all the remaining fields, such that no further join
+        // is needed.
+        if (!fields.isEmpty()) {
+            Map<String, Set<DimSchemaResp>> model2dims = new HashMap<>();
+            ontology.getDimensionMap().entrySet().forEach(entry -> {
+                String modelName = entry.getKey();
+                entry.getValue().forEach(d -> {
+                    if (fields.contains(d.getName()) || fields.contains(d.getBizName())) {
+                        model2dims.computeIfAbsent(modelName, k -> Sets.newHashSet()).add(d);
+                    }
+                });
+            });
+            Optional<Map.Entry<String, Set<DimSchemaResp>>> modelEntry = model2dims.entrySet()
+                    .stream().filter(entry -> entry.getValue().size() == fields.size()).findFirst();
+            if (modelEntry.isPresent()) {
+                ontologyQuery.getDimensionMap().put(modelEntry.get().getKey(),
+                        modelEntry.get().getValue());
+                ontologyQuery.getModelMap().put(modelEntry.get().getKey(),
+                        ontology.getModelMap().get(modelEntry.get().getKey()));
+                fields.clear();
+            }
+        }
+
+        // finally if there are still fields not found belonging models, try to find in the models
+        // iteratively
         if (!fields.isEmpty()) {
             ontology.getDimensionMap().entrySet().forEach(entry -> {
                 String modelName = entry.getKey();
                 if (!ontologyQuery.getDimensionMap().containsKey(modelName)) {
                     entry.getValue().forEach(d -> {
                         if (fields.contains(d.getName()) || fields.contains(d.getBizName())) {
-                            if (!ontologyQuery.getDimensionMap().containsKey(modelName)) {
-                                ontologyQuery.getDimensionMap().put(modelName, Sets.newHashSet());
-                            }
                             ontologyQuery.getModelMap().put(modelName,
                                     ontology.getModelMap().get(modelName));
-                            ontologyQuery.getDimensionMap().get(modelName).add(d);
+                            ontologyQuery.getDimensionMap()
+                                    .computeIfAbsent(modelName, k -> Sets.newHashSet()).add(d);
                             fields.remove(d.getName());
                             fields.remove(d.getBizName());
                         }