Skip to content

Commit 5229fdc

Browse files
committed
(improvement)(headless)Remove tag-related logic when determining query type.
1 parent bef6528 commit 5229fdc

1 file changed

Lines changed: 3 additions & 12 deletions

File tree

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/QueryTypeParser.java

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ private QueryType getQueryType(ChatQueryContext chatQueryContext, SemanticQuery
5252
if (Objects.isNull(sqlInfo) || StringUtils.isBlank(sqlInfo.getParsedS2SQL())) {
5353
return QueryType.DETAIL;
5454
}
55+
5556
//1. entity queryType
5657
Long dataSetId = parseInfo.getDataSetId();
5758
SemanticSchema semanticSchema = chatQueryContext.getSemanticSchema();
@@ -66,23 +67,13 @@ private QueryType getQueryType(ChatQueryContext chatQueryContext, SemanticQuery
6667
return QueryType.ID;
6768
}
6869
}
69-
List<String> selectFields = SqlSelectHelper.getSelectFields(sqlInfo.getParsedS2SQL());
70-
selectFields.addAll(whereFields);
71-
List<String> selectWhereFilterByTimeFields = filterByTimeFields(selectFields);
72-
if (CollectionUtils.isNotEmpty(selectWhereFilterByTimeFields)) {
73-
Set<String> tags = semanticSchema.getTags(dataSetId).stream().map(SchemaElement::getName)
74-
.collect(Collectors.toSet());
75-
//If all the fields in the SELECT/WHERE statement are of tag type.
76-
if (CollectionUtils.isNotEmpty(tags)
77-
&& tags.containsAll(selectWhereFilterByTimeFields)) {
78-
return QueryType.DETAIL;
79-
}
80-
}
8170
}
71+
8272
//2. metric queryType
8373
if (selectContainsMetric(sqlInfo, dataSetId, semanticSchema)) {
8474
return QueryType.METRIC;
8575
}
76+
8677
return QueryType.DETAIL;
8778
}
8879

0 commit comments

Comments
 (0)