From a0d40eb65ead2ab49c1e7b8c880b18ccae11ec42 Mon Sep 17 00:00:00 2001
From: Sriharsha Chintalapani <harshach@users.noreply.github.com>
Date: Thu, 3 Feb 2022 20:08:25 -0800
Subject: [PATCH] Fix #2069: Not all tag filters displayed (#2607)

---
 .../resources/search/SearchResource.java      | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java
index 00b3986bacb..c3c7cd2b9bf 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/resources/search/SearchResource.java
@@ -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);