From 83ba635bab7affd40a9e70cac198fed958dfce5e Mon Sep 17 00:00:00 2001 From: QJ_wonder <38885395+xinpiannanhai@users.noreply.github.com> Date: Wed, 14 May 2025 18:36:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=B4=E5=BA=A6=E5=80=BC?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=AD=97=E5=85=B8=E6=97=B6=EF=BC=8C=E7=BB=B4?= =?UTF-8?q?=E5=BA=A6=E5=80=BC=E5=92=8C=E5=BA=A6=E9=87=8F=E5=80=BC=E4=B8=BA?= =?UTF-8?q?=E8=8B=B1=E6=96=87=E5=90=8D=E5=AF=BC=E8=87=B4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8D=E5=8C=B9=E9=85=8D=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复维度值导入字典时，维度值和度量值为英文名导致字段不匹配的问题。 维度值导入字典时会遍历调用到SqlQueryParser方法，这时的维度值或度量值为Bizname而非name，新增一个set用于添加Bizname，并在判断中新加入Bizname名的判断，只要两个条件符合一个即可 --- .../headless/core/translator/parser/SqlQueryParser.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 2aaef6b52..04b89ee5e 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 @@ -48,15 +48,16 @@ public class SqlQueryParser implements QueryParser { List queryFields = SqlSelectHelper.getAllSelectFields(sqlQuery.getSql()); Set queryAliases = SqlSelectHelper.getAliasFields(sqlQuery.getSql()); Set ontologyMetricsDimensions = Collections.synchronizedSet(new HashSet()); + Set ontologyBizNameMetricsDimensions = Collections.synchronizedSet(new HashSet()); queryFields.removeAll(queryAliases); Ontology ontology = queryStatement.getOntology(); OntologyQuery ontologyQuery = buildOntologyQuery(ontology, queryFields); Set queryFieldsSet = new HashSet<>(queryFields); - ontologyQuery.getMetrics().forEach(m -> ontologyMetricsDimensions.add(m.getName())); - ontologyQuery.getDimensions().forEach(d -> ontologyMetricsDimensions.add(d.getName())); + ontologyQuery.getMetrics().forEach(m -> {ontologyMetricsDimensions.add(m.getName()); ontologyBizNameMetricsDimensions.add(m.getBizName());}); + ontologyQuery.getDimensions().forEach(d -> {ontologyMetricsDimensions.add(d.getName()); ontologyBizNameMetricsDimensions.add(d.getBizName());}); // check if there are fields not matched with any metric or dimension - if (!queryFieldsSet.containsAll(ontologyMetricsDimensions)) { + if (!(queryFieldsSet.containsAll(ontologyMetricsDimensions)||queryFieldsSet.containsAll(ontologyBizNameMetricsDimensions))) { List semanticFields = Lists.newArrayList(); ontologyQuery.getMetrics().forEach(m -> semanticFields.add(m.getName())); ontologyQuery.getDimensions().forEach(d -> semanticFields.add(d.getName()));