diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DataSetSchema.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DataSetSchema.java index 730dc00d1..10aee9bdc 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DataSetSchema.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DataSetSchema.java @@ -22,7 +22,6 @@ public class DataSetSchema implements Serializable { private Set tags = new HashSet<>(); private Set dimensionValues = new HashSet<>(); private Set terms = new HashSet<>(); - private SchemaElement entity = new SchemaElement(); private QueryConfig queryConfig; public SchemaElement getElement(SchemaElementType elementType, long elementID) { @@ -81,13 +80,6 @@ public class DataSetSchema implements Serializable { return queryConfig.getAggregateTypeDefaultConfig().getTimeDefaultConfig(); } - public DetailTypeDefaultConfig getTagTypeDefaultConfig() { - if (queryConfig == null) { - return null; - } - return queryConfig.getDetailTypeDefaultConfig(); - } - public boolean containsPartitionDimensions() { return dimensions.stream().anyMatch(SchemaElement::isPartitionTime); } diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimSchemaResp.java index 28107c44a..aca3deeed 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimSchemaResp.java @@ -11,5 +11,4 @@ public class DimSchemaResp extends DimensionResp { private Long useCnt = 0L; - private List entityAlias; } diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/RuleSemanticQuery.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/RuleSemanticQuery.java index 4a915f0e5..3c7fd1e23 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/RuleSemanticQuery.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/query/rule/RuleSemanticQuery.java @@ -148,12 +148,13 @@ public abstract class RuleSemanticQuery extends BaseSemanticQuery { } private void addToFilters(Map> id2Values, - SemanticParseInfo parseInfo, SemanticSchema semanticSchema, SchemaElementType entity) { + SemanticParseInfo parseInfo, SemanticSchema semanticSchema, + SchemaElementType elementType) { if (id2Values == null || id2Values.isEmpty()) { return; } for (Entry> entry : id2Values.entrySet()) { - SchemaElement dimension = semanticSchema.getElement(entity, entry.getKey()); + SchemaElement dimension = semanticSchema.getElement(elementType, entry.getKey()); if (dimension.isPartitionTime()) { continue; }