yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-26 01:15:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2069: Not all tag filters displayed (#2607)

Browse Source
This commit is contained in:
Sriharsha Chintalapani 2022-02-03 20:08:25 -08:00 committed by GitHub
parent 64c157498d
commit a0d40eb65e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java
View File

@ -57,6 +57,7 @@ import org.openmetadata.catalog.util.ElasticSearchClientUtils;
@Produces(MediaType.APPLICATION_JSON)
public class SearchResource {
private final RestHighLevelClient client;
private final Integer MAX_AGGREGATE_SIZE = 50;
public SearchResource(ElasticSearchConfiguration esConfig) {
this.client = ElasticSearchClientUtils.createElasticSearchClient(esConfig);
@ -205,10 +206,10 @@ public class SearchResource {
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
searchSourceBuilder
.query(QueryBuilders.queryStringQuery(query).lenient(true))
.aggregation(AggregationBuilders.terms("Service").field("service_type"))
.aggregation(AggregationBuilders.terms("ServiceCategory").field("service_category"))
.aggregation(AggregationBuilders.terms("Service").field("service_type").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("ServiceCategory").field("service_category").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("EntityType").field("entity_type"))
.aggregation(AggregationBuilders.terms("Tier").field("tier"))
.aggregation(AggregationBuilders.terms("Tier").field("tier").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("Tags").field("tags"))
.from(from)
.size(size);
@ -241,11 +242,11 @@ public class SearchResource {
.field("column_names")
.field("column_descriptions")
.lenient(true))
.aggregation(AggregationBuilders.terms("Service").field("service_type"))
.aggregation(AggregationBuilders.terms("ServiceCategory").field("service_category"))
.aggregation(AggregationBuilders.terms("Service").field("service_type").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("ServiceCategory").field("service_category").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("EntityType").field("entity_type"))
.aggregation(AggregationBuilders.terms("Tier").field("tier"))
.aggregation(AggregationBuilders.terms("Tags").field("tags"))
.aggregation(AggregationBuilders.terms("Tags").field("tags").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("Database").field("database"))
.highlighter(hb)
.from(from)
@ -267,11 +268,11 @@ public class SearchResource {
hb.postTags("</span>");
searchSourceBuilder
.query(QueryBuilders.queryStringQuery(query).field("name", 5.0f).field("description").lenient(true))
.aggregation(AggregationBuilders.terms("Service").field("service_type"))
.aggregation(AggregationBuilders.terms("ServiceCategory").field("service_category"))
.aggregation(AggregationBuilders.terms("Service").field("service_type").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("ServiceCategory").field("service_category").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("EntityType").field("entity_type"))
.aggregation(AggregationBuilders.terms("Tier").field("tier"))
.aggregation(AggregationBuilders.terms("Tags").field("tags"))
.aggregation(AggregationBuilders.terms("Tags").field("tags").size(MAX_AGGREGATE_SIZE))
.highlighter(hb)
.from(from)
.size(size);
@ -305,11 +306,11 @@ public class SearchResource {
.field("chart_names")
.field("chart_descriptions")
.lenient(true))
.aggregation(AggregationBuilders.terms("Service").field("service_type"))
.aggregation(AggregationBuilders.terms("ServiceCategory").field("service_category"))
.aggregation(AggregationBuilders.terms("Service").field("service_type").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("ServiceCategory").field("service_category").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("EntityType").field("entity_type"))
.aggregation(AggregationBuilders.terms("Tier").field("tier"))
.aggregation(AggregationBuilders.terms("Tags").field("tags"))
.aggregation(AggregationBuilders.terms("Tags").field("tags").size(MAX_AGGREGATE_SIZE))
.highlighter(hb)
.from(from)
.size(size);
@ -342,11 +343,11 @@ public class SearchResource {
.field("task_names")
.field("task_descriptions")
.lenient(true))
.aggregation(AggregationBuilders.terms("Service").field("service_type"))
.aggregation(AggregationBuilders.terms("ServiceCategory").field("service_category"))
.aggregation(AggregationBuilders.terms("Service").field("service_type").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("ServiceCategory").field("service_category").size(MAX_AGGREGATE_SIZE))
.aggregation(AggregationBuilders.terms("EntityType").field("entity_type"))
.aggregation(AggregationBuilders.terms("Tier").field("tier"))
.aggregation(AggregationBuilders.terms("Tags").field("tags"))
.aggregation(AggregationBuilders.terms("Tags").field("tags").size(MAX_AGGREGATE_SIZE))
.highlighter(hb)
.from(from)
.size(size);