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

[improvement][headless]Deprecate and remove entity-related abstraction and logic.#1876

Browse Source
This commit is contained in:
jerryjzhang
2024-11-04 10:17:30 +08:00
parent 3b65b1c80b
commit 9a05b5cce6
3 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DataSetSchema.java
View File

@@ -22,7 +22,6 @@ public class DataSetSchema implements Serializable {
private Set<SchemaElement> tags = new HashSet<>(); private Set<SchemaElement> tags = new HashSet<>();
private Set<SchemaElement> dimensionValues = new HashSet<>(); private Set<SchemaElement> dimensionValues = new HashSet<>();
private Set<SchemaElement> terms = new HashSet<>(); private Set<SchemaElement> terms = new HashSet<>();
private SchemaElement entity = new SchemaElement();
private QueryConfig queryConfig; private QueryConfig queryConfig;
public SchemaElement getElement(SchemaElementType elementType, long elementID) { public SchemaElement getElement(SchemaElementType elementType, long elementID) {
@@ -81,13 +80,6 @@ public class DataSetSchema implements Serializable {
return queryConfig.getAggregateTypeDefaultConfig().getTimeDefaultConfig(); return queryConfig.getAggregateTypeDefaultConfig().getTimeDefaultConfig();
} }
public DetailTypeDefaultConfig getTagTypeDefaultConfig() {
if (queryConfig == null) {
return null;
}
return queryConfig.getDetailTypeDefaultConfig();
}
public boolean containsPartitionDimensions() { public boolean containsPartitionDimensions() {
return dimensions.stream().anyMatch(SchemaElement::isPartitionTime); return dimensions.stream().anyMatch(SchemaElement::isPartitionTime);
} }

1
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimSchemaResp.java
View File

@@ -11,5 +11,4 @@ public class DimSchemaResp extends DimensionResp {
private Long useCnt = 0L; private Long useCnt = 0L;
private List<String> entityAlias;
} }

5
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/RuleSemanticQuery.java
View File

@@ -148,12 +148,13 @@ public abstract class RuleSemanticQuery extends BaseSemanticQuery {
} }
private void addToFilters(Map<Long, List<SchemaElementMatch>> id2Values, private void addToFilters(Map<Long, List<SchemaElementMatch>> id2Values,
SemanticParseInfo parseInfo, SemanticSchema semanticSchema, SchemaElementType entity) { SemanticParseInfo parseInfo, SemanticSchema semanticSchema,
SchemaElementType elementType) {
if (id2Values == null || id2Values.isEmpty()) { if (id2Values == null || id2Values.isEmpty()) {
return; return;
} }
for (Entry<Long, List<SchemaElementMatch>> entry : id2Values.entrySet()) { for (Entry<Long, List<SchemaElementMatch>> entry : id2Values.entrySet()) {
SchemaElement dimension = semanticSchema.getElement(entity, entry.getKey()); SchemaElement dimension = semanticSchema.getElement(elementType, entry.getKey());
if (dimension.isPartitionTime()) { if (dimension.isPartitionTime()) {
continue; continue;
} }