topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-11 12:07:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(fix)(headless)Resolve field matching failures in mixed usage of raw and semantic names (#2370)

Browse Source
This commit is contained in:
lwhy
2025-09-21 23:24:04 +08:00
committed by GitHub
parent 25df22758a
commit 431aa60e4d
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/SqlQueryParser.java
View File

@@ -47,24 +47,19 @@ public class SqlQueryParser implements QueryParser {
SqlQuery sqlQuery = queryStatement.getSqlQuery(); SqlQuery sqlQuery = queryStatement.getSqlQuery();
List<String> queryFields = SqlSelectHelper.getAllSelectFields(sqlQuery.getSql()); List<String> queryFields = SqlSelectHelper.getAllSelectFields(sqlQuery.getSql());
Set<String> queryAliases = SqlSelectHelper.getAliasFields(sqlQuery.getSql()); Set<String> queryAliases = SqlSelectHelper.getAliasFields(sqlQuery.getSql());
Set<String> ontologyMetricsDimensions = Collections.synchronizedSet(new HashSet<String>()); List<Pair<String, String>> ontologyMetricsDimensionsAndBizName = Collections.synchronizedList(new ArrayList<>());
Set<String> ontologyBizNameMetricsDimensions = Collections.synchronizedSet(new HashSet<>());
queryFields.removeAll(queryAliases); queryFields.removeAll(queryAliases);
Ontology ontology = queryStatement.getOntology(); Ontology ontology = queryStatement.getOntology();
OntologyQuery ontologyQuery = buildOntologyQuery(ontology, queryFields); OntologyQuery ontologyQuery = buildOntologyQuery(ontology, queryFields);
Set<String> queryFieldsSet = new HashSet<>(queryFields); Set<String> queryFieldsSet = new HashSet<>(queryFields);
ontologyQuery.getMetrics().forEach(m -> { ontologyQuery.getMetrics().forEach(m -> {
ontologyMetricsDimensions.add(m.getName()); ontologyMetricsDimensionsAndBizName.add(Pair.of(m.getName(), m.getBizName()));
ontologyBizNameMetricsDimensions.add(m.getBizName());
}); });
ontologyQuery.getDimensions().forEach(d -> { ontologyQuery.getDimensions().forEach(d -> {
ontologyMetricsDimensions.add(d.getName()); ontologyMetricsDimensionsAndBizName.add(Pair.of(d.getName(), d.getBizName()));
ontologyBizNameMetricsDimensions.add(d.getBizName());
}); });
// check if there are fields not matched with any metric or dimension // check if there are fields not matched with any metric or dimension
if (!allFieldMatched(queryFieldsSet, ontologyMetricsDimensionsAndBizName)) {
if (!(queryFieldsSet.containsAll(ontologyMetricsDimensions)
|| queryFieldsSet.containsAll(ontologyBizNameMetricsDimensions))) {
List<String> semanticFields = Lists.newArrayList(); List<String> semanticFields = Lists.newArrayList();
ontologyQuery.getMetrics().forEach(m -> semanticFields.add(m.getName())); ontologyQuery.getMetrics().forEach(m -> semanticFields.add(m.getName()));
ontologyQuery.getDimensions().forEach(d -> semanticFields.add(d.getName())); ontologyQuery.getDimensions().forEach(d -> semanticFields.add(d.getName()));
@@ -103,6 +98,16 @@ public class SqlQueryParser implements QueryParser {
log.info("parse sqlQuery [{}] ", sqlQuery); log.info("parse sqlQuery [{}] ", sqlQuery);
} }
private boolean allFieldMatched(Set<String> queryFields,
List<Pair<String, String>> ontologyMetricsDimensionsAndBizName) {
for (Pair<String, String> pair : ontologyMetricsDimensionsAndBizName) {
if (!(queryFields.contains(pair.getLeft()) || queryFields.contains(pair.getRight()))) {
return false;
}
}
return true;
}
private void aliasesWithBackticks(QueryStatement queryStatement) { private void aliasesWithBackticks(QueryStatement queryStatement) {
String sql = queryStatement.getSqlQuery().getSql(); String sql = queryStatement.getSqlQuery().getSql();
sql = SqlReplaceHelper.replaceAliasWithBackticks(sql); sql = SqlReplaceHelper.replaceAliasWithBackticks(sql);