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

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

View File

@@ -22,7 +22,6 @@ public class DataSetSchema implements Serializable {
private Set<SchemaElement> tags = new HashSet<>();
private Set<SchemaElement> dimensionValues = new HashSet<>();
private Set<SchemaElement> 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);
}

View File

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

View File

@@ -148,12 +148,13 @@ public abstract class RuleSemanticQuery extends BaseSemanticQuery {
}
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()) {
return;
}
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()) {
continue;
}